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

merge

This commit is contained in:
Julian Dolby 2013-09-18 14:05:48 -04:00
parent dd4d794517
commit 05003d52c9
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShape.java
View File

@ -296,8 +296,6 @@ public abstract class TestSimplePageCallGraphShape extends TestJSCallGraphShape
verifyGraphAssertions(CG, assertionsForWindowx);
}
<<<<<<< HEAD
=======
private static final Object[][] assertionsForWindowOnload = new Object[][] {
new Object[] { ROOT, new String[] { "windowonload.html" } },
new Object[] { "windowonload.html", new String[] { "windowonload.html/__WINDOW_MAIN__" } },
@ -312,8 +310,6 @@ public abstract class TestSimplePageCallGraphShape extends TestJSCallGraphShape
verifyGraphAssertions(CG, assertionsForWindowOnload);
}
>>>>>>> 8984637b86dd09a60d973627e83d1daf648826a8
/*
@Test public void testJQuery() throws IOException, IllegalArgumentException, CancelException, WalaException {
URL url = getClass().getClassLoader().getResource("pages/jquery.html");