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

right classloader for call graph tests

This commit is contained in:
Cosmin Radoi 2013-04-24 22:10:15 -05:00 committed by Marcel Bruch
parent ef74c04c28
commit cab3c6c0c4
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTestUtil.java
View File

@ -10,7 +10,11 @@
*******************************************************************************/
package com.ibm.wala.core.tests.callGraph;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import com.ibm.wala.ipa.callgraph.AnalysisCache;
import com.ibm.wala.ipa.callgraph.AnalysisOptions;
@ -22,6 +26,7 @@ import com.ibm.wala.ipa.callgraph.impl.Util;
import com.ibm.wala.ipa.cha.IClassHierarchy;
import com.ibm.wala.util.CancelException;
import com.ibm.wala.util.config.AnalysisScopeReader;
import com.ibm.wala.util.config.FileOfClasses;
import com.ibm.wala.util.io.FileProvider;
import com.ibm.wala.util.perf.StopwatchGC;
@ -44,8 +49,37 @@ public class CallGraphTestUtil {
*/
private static final boolean CHECK_FOOTPRINT = false;
public static AnalysisScope makeJ2SEAnalysisScope(String scopeFile, String exclusionsFile) throws IOException {
AnalysisScope scope = AnalysisScopeReader.readJavaScope(scopeFile, (new FileProvider()).getFile(exclusionsFile), MY_CLASSLOADER);
public static AnalysisScope makeJ2SEAnalysisScope(String scopeFileName, String exclusionsFileName) throws IOException {
AnalysisScope scope = AnalysisScope.createJavaAnalysisScope();
FileProvider fileProvider = new FileProvider();
File exclusionsFile = fileProvider.getFile(exclusionsFileName, MY_CLASSLOADER);
BufferedReader r = null;
try {
InputStream scopeStream = fileProvider.getInputStreamFromClassLoader(scopeFileName, MY_CLASSLOADER);
String line;
// assume the scope file is UTF-8 encoded; ASCII files will also be
// handled properly
// TODO allow specifying encoding as a parameter?
r = new BufferedReader(new InputStreamReader(scopeStream, "UTF-8"));
while ((line = r.readLine()) != null) {
AnalysisScopeReader.processScopeDefLine(scope, MY_CLASSLOADER, line);
}
if (exclusionsFile != null) {
scope.setExclusions(FileOfClasses.createFileOfClasses(exclusionsFile));
}
} finally {
if (r != null) {
try {
r.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return scope;
}

2
com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/slicer/SlicerTest.java
View File

@ -71,7 +71,7 @@ public class SlicerTest {
private static AnalysisScope findOrCreateAnalysisScope() throws IOException {
if (cachedScope == null) {
cachedScope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, "Java60RegressionExclusions.txt");
cachedScope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, "/Java60RegressionExclusions.txt");
}
return cachedScope;
}