Address review

Author: t1mlange

soot-infoflow-integration/test/soot/jimple/infoflow/integration/test/junit/OutputStreamTests.java

@@ -259,7 +259,7 @@ public void testFileWriter1() {
         this.checkInfoflow(infoflow, 1);
     }
 
-    @Test//(timeout = 30000)
+    @Test(timeout = 30000)
     public void testCastWithSummaryTypeInformation1() {
         IInfoflow infoflow = this.initInfoflow();
         infoflow.setTaintPropagationHandler(new DebugFlowFunctionTaintPropagationHandler());

soot-infoflow-summaries/src/soot/jimple/infoflow/methodSummary/taintWrappers/SummaryTaintWrapper.java

@@ -208,49 +208,53 @@ public void initialize(InfoflowManager manager) {
 			fallbackWrapper.initialize(manager);
 	}
 
-	public Collection<PreAnalysisHandler> getPreAnalysisHandlers() {
-		return Collections.singleton(new PreAnalysisHandler() {
-			@Override
-			public void onBeforeCallgraphConstruction() {
-				// Inject the hierarchy
-				for (String className : flows.getAllClassesWithSummaries()) {
-					SootClass sc = Scene.v().forceResolve(className, SootClass.SIGNATURES);
-					if (sc.isPhantom()) {
-						ClassMethodSummaries summaries = flows.getClassFlows(className);
-						if (summaries != null) {
-							// Some phantom classes are actually interfaces
-							if (summaries.hasInterfaceInfo()) {
-								if (summaries.isInterface())
-									sc.setModifiers(sc.getModifiers() | Modifier.INTERFACE);
-								else
-									sc.setModifiers(sc.getModifiers() & ~Modifier.INTERFACE);
-							}
-
-							// Set the correct superclass
-							if (summaries.hasSuperclass()) {
-								final String superclassName = summaries.getSuperClass();
-								SootClass scSuperclass = Scene.v().forceResolve(superclassName, SootClass.SIGNATURES);
-								sc.setSuperclass(scSuperclass);
-							}
-
-							// Register the interfaces
-							if (summaries.hasInterfaces()) {
-								for (String intfName : summaries.getInterfaces()) {
-									SootClass scIntf = Scene.v().forceResolve(intfName, SootClass.SIGNATURES);
-									if (!sc.implementsInterface(intfName))
-										sc.addInterface(scIntf);
-								}
-							}
-						}
+	class HierarchyInjector implements PreAnalysisHandler {
+		@Override
+		public void onBeforeCallgraphConstruction() {
+			// Inject the hierarchy
+			for (String className : flows.getAllClassesWithSummaries()) {
+				SootClass sc = Scene.v().forceResolve(className, SootClass.SIGNATURES);
+				if (!sc.isPhantom())
+					return;
+
+				ClassMethodSummaries summaries = flows.getClassFlows(className);
+				if (summaries == null)
+					return;
+
+				// Some phantom classes are actually interfaces
+				if (summaries.hasInterfaceInfo()) {
+					if (summaries.isInterface())
+						sc.setModifiers(sc.getModifiers() | Modifier.INTERFACE);
+					else
+						sc.setModifiers(sc.getModifiers() & ~Modifier.INTERFACE);
+				}
+
+				// Set the correct superclass
+				if (summaries.hasSuperclass()) {
+					final String superclassName = summaries.getSuperClass();
+					SootClass scSuperclass = Scene.v().forceResolve(superclassName, SootClass.SIGNATURES);
+					sc.setSuperclass(scSuperclass);
+				}
+
+				// Register the interfaces
+				if (summaries.hasInterfaces()) {
+					for (String intfName : summaries.getInterfaces()) {
+						SootClass scIntf = Scene.v().forceResolve(intfName, SootClass.SIGNATURES);
+						if (!sc.implementsInterface(intfName))
+							sc.addInterface(scIntf);
 					}
 				}
 			}
+		}
 
-			@Override
-			public void onAfterCallgraphConstruction() {
+		@Override
+		public void onAfterCallgraphConstruction() {
+			// NO-OP
+		}
+	}
 
-			}
-		});
+	public Collection<PreAnalysisHandler> getPreAnalysisHandlers() {
+		return Collections.singleton(new HierarchyInjector());
 	}
 
 	/**