DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes to Java source test failures 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@3198 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
dolby-oss 2009-02-02 18:40:10 +00:00
parent bc9da8e508
commit c904bf1e14
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
com.ibm.wala.cast.java.test.data/src/StaticInit.java → com.ibm.wala.cast.java.test.data/src/StaticInitializers.java
View File

@ -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();
}
}

17
com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java
View File

@ -63,13 +63,14 @@ public abstract class JavaIRTests extends IRTests {
public void testSimple1() {
List<? extends IRAssertion> 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<? extends IRAssertion> 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);
}