[P-unit-devel] SF.net SVN: p-unit: [80] trunk/punit

[<zha...@us...>]

Revision: 80
          http://p-unit.svn.sourceforge.net/p-unit/?rev=80&view=rev
Author:   zhanghuangzhu
Date:     2007-05-15 03:25:34 -0700 (Tue, 15 May 2007)

Log Message:
-----------
Andrew Zhang: began to implement vm competitive feature.

Modified Paths:
--------------
    trunk/punit/src/org/punit/reporter/stream/file/FileLoggerListener.java
    trunk/punit/src/org/punit/runner/PUnitAbstractRunner.java
    trunk/punit/src/org/punit/runner/PUnitSoloRunner.java
    trunk/punit.test/src/tests/api/org/punit/reporter/logger/PUnitLoggerTest.java
    trunk/punit.test/src/tests/api/org/punit/runner/PUnitSoloRunnerTest.java

Added Paths:
-----------
    trunk/punit.test/src/tests/samples/VMsSample.java

Modified: trunk/punit/src/org/punit/reporter/stream/file/FileLoggerListener.java
===================================================================
--- trunk/punit/src/org/punit/reporter/stream/file/FileLoggerListener.java	2007-05-15 09:32:50 UTC (rev 79)
+++ trunk/punit/src/org/punit/reporter/stream/file/FileLoggerListener.java	2007-05-15 10:25:34 UTC (rev 80)
@@ -30,12 +30,17 @@
 	}
 
 	private String generateFileName(Class clazz, Runner runner) {
+		PUnitArgs pargs = runner.punitArgs();
 		StringBuffer sb = new StringBuffer();
+		sb.append(pargs.resultFolder);
+		sb.append(File.separator);
 		sb.append(ReporterConstants.RESULT_FOLDER);
 		sb.append(File.separator);
 		sb.append(clazz.getName());
 		sb.append("."); //$NON-NLS-1$
 		sb.append(runner.punitName());
+		
+		sb.append("."); //$NON-NLS-1$
 		sb.append(".txt"); //$NON-NLS-1$
 		return sb.toString();
 	}

Modified: trunk/punit/src/org/punit/runner/PUnitAbstractRunner.java
===================================================================
--- trunk/punit/src/org/punit/runner/PUnitAbstractRunner.java	2007-05-15 09:32:50 UTC (rev 79)
+++ trunk/punit/src/org/punit/runner/PUnitAbstractRunner.java	2007-05-15 10:25:34 UTC (rev 80)
@@ -42,7 +42,7 @@
 		runImpl(clazz);
 	}
 
-	public void run(PUnitArgs pargs) {
+	protected void run(PUnitArgs pargs) {
 		punitArgs(pargs);
 		Class clazz = ReflectionUtil.newClass(pargs.testClassName);
 		runImpl(clazz);
@@ -72,10 +72,11 @@
 	private String generateVMCommand(Class testClass, VM vm) {
 		StringBuffer sb = new StringBuffer();
 		sb.append(vm.path());
-		sb.append(" -classpath "); //$NON-NLS-1$
+		sb.append(" "); //$NON-NLS-1$
 		sb.append(vm.classPath());
 		sb.append(" "); //$NON-NLS-1$
 		sb.append(this.getClass().getName());
+		sb.append(" "); //$NON-NLS-1$
 		sb.append(testClass.getName());
 		sb.append(" "); //$NON-NLS-1$
 		sb.append(IOUtil.getCurrentPath());

Modified: trunk/punit/src/org/punit/runner/PUnitSoloRunner.java
===================================================================
--- trunk/punit/src/org/punit/runner/PUnitSoloRunner.java	2007-05-15 09:32:50 UTC (rev 79)
+++ trunk/punit/src/org/punit/runner/PUnitSoloRunner.java	2007-05-15 10:25:34 UTC (rev 80)
@@ -4,7 +4,6 @@
 import org.punit.message.*;
 import org.punit.runner.method.*;
 import org.punit.util.*;
-import org.punit.util.ArgUtil.*;
 
 public class PUnitSoloRunner extends PUnitAbstractRunner {
 

Modified: trunk/punit.test/src/tests/api/org/punit/reporter/logger/PUnitLoggerTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/reporter/logger/PUnitLoggerTest.java	2007-05-15 09:32:50 UTC (rev 79)
+++ trunk/punit.test/src/tests/api/org/punit/reporter/logger/PUnitLoggerTest.java	2007-05-15 10:25:34 UTC (rev 80)
@@ -5,7 +5,6 @@
 
 import junit.framework.*;
 
-import org.punit.reporter.stream.*;
 import org.punit.reporter.stream.console.*;
 
 public class PUnitLoggerTest extends TestCase {

Modified: trunk/punit.test/src/tests/api/org/punit/runner/PUnitSoloRunnerTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/runner/PUnitSoloRunnerTest.java	2007-05-15 09:32:50 UTC (rev 79)
+++ trunk/punit.test/src/tests/api/org/punit/runner/PUnitSoloRunnerTest.java	2007-05-15 10:25:34 UTC (rev 80)
@@ -3,7 +3,6 @@
 import org.punit.runner.*;
 
 import tests.api.org.punit.testclasses.*;
-import tests.samples.*;
 
 public class PUnitSoloRunnerTest extends AbstractPUnitRunnerTest {
 	

Added: trunk/punit.test/src/tests/samples/VMsSample.java
===================================================================
--- trunk/punit.test/src/tests/samples/VMsSample.java	                        (rev 0)
+++ trunk/punit.test/src/tests/samples/VMsSample.java	2007-05-15 10:25:34 UTC (rev 80)
@@ -0,0 +1,50 @@
+package tests.samples;
+
+import java.io.*;
+import java.util.*;
+
+import org.punit.runner.*;
+import org.punit.type.*;
+import org.punit.util.*;
+
+public class VMsSample {
+	private static String HARMONY = "D:\\harmony_trunk\\harmony-jre-r530500\\bin\\java"; //$NON-NLS-1$
+
+	private static String SUN = "D:\\tools\\jdk1.5.0_07\\bin\\java"; //$NON-NLS-1$
+
+	private static String CLASSPATH;
+	static {
+		CLASSPATH = generateClassPath();
+	}
+
+	public static void main(String[] args) {
+		VM harmonyVM = new VM(HARMONY, CLASSPATH, "Harmony"); //$NON-NLS-1$
+		VM sunVM = new VM(SUN, CLASSPATH, "SUN"); //$NON-NLS-1$
+		new PUnitSoloRunner().runVMs(VMsSample.class, new VM[] { harmonyVM,
+				sunVM });
+	}
+
+	private static String generateClassPath() {
+		StringBuffer sb = new StringBuffer();
+		sb.append(" -cp "); //$NON-NLS-1$
+		String currentPath = IOUtil.getCurrentPath();
+		sb.append(currentPath);
+		sb.append(File.separator);
+		sb.append("bin;"); //$NON-NLS-1$
+		sb.append(currentPath.replaceAll("punit.test", "punit")); //$NON-NLS-1$ //$NON-NLS-2$
+		sb.append(File.separator);
+		sb.append("bin"); //$NON-NLS-1$
+		return sb.toString();
+	}
+
+	public void test() {
+		Properties props = System.getProperties();
+		Set entrySet = props.entrySet();
+		VisitorUtil.traverse(entrySet.iterator(), new Traverser() {
+			public void traverse(Object obj) {
+				Map.Entry entry = (Map.Entry) obj;
+				System.out.println(entry.getKey() + " = " + entry.getValue()); //$NON-NLS-1$
+			}
+		});
+	}
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.