Don't use deprecated Assert

diff --git a/dcevm/src/test/java7/com/github/dcevm/test/TestUtil.java b/dcevm/src/test/java7/com/github/dcevm/test/TestUtil.java
index e5ee6bab2c879e746eb66a15354536e3bba722f6..41dda642c4ddc0a7d9d710829ba351e99ac8db35 100644 (file)
--- a/dcevm/src/test/java7/com/github/dcevm/test/TestUtil.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/TestUtil.java
@@ -24,8 +24,8 @@
 
 package com.github.dcevm.test;
 
-import junit.framework.Assert;
 import com.github.dcevm.HotSwapTool;
+import org.junit.Assert;
 
 /**
  * Utility methods for unit testing.

diff --git a/dcevm/src/test/java7/com/github/dcevm/test/body/StaticTest.java b/dcevm/src/test/java7/com/github/dcevm/test/body/StaticTest.java
index 29a5ecdf6d75a64d1e8d1420ff69c02fc7c25b04..7b46c9712a28d01c5dc84374fe45fbe6a9797d99 100644 (file)
--- a/dcevm/src/test/java7/com/github/dcevm/test/body/StaticTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/body/StaticTest.java
@@ -32,9 +32,7 @@ import java.util.List;
 
 import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
 import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
-import static junit.framework.Assert.assertNull;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
  * @author Thomas Wuerthinger

diff --git a/dcevm/src/test/java7/com/github/dcevm/test/methods/CallDeletedMethodTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/CallDeletedMethodTest.java
index 08a70bdf35eeb269f6da333cc4076f99c0a23d65..794f945d1e51fd33776e0648ceca882a8bbc0141 100644 (file)
--- a/dcevm/src/test/java7/com/github/dcevm/test/methods/CallDeletedMethodTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/CallDeletedMethodTest.java
@@ -27,7 +27,7 @@ package com.github.dcevm.test.methods;
 import com.github.dcevm.MethodRedefinitionPolicy;
 import com.github.dcevm.RedefinitionPolicy;
 import com.github.dcevm.test.category.Full;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;

diff --git a/dcevm/src/test/java7/com/github/dcevm/test/methods/ClassReflectionTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/ClassReflectionTest.java
index 19ad9cb3ecb6f7c250a605caa95695f4ef1d43e7..04541cbba0ee9c1f53504d0647d83a17cedbf2ca 100644 (file)
--- a/dcevm/src/test/java7/com/github/dcevm/test/methods/ClassReflectionTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/ClassReflectionTest.java
@@ -25,7 +25,7 @@
 package com.github.dcevm.test.methods;
 
 import com.github.dcevm.test.TestUtil;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/dcevm/src/test/java7/com/github/dcevm/test/methods/DeleteActiveMethodTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/DeleteActiveMethodTest.java
index 7d0c11e023babb33ca79017ec7d1475c570bb65d..baf10730940353a1dbb6763809eda8c27b7124af 100644 (file)
--- a/dcevm/src/test/java7/com/github/dcevm/test/methods/DeleteActiveMethodTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/DeleteActiveMethodTest.java
@@ -24,18 +24,16 @@
 
 package com.github.dcevm.test.methods;
 
-import static org.junit.Assert.assertEquals;
-
 import com.github.dcevm.MethodRedefinitionPolicy;
 import com.github.dcevm.RedefinitionPolicy;
 import com.github.dcevm.test.TestUtil;
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import static com.github.dcevm.test.util.HotSwapTestHelper.__toVersion__;
 import static com.github.dcevm.test.util.HotSwapTestHelper.__version__;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test cases that delete a method that is currently active on the stack.

diff --git a/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodReflectionTest.java b/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodReflectionTest.java
index f5a6f1052fe11dd91b14a2fc3c19c729e50752fa..de9cc1592ba9640e4d9ad95071bf7d5bdeb44369 100644 (file)
--- a/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodReflectionTest.java
+++ b/dcevm/src/test/java7/com/github/dcevm/test/methods/MethodReflectionTest.java
@@ -24,7 +24,7 @@
 
 package com.github.dcevm.test.methods;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;