From c904bf1e143b40e64b206c063a89e821056bc6b1 Mon Sep 17 00:00:00 2001 From: dolby-oss Date: Mon, 2 Feb 2009 18:40:10 +0000 Subject: [PATCH] fixes to Java source test failures git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@3198 f5eafffb-2e1d-0410-98e4-8ec43c5233c4 --- ...{StaticInit.java => StaticInitializers.java} | 6 +++--- .../ibm/wala/cast/java/test/JavaIRTests.java | 17 +++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) rename com.ibm.wala.cast.java.test.data/src/{StaticInit.java => StaticInitializers.java} (88%) diff --git a/com.ibm.wala.cast.java.test.data/src/StaticInit.java b/com.ibm.wala.cast.java.test.data/src/StaticInitializers.java similarity index 88% rename from com.ibm.wala.cast.java.test.data/src/StaticInit.java rename to com.ibm.wala.cast.java.test.data/src/StaticInitializers.java index 239fcd5d6..18f3295ca 100644 --- a/com.ibm.wala.cast.java.test.data/src/StaticInit.java +++ b/com.ibm.wala.cast.java.test.data/src/StaticInitializers.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *****************************************************************************/ -public class StaticInit { +public class StaticInitializers { static class X { int x; @@ -30,12 +30,12 @@ public class StaticInit { y = new X(); } - private static int sum() { + private int sum() { return x.sum() * y.diff(); } public static void main(String[] args) { - StaticInit SI = new StaticInit(); + StaticInitializers SI = new StaticInitializers(); SI.sum(); } } diff --git a/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java b/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java index 887e3a171..00c2e7608 100644 --- a/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java +++ b/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java @@ -63,13 +63,14 @@ public abstract class JavaIRTests extends IRTests { public void testSimple1() { - List assertions = Arrays.asList(new SourceMapAssertion("Source#Simple1#doStuff#(I)V", "prod", 14), - new SourceMapAssertion("Source#Simple1#doStuff#(I)V", "j", 13), new SourceMapAssertion( - "Source#Simple1#main#([Ljava/lang/String;)V", "s", 22), new SourceMapAssertion( - "Source#Simple1#main#([Ljava/lang/String;)V", "i", 18), new SourceMapAssertion( - "Source#Simple1#main#([Ljava/lang/String;)V", "sum", 19), EdgeAssertions.make( - "Source#Simple1#main#([Ljava/lang/String;)V", "Source#Simple1#doStuff#(I)V"), EdgeAssertions.make( - "Source#Simple1#instanceMethod1#()V", "Source#Simple1#instanceMethod2#()V")); + List assertions = Arrays.asList( + new SourceMapAssertion("Source#Simple1#doStuff#(I)V", "prod", 24), + new SourceMapAssertion("Source#Simple1#doStuff#(I)V", "j", 23), + new SourceMapAssertion("Source#Simple1#main#([Ljava/lang/String;)V", "s", 32), + new SourceMapAssertion("Source#Simple1#main#([Ljava/lang/String;)V", "i", 28), + new SourceMapAssertion("Source#Simple1#main#([Ljava/lang/String;)V", "sum", 29), + EdgeAssertions.make("Source#Simple1#main#([Ljava/lang/String;)V", "Source#Simple1#doStuff#(I)V"), + EdgeAssertions.make("Source#Simple1#instanceMethod1#()V", "Source#Simple1#instanceMethod2#()V")); // this needs soure positions to work too runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), assertions, true); @@ -549,7 +550,7 @@ public abstract class JavaIRTests extends IRTests { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); } - public void testStaticInit() { + public void testStaticInitializers() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); }