Fix compilation warnings: replace deprecated junit.framework.Assert

Replace deprecated junit.framework.Assert with org.junit.Assert.

Change-Id: I94fb065d9015955f2abc91a95be0a4137717e485
Signed-off-by: Gary Wu <gary.wu@gmail.com>

diff --git a/itests/base-features-it/src/test/java/org/opendaylight/controller/base/BaseFeatureTest.java b/itests/base-features-it/src/test/java/org/opendaylight/controller/base/BaseFeatureTest.java
index 0d38940346780e9205693a6bc3f39a7359d1f93a..62278f188598b98e87ec39ad61f143a04530970d 100644 (file)
--- a/itests/base-features-it/src/test/java/org/opendaylight/controller/base/BaseFeatureTest.java
+++ b/itests/base-features-it/src/test/java/org/opendaylight/controller/base/BaseFeatureTest.java
@@ -12,7 +12,7 @@ import java.util.EnumSet;
 
 import javax.inject.Inject;
 
 
 import javax.inject.Inject;
 

-import junit.framework.Assert;
+import org.junit.Assert;

 
 import org.apache.karaf.features.Feature;
 import org.apache.karaf.features.FeaturesService;
 
 import org.apache.karaf.features.Feature;
 import org.apache.karaf.features.FeaturesService;

diff --git a/opendaylight/adsal/containermanager/it.implementation/src/test/java/org/opendaylight/controller/containermanager/internal/ContainerImplTest.java b/opendaylight/adsal/containermanager/it.implementation/src/test/java/org/opendaylight/controller/containermanager/internal/ContainerImplTest.java
index 588b596fd4117c2cbdabfb19f9859391ce95d71d..cea81dbe6d97570d9aa20a1398ac55dd171a3043 100644 (file)
--- a/opendaylight/adsal/containermanager/it.implementation/src/test/java/org/opendaylight/controller/containermanager/internal/ContainerImplTest.java
+++ b/opendaylight/adsal/containermanager/it.implementation/src/test/java/org/opendaylight/controller/containermanager/internal/ContainerImplTest.java
@@ -16,7 +16,7 @@ import org.opendaylight.controller.sal.utils.NodeCreator;
 \r
 import java.util.Hashtable;\r
 \r
 \r
 import java.util.Hashtable;\r
 \r

-import static junit.framework.Assert.assertNull;\r
+import static org.junit.Assert.assertNull;\r

 import static org.junit.Assert.assertEquals;\r
 \r
 public class ContainerImplTest {\r
 import static org.junit.Assert.assertEquals;\r
 \r
 public class ContainerImplTest {\r

diff --git a/opendaylight/adsal/forwarding/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/StaticRouteTest.java b/opendaylight/adsal/forwarding/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/StaticRouteTest.java
index ee0e9dc8787f15770a835ec2ce25b5ca1a5eae87..acfa22363ceb343066aef5eac21238ead820fef4 100644 (file)
--- a/opendaylight/adsal/forwarding/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/StaticRouteTest.java
+++ b/opendaylight/adsal/forwarding/staticrouting/src/test/java/org/opendaylight/controller/forwarding/staticrouting/StaticRouteTest.java
@@ -22,7 +22,7 @@ import org.opendaylight.controller.sal.core.NodeConnector;
 import org.opendaylight.controller.sal.utils.NodeConnectorCreator;
 import org.opendaylight.controller.sal.utils.NodeCreator;
 
 import org.opendaylight.controller.sal.utils.NodeConnectorCreator;
 import org.opendaylight.controller.sal.utils.NodeCreator;
 

-import static junit.framework.Assert.fail;
+import static org.junit.Assert.fail;

 
 public class StaticRouteTest {
 
 
 public class StaticRouteTest {
 

diff --git a/opendaylight/adsal/forwardingrulesmanager/integrationtest/src/test/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerIT.java b/opendaylight/adsal/forwardingrulesmanager/integrationtest/src/test/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerIT.java
index 09618c266406ba04afed959da98aeda409e91251..6fd7eb26974d6e9e1ba2adbff90925a8ed20df65 100644 (file)
--- a/opendaylight/adsal/forwardingrulesmanager/integrationtest/src/test/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerIT.java
+++ b/opendaylight/adsal/forwardingrulesmanager/integrationtest/src/test/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerIT.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.controller.forwardingrulesmanager.internal;
 
  */
 package org.opendaylight.controller.forwardingrulesmanager.internal;
 

-import static junit.framework.Assert.fail;
+import static org.junit.Assert.fail;

 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;

diff --git a/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/ARPTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/ARPTest.java
index 10bd535eb2790a1876fe2f9cfa29afb681b4ed1b..792772a15c95c9d2d6a2c957e3c4476f3598f2ec 100644 (file)
--- a/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/ARPTest.java
+++ b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/ARPTest.java
@@ -11,7 +11,7 @@ package org.opendaylight.controller.sal.packet;
 
 import org.junit.Test;
 
 
 import org.junit.Test;
 

-import junit.framework.Assert;
+import org.junit.Assert;

 
 public class ARPTest {
 
 
 public class ARPTest {
 

diff --git a/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/BitBufferHelperTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/BitBufferHelperTest.java
index 06238f721dfac9def926d2ad5c1ad1cc4f4996da..98e8c45250510a770caa3303b83835c1670d418b 100644 (file)
--- a/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/BitBufferHelperTest.java
+++ b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/BitBufferHelperTest.java
@@ -9,7 +9,7 @@
 
 package org.opendaylight.controller.sal.packet;
 
 
 package org.opendaylight.controller.sal.packet;
 

-import junit.framework.Assert;
+import org.junit.Assert;

 
 import org.junit.Test;
 
 
 import org.junit.Test;
 

diff --git a/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/EthernetTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/EthernetTest.java
index 494dd2abf28c0d0e660debeb6a9936c3c752315a..5176bd6cbc25dacb8a0c95a33650df3002fe00c9 100644 (file)
--- a/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/EthernetTest.java
+++ b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/EthernetTest.java
@@ -11,7 +11,7 @@ package org.opendaylight.controller.sal.packet;
 
 import java.util.Arrays;
 
 
 import java.util.Arrays;
 

-import junit.framework.Assert;
+import org.junit.Assert;

 
 import org.junit.Test;
 import org.opendaylight.controller.sal.match.Match;
 
 import org.junit.Test;
 import org.opendaylight.controller.sal.match.Match;

diff --git a/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/ICMPTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/ICMPTest.java
index 287b73ae3c22fda416fe21a8f003bc9d6e451312..f591fb19521458a73d4a8800c4764dd5bcdeb6ac 100644 (file)
--- a/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/ICMPTest.java
+++ b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/ICMPTest.java
@@ -11,7 +11,7 @@ package org.opendaylight.controller.sal.packet;
 
 import java.util.Arrays;
 
 
 import java.util.Arrays;
 

-import junit.framework.Assert;
+import org.junit.Assert;

 
 import org.junit.Test;
 
 
 import org.junit.Test;
 

diff --git a/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/IEEE8021QTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/IEEE8021QTest.java
index 2443b491c7e8a7fb69fba50c65681a6bd691f597..99da52adfb09daf0ea6dd1dc3ae04be69db6041d 100644 (file)
--- a/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/IEEE8021QTest.java
+++ b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/IEEE8021QTest.java
@@ -8,7 +8,7 @@
 
 package org.opendaylight.controller.sal.packet;
 
 
 package org.opendaylight.controller.sal.packet;
 

-import junit.framework.Assert;
+import org.junit.Assert;

 
 import org.junit.Test;
 import org.opendaylight.controller.sal.match.Match;
 
 import org.junit.Test;
 import org.opendaylight.controller.sal.match.Match;

diff --git a/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/PacketTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/PacketTest.java
index 95eff32ef1899f39a3838f2f46fea8c0f51923fa..00b0feecd8e133d2a73a7bd400c271ebb18e48c6 100644 (file)
--- a/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/PacketTest.java
+++ b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/PacketTest.java
@@ -13,7 +13,7 @@ import java.net.InetAddress;
 import java.util.Arrays;
 import java.util.Map;
 
 import java.util.Arrays;
 import java.util.Map;
 

-import junit.framework.Assert;
+import org.junit.Assert;

 
 import org.junit.Test;
 import org.opendaylight.controller.sal.match.Match;
 
 import org.junit.Test;
 import org.opendaylight.controller.sal.match.Match;

diff --git a/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/TCPTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/TCPTest.java
index e56f41e5c1b301cf78eb8e1e5df3f29fcbe1e7e2..c5f69518a1781573112b6e5cc20ef70da773657d 100644 (file)
--- a/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/TCPTest.java
+++ b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/TCPTest.java
@@ -9,7 +9,7 @@
 
 package org.opendaylight.controller.sal.packet;
 
 
 package org.opendaylight.controller.sal.packet;
 

-import junit.framework.Assert;
+import org.junit.Assert;

 
 import org.junit.Test;
 import org.opendaylight.controller.sal.match.Match;
 
 import org.junit.Test;
 import org.opendaylight.controller.sal.match.Match;

diff --git a/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/UDPTest.java b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/UDPTest.java
index a3a597a82d0fcb4524da02f174c9ca0419174c81..ddb6acb0a180904e211747738c765c1656259f3f 100644 (file)
--- a/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/UDPTest.java
+++ b/opendaylight/adsal/sal/api/src/test/java/org/opendaylight/controller/sal/packet/UDPTest.java
@@ -9,7 +9,7 @@
 
 package org.opendaylight.controller.sal.packet;
 
 
 package org.opendaylight.controller.sal.packet;
 

-import junit.framework.Assert;
+import org.junit.Assert;

 
 import org.junit.Test;
 import org.opendaylight.controller.sal.match.Match;
 
 import org.junit.Test;
 import org.opendaylight.controller.sal.match.Match;

diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/ListProcessingAndOrderingTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/ListProcessingAndOrderingTest.java
index 3053b057b263ac2dc155c3ac2bc234e87a0cbc30..7274300ece30fb42f0b008b308c448dbf1606df3 100644 (file)
--- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/ListProcessingAndOrderingTest.java
+++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/ListProcessingAndOrderingTest.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.controller.md.sal.binding.data;
 
  */
 package org.opendaylight.controller.md.sal.binding.data;
 

-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;

 
 import java.util.Collections;
 import java.util.HashSet;
 
 import java.util.Collections;
 import java.util.HashSet;

diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/CrossBrokerMountPointTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/CrossBrokerMountPointTest.java
index a79b0fd53eec2ecd677108757f38d9c4692197e0..d87470a5e97c19496b1e65beaa97eefd81ad45b4 100644 (file)
--- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/CrossBrokerMountPointTest.java
+++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/CrossBrokerMountPointTest.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.controller.sal.binding.test.connect.dom;
 
  */
 package org.opendaylight.controller.sal.binding.test.connect.dom;
 

-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;

 import static org.junit.Assert.assertEquals;
 
 import java.math.BigInteger;
 import static org.junit.Assert.assertEquals;
 
 import java.math.BigInteger;

diff --git a/opendaylight/netconf/netconf-cli/src/test/java/org/opendaylight/controller/netconf/cli/io/IOUtilTest.java b/opendaylight/netconf/netconf-cli/src/test/java/org/opendaylight/controller/netconf/cli/io/IOUtilTest.java
index d6dabb9fe33130cb537875dab06ef0dc1b373fb3..cb453903f91beaab8595ce7c619d9560871917a2 100644 (file)
--- a/opendaylight/netconf/netconf-cli/src/test/java/org/opendaylight/controller/netconf/cli/io/IOUtilTest.java
+++ b/opendaylight/netconf/netconf-cli/src/test/java/org/opendaylight/controller/netconf/cli/io/IOUtilTest.java
@@ -9,7 +9,7 @@ package org.opendaylight.controller.netconf.cli.io;
 
 import com.google.common.collect.Maps;
 import java.util.Map;
 
 import com.google.common.collect.Maps;
 import java.util.Map;

-import junit.framework.Assert;
+import org.junit.Assert;

 import org.junit.Test;
 import org.opendaylight.controller.netconf.cli.commands.CommandConstants;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.junit.Test;
 import org.opendaylight.controller.netconf.cli.commands.CommandConstants;
 import org.opendaylight.yangtools.yang.common.QName;