Don't use deprecated Assert

6 files changed, 7 insertions, 11 deletions

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 e5ee6bab..41dda642 100644
--- 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 29a5ecdf..7b46c971 100644
--- 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 08a70bdf..794f945d 100644
--- 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 19ad9cb3..04541cbb 100644
--- 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 7d0c11e0..baf10730 100644
--- 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 f5a6f105..de9cc159 100644
--- 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;