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

add CancelException to interact with Eclipse progress monitors and thread it through some APIs 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@2003 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
sjfink 2007-11-13 16:18:48 +00:00
parent 5ed0e82014
commit dab36d8d6f
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestAjaxsltCallGraphShape.java
View File

@ -14,6 +14,7 @@ import java.io.IOException;
import java.net.URL;
import com.ibm.wala.cast.js.translator.JavaScriptTranslatorFactory;
import com.ibm.wala.eclipse.util.CancelException;
import com.ibm.wala.ipa.callgraph.CallGraph;
public class TestAjaxsltCallGraphShape extends TestJSCallGraphShape {
@ -30,7 +31,7 @@ public class TestAjaxsltCallGraphShape extends TestJSCallGraphShape {
};
public void testAjaxslt() throws IOException {
public void testAjaxslt() throws IOException, IllegalArgumentException, CancelException {
URL url = getClass().getClassLoader().getResource("ajaxslt/test/xslt.html");
CallGraph CG = Util.makeHTMLCG(url);
verifyGraphAssertions(CG, assertionsForAjaxslt);
@ -40,7 +41,7 @@ public class TestAjaxsltCallGraphShape extends TestJSCallGraphShape {
};
public void testAjaxpath() throws IOException {
public void testAjaxpath() throws IOException, IllegalArgumentException, CancelException {
URL url = getClass().getClassLoader().getResource("ajaxslt/test/xpath.html");
CallGraph CG = Util.makeHTMLCG(url);
verifyGraphAssertions(CG, assertionsForAjaxpath);

25
com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShape.java
View File

@ -13,6 +13,7 @@ package com.ibm.wala.cast.js.test;
import java.io.IOException;
import com.ibm.wala.cast.js.translator.JavaScriptTranslatorFactory;
import com.ibm.wala.eclipse.util.CancelException;
import com.ibm.wala.ipa.callgraph.CallGraph;
import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder;
@ -50,7 +51,7 @@ public class TestSimpleCallGraphShape extends TestJSCallGraphShape {
new String[]{"prologue.js/abs"}}
};
public void testSimple() throws IOException {
public void testSimple() throws IOException, IllegalArgumentException, CancelException {
CallGraph CG = Util.makeScriptCG("tests", "simple.js");
verifyGraphAssertions(CG, assertionsForSimple);
}
@ -70,7 +71,7 @@ public class TestSimpleCallGraphShape extends TestJSCallGraphShape {
"tests/objects.js/whatever"}}};
public void testObjects() throws IOException {
public void testObjects() throws IOException, IllegalArgumentException, CancelException {
CallGraph CG = Util.makeScriptCG("tests", "objects.js");
verifyGraphAssertions(CG, assertionsForObjects);
}
@ -92,7 +93,7 @@ public class TestSimpleCallGraphShape extends TestJSCallGraphShape {
*/
};
public void testInherit() throws IOException {
public void testInherit() throws IOException, IllegalArgumentException, CancelException {
CallGraph CG = Util.makeScriptCG("tests", "inherit.js");
verifyGraphAssertions(CG, assertionsForInherit);
}
@ -106,7 +107,7 @@ public class TestSimpleCallGraphShape extends TestJSCallGraphShape {
"ctor 3/_fromctor"}}
};
public void testNewfn() throws IOException {
public void testNewfn() throws IOException, IllegalArgumentException, CancelException {
CallGraph CG = Util.makeScriptCG("tests", "newfn.js");
verifyGraphAssertions(CG, assertionsForNewfn);
}
@ -122,7 +123,7 @@ public class TestSimpleCallGraphShape extends TestJSCallGraphShape {
"tests/control-flow.js/testReturn"}}
};
public void testControlflow() throws IOException {
public void testControlflow() throws IOException, IllegalArgumentException, CancelException {
CallGraph CG = Util.makeScriptCG("tests", "control-flow.js");
verifyGraphAssertions(CG, assertionsForControlflow);
}
@ -139,7 +140,7 @@ public class TestSimpleCallGraphShape extends TestJSCallGraphShape {
"tests/more-control-flow.js/testReturn"}}
};
public void testMoreControlflow() throws IOException {
public void testMoreControlflow() throws IOException, IllegalArgumentException, CancelException {
CallGraph CG = Util.makeScriptCG("tests", "more-control-flow.js");
verifyGraphAssertions(CG, assertionsForMoreControlflow);
}
@ -154,7 +155,7 @@ public class TestSimpleCallGraphShape extends TestJSCallGraphShape {
"tests/forin.js/testForIn2"}}
};
public void testForin() throws IOException {
public void testForin() throws IOException, IllegalArgumentException, CancelException {
CallGraph CG = Util.makeScriptCG("tests", "forin.js");
verifyGraphAssertions(CG, assertionsForForin);
}
@ -177,7 +178,7 @@ public class TestSimpleCallGraphShape extends TestJSCallGraphShape {
"tests/simple-lexical.js/outer/inner3"}}
};
public void testSimpleLexical() throws IOException {
public void testSimpleLexical() throws IOException, IllegalArgumentException, CancelException {
CallGraph CG = Util.makeScriptCG("tests", "simple-lexical.js");
verifyGraphAssertions(CG, assertionsForSimpleLexical);
}
@ -204,7 +205,7 @@ public class TestSimpleCallGraphShape extends TestJSCallGraphShape {
"tests/try.js/two"}}
};
public void testTry() throws IOException {
public void testTry() throws IOException, IllegalArgumentException, CancelException {
CallGraph CG = Util.makeScriptCG("tests", "try.js", true);
verifyGraphAssertions(CG, assertionsForTry);
}
@ -217,7 +218,7 @@ public class TestSimpleCallGraphShape extends TestJSCallGraphShape {
"tests/string-op.js/plusNum"}}
};
public void testStringOp() throws IOException {
public void testStringOp() throws IOException, IllegalArgumentException, CancelException {
PropagationCallGraphBuilder B =
Util.makeScriptCGBuilder("tests", "string-op.js");
B.getOptions().setTraceStringConstants( true );
@ -235,7 +236,7 @@ public class TestSimpleCallGraphShape extends TestJSCallGraphShape {
"tests/upward.js/tester2"}}
};
public void testUpward() throws IOException {
public void testUpward() throws IOException, IllegalArgumentException, CancelException {
CallGraph CG = Util.makeScriptCG("tests", "upward.js");
verifyGraphAssertions(CG, assertionsForUpward);
}
@ -248,7 +249,7 @@ public class TestSimpleCallGraphShape extends TestJSCallGraphShape {
"prologue.js/toUpperCase"}}
};
public void testStringPrims() throws IOException {
public void testStringPrims() throws IOException, IllegalArgumentException, CancelException {
PropagationCallGraphBuilder B =
Util.makeScriptCGBuilder("tests", "string-prims.js");
B.getOptions().setTraceStringConstants( true );

9
com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/Util.java
View File

@ -21,6 +21,7 @@ import com.ibm.wala.cast.js.ipa.callgraph.*;
import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory;
import com.ibm.wala.cast.js.util.WebUtil;
import com.ibm.wala.classLoader.SourceFileModule;
import com.ibm.wala.eclipse.util.CancelException;
import com.ibm.wala.ipa.callgraph.AnalysisCache;
import com.ibm.wala.ipa.callgraph.AnalysisOptions;
import com.ibm.wala.ipa.callgraph.AnalysisScope;
@ -57,18 +58,18 @@ public class Util extends com.ibm.wala.cast.js.ipa.callgraph.Util {
return makeScriptCGBuilder(dir, name, false);
}
public static CallGraph makeScriptCG(String dir, String name) throws IOException {
public static CallGraph makeScriptCG(String dir, String name) throws IOException, IllegalArgumentException, CancelException {
return makeScriptCG(dir, name, false);
}
public static CallGraph makeScriptCG(String dir, String name, boolean useOneCFA) throws IOException {
public static CallGraph makeScriptCG(String dir, String name, boolean useOneCFA) throws IOException, IllegalArgumentException, CancelException {
PropagationCallGraphBuilder b = makeScriptCGBuilder(dir, name, useOneCFA);
CallGraph CG = b.makeCallGraph(b.getOptions());
dumpCG(b, CG);
return CG;
}
public static CallGraph makeScriptCG(SourceFileModule[] scripts, boolean useOneCFA) throws IOException {
public static CallGraph makeScriptCG(SourceFileModule[] scripts, boolean useOneCFA) throws IOException, IllegalArgumentException, CancelException {
PropagationCallGraphBuilder b = makeCGBuilder(scripts, useOneCFA);
CallGraph CG = b.makeCallGraph(b.getOptions());
dumpCG(b, CG);
@ -80,7 +81,7 @@ public class Util extends com.ibm.wala.cast.js.ipa.callgraph.Util {
return makeCGBuilder(new SourceFileModule[] { script }, false);
}
public static CallGraph makeHTMLCG(URL url) throws IOException {
public static CallGraph makeHTMLCG(URL url) throws IOException, IllegalArgumentException, CancelException {
PropagationCallGraphBuilder b = makeHTMLCGBuilder(url);
CallGraph CG = b.makeCallGraph(b.getOptions());
dumpCG(b, CG);