INVIVO-1

Jonathan Bell [2012-03-22 01:56:46]
INVIVO-1
Filename
Columbus2Tester/lib/invivo.jar
columbus2/jar-descriptor.jardesc
columbus2/src/edu/columbia/cs/psl/metamorphic/runtime/Interceptor.java
diff --git a/Columbus2Tester/lib/invivo.jar b/Columbus2Tester/lib/invivo.jar
index bfcb898..b6f19d8 100644
Binary files a/Columbus2Tester/lib/invivo.jar and b/Columbus2Tester/lib/invivo.jar differ
diff --git a/columbus2/jar-descriptor.jardesc b/columbus2/jar-descriptor.jardesc
index 5efe411..9765a93 100644
--- a/columbus2/jar-descriptor.jardesc
+++ b/columbus2/jar-descriptor.jardesc
@@ -1,25 +1,17 @@
 <?xml version="1.0" encoding="MacRoman" standalone="no"?>
 <jardesc>
     <jar path="Columbus2Tester/lib/columbus2.jar"/>
-    <options buildIfNeeded="true" compress="false" descriptionLocation="/columbus2/jar-descriptor.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="true" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
+    <options buildIfNeeded="true" compress="false" descriptionLocation="/columbus2-runtime/jar-descriptor.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="true" overwrite="true" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>
-    <manifest generateManifest="false" manifestLocation="/columbus2/META-INF/MANIFEST.MF" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
+    <manifest generateManifest="false" manifestLocation="/columbus2-runtime/META-INF/MANIFEST.MF" manifestVersion="1.0" reuseManifest="false" saveManifest="false" usesManifest="true">
         <sealing sealJar="false">
             <packagesToSeal/>
             <packagesToUnSeal/>
         </sealing>
     </manifest>
     <selectedElements exportClassFiles="true" exportJavaFiles="false" exportOutputFolder="false">
-        <file path="/columbus2/.project"/>
-        <folder path="/columbus2/c"/>
-        <folder path="/columbus2/lib"/>
-        <javaElement handleIdentifier="=columbus2/src"/>
-        <folder path="/columbus2/META-INF"/>
-        <file path="/columbus2/.DS_Store"/>
-        <file path="/columbus2/libforker.jnilib"/>
-        <file path="/columbus2/README.txt"/>
-        <file path="/columbus2/TODO.txt"/>
-        <file path="/columbus2/.classpath"/>
+        <javaElement handleIdentifier="=columbus2-runtime/src"/>
+        <folder path="/columbus2-runtime/META-INF"/>
     </selectedElements>
 </jardesc>
diff --git a/columbus2/src/edu/columbia/cs/psl/metamorphic/runtime/Interceptor.java b/columbus2/src/edu/columbia/cs/psl/metamorphic/runtime/Interceptor.java
index 8ab2651..8be0d73 100644
--- a/columbus2/src/edu/columbia/cs/psl/metamorphic/runtime/Interceptor.java
+++ b/columbus2/src/edu/columbia/cs/psl/metamorphic/runtime/Interceptor.java
@@ -3,6 +3,8 @@ package edu.columbia.cs.psl.metamorphic.runtime;
 import java.lang.reflect.Method;
 import java.util.HashMap;

+import org.apache.log4j.Logger;
+


 import edu.columbia.cs.psl.invivo.runtime.AbstractInterceptor;
@@ -25,7 +27,7 @@ public class Interceptor extends AbstractInterceptor {
 	private HashMap<Integer, MetamorphicMethodInvocation> invocations = new HashMap<Integer, MetamorphicMethodInvocation>();
 	private Integer invocationId = 0;
 	private Class<?> testerClass;
-
+	private Logger logger = Logger.getLogger(Interceptor.class);
 	public Interceptor(Object intercepted) {
 		super(intercepted);
 		try {
@@ -115,6 +117,9 @@ public class Interceptor extends AbstractInterceptor {
 		for(MethodInvocation i : inv.children)
 		{
 			i.thread.join();
+			logger.info("\tChild"+getChildId(i.callee) +" finished");
+
+
 			checkParams[0] = val;
 			checkParams[1] = i.returnValue;
 			if(((Boolean)i.checkMethod.invoke(null, checkParams)) == false)
@@ -122,8 +127,7 @@ public class Interceptor extends AbstractInterceptor {
 				throw new IllegalStateException("Metamorphic property has been violated on " + inv.method +". Rule: [" + ((MetamorphicMethodInvocation) i).rule +"]. Outputs were [" + val+"], ["+i.returnValue+"]");
 			}
 		}
-		System.out.println("Invocation result: " + inv);
-
+		logger.info("Invocation result: " + inv);
 		}
 		catch(Exception ex)
 		{