diff --git a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java index c361b93c3..c07de7174 100644 --- a/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java +++ b/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java @@ -17,6 +17,8 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Properties; +import org.junit.Assert; + import com.ibm.wala.cast.js.html.DefaultSourceExtractor; import com.ibm.wala.cast.js.html.JSSourceExtractor; import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder; @@ -38,8 +40,6 @@ import com.ibm.wala.util.io.CommandLine; import com.ibm.wala.util.io.FileProvider; import com.ibm.wala.util.io.FileUtil; -import junit.framework.Assert; - /** * Utility class for building call graphs of HTML pages. * diff --git a/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstPattern.java b/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstPattern.java index 79fa13a38..1c6660529 100644 --- a/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstPattern.java +++ b/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstPattern.java @@ -16,6 +16,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.junit.Assert; import org.junit.Test; import com.ibm.wala.cast.tree.CAstNode; @@ -25,8 +26,6 @@ import com.ibm.wala.cast.util.CAstPattern.Segments; import com.ibm.wala.cast.util.CAstPrinter; import com.ibm.wala.core.tests.util.WalaTestCase; -import junit.framework.Assert; - public class TestCAstPattern extends WalaTestCase { private static final int NAME_ASSERTION_SINGLE = 501; diff --git a/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstTranslator.java b/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstTranslator.java index a0e80b3df..109f75db0 100644 --- a/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstTranslator.java +++ b/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstTranslator.java @@ -18,6 +18,8 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; +import org.junit.Assert; + import com.ibm.wala.cast.ipa.callgraph.CAstCallGraphUtil; import com.ibm.wala.cast.ir.ssa.AstIRFactory; import com.ibm.wala.cast.loader.SingleClassLoaderFactory; @@ -36,8 +38,6 @@ import com.ibm.wala.ssa.SSAOptions; import com.ibm.wala.util.collections.HashMapFactory; import com.ibm.wala.util.collections.Pair; -import junit.framework.Assert; - public abstract class TestCAstTranslator extends WalaTestCase { protected static class TranslatorAssertions { diff --git a/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCallGraphShape.java b/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCallGraphShape.java index b98d14f7e..593d63ea9 100644 --- a/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCallGraphShape.java +++ b/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCallGraphShape.java @@ -13,6 +13,8 @@ package com.ibm.wala.cast.test; import java.util.Collection; import java.util.Iterator; +import org.junit.Assert; + import com.ibm.wala.cast.loader.AstMethod; import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position; import com.ibm.wala.classLoader.CallSiteReference; @@ -24,8 +26,6 @@ import com.ibm.wala.ssa.SSACFG; import com.ibm.wala.ssa.SSAInstruction; import com.ibm.wala.util.collections.NonNullSingletonIterator; -import junit.framework.Assert; - public abstract class TestCallGraphShape extends WalaTestCase { protected void verifyCFGAssertions(CallGraph CG, Object[][] assertionData) { diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/ExclusionsTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/ExclusionsTest.java index 99e0d9bcd..151f9467e 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/ExclusionsTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/ExclusionsTest.java @@ -12,6 +12,7 @@ package com.ibm.wala.core.tests.cha; import java.io.IOException; +import org.junit.Assert; import org.junit.Test; import com.ibm.wala.core.tests.util.TestConstants; @@ -22,8 +23,6 @@ import com.ibm.wala.util.config.AnalysisScopeReader; import com.ibm.wala.util.io.FileProvider; import com.ibm.wala.util.strings.StringStuff; -import junit.framework.Assert; - public class ExclusionsTest { @Test diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGSanitizerTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGSanitizerTest.java index 343edeeb4..29f961dd8 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGSanitizerTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGSanitizerTest.java @@ -14,6 +14,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Map; +import org.junit.Assert; import org.junit.Test; import com.ibm.wala.cfg.CFGSanitizer; @@ -37,8 +38,6 @@ import com.ibm.wala.util.config.AnalysisScopeReader; import com.ibm.wala.util.graph.Graph; import com.ibm.wala.util.io.FileProvider; -import junit.framework.Assert; - /** * Test integrity of CFGs */ diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/ZeroLengthArrayTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/ZeroLengthArrayTest.java index 2d9536d68..a4f30fa49 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/ZeroLengthArrayTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/ZeroLengthArrayTest.java @@ -12,6 +12,7 @@ package com.ibm.wala.core.tests.ptrs; import java.io.IOException; +import org.junit.Assert; import org.junit.Test; import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil; @@ -38,8 +39,6 @@ import com.ibm.wala.types.TypeReference; import com.ibm.wala.util.CancelException; import com.ibm.wala.util.intset.OrdinalSet; -import junit.framework.Assert; - public class ZeroLengthArrayTest { @Test diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/DataflowTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/DataflowTest.java index 556e98fc0..836fc9cb7 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/DataflowTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/DataflowTest.java @@ -15,6 +15,7 @@ import java.util.ArrayList; import java.util.List; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -54,8 +55,6 @@ import com.ibm.wala.util.config.FileOfClasses; import com.ibm.wala.util.intset.IntIterator; import com.ibm.wala.util.intset.IntSet; -import junit.framework.Assert; - /** * Tests of various flow analysis engines. */ diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/InitializerTest.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/InitializerTest.java index 2176d6b9d..2d9e91b12 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/InitializerTest.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/InitializerTest.java @@ -13,6 +13,8 @@ package com.ibm.wala.examples.analysis.dataflow; import java.io.IOException; +import org.junit.Assert; + import com.ibm.wala.classLoader.IClass; import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil; import com.ibm.wala.core.tests.util.TestConstants; @@ -38,8 +40,6 @@ import com.ibm.wala.util.intset.IntIterator; import com.ibm.wala.util.intset.IntSet; import com.ibm.wala.util.io.FileProvider; -import junit.framework.Assert; - public class InitializerTest { /** diff --git a/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaTest.java b/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaTest.java index 2dc4eb103..37c436327 100644 --- a/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaTest.java +++ b/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaTest.java @@ -16,6 +16,7 @@ import java.util.Collection; import java.util.List; import org.eclipse.core.runtime.CoreException; +import org.junit.Assert; import com.ibm.wala.cast.java.client.JDTJavaSourceAnalysisEngine; import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope; @@ -29,8 +30,6 @@ import com.ibm.wala.ipa.callgraph.propagation.InstanceKey; import com.ibm.wala.ipa.cha.IClassHierarchy; import com.ibm.wala.util.io.TemporaryFile; -import junit.framework.Assert; - public abstract class JDTJavaTest extends IRTests { static {