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

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

Revision: 81
          http://p-unit.svn.sourceforge.net/p-unit/?rev=81&view=rev
Author:   zhanghuangzhu
Date:     2007-05-15 04:11:19 -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/PUnitArgs.java
    trunk/punit/src/org/punit/type/VM.java
    trunk/punit/src/org/punit/util/ArgUtil.java
    trunk/punit.test/src/tests/api/org/punit/util/ArgUtilTest.java
    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 10:25:34 UTC (rev 80)
+++ trunk/punit/src/org/punit/reporter/stream/file/FileLoggerListener.java	2007-05-15 11:11:19 UTC (rev 81)
@@ -39,7 +39,10 @@
 		sb.append(clazz.getName());
 		sb.append("."); //$NON-NLS-1$
 		sb.append(runner.punitName());
-		
+		if(pargs.vm != null) {
+			sb.append("."); //$NON-NLS-1$
+			sb.append(pargs.vm);
+		}
 		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 10:25:34 UTC (rev 80)
+++ trunk/punit/src/org/punit/runner/PUnitAbstractRunner.java	2007-05-15 11:11:19 UTC (rev 81)
@@ -73,14 +73,13 @@
 		StringBuffer sb = new StringBuffer();
 		sb.append(vm.path());
 		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());
-		sb.append(" false"); //$NON-NLS-1$
+		sb.append(" false "); //$NON-NLS-1$
+		sb.append(vm.punitName());
 		return sb.toString();
 	}
 
@@ -239,7 +238,7 @@
 		String className = clazz.getName();
 		String resultFolder = IOUtil.getCurrentPath();
 		boolean intermediate = false;
-		return new PUnitArgs(className, resultFolder,intermediate);
+		return new PUnitArgs(className, resultFolder,intermediate, null);
 	}
 	
 	private void punitArgs(PUnitArgs pargs) {

Modified: trunk/punit/src/org/punit/runner/PUnitArgs.java
===================================================================
--- trunk/punit/src/org/punit/runner/PUnitArgs.java	2007-05-15 10:25:34 UTC (rev 80)
+++ trunk/punit/src/org/punit/runner/PUnitArgs.java	2007-05-15 11:11:19 UTC (rev 81)
@@ -1,12 +1,16 @@
 package org.punit.runner;
 
 public class PUnitArgs {
-	public PUnitArgs(String className, String folder, boolean intermediate) {
+	
+	public PUnitArgs(String className, String folder, boolean intermediate, String vm) {
 		testClassName = className;
 		resultFolder = folder;
 		this.intermediate = intermediate;
+		this.vm = vm;
 	}
 
+	public final String vm;
+	
 	public final String testClassName;
 
 	public final String resultFolder;

Modified: trunk/punit/src/org/punit/type/VM.java
===================================================================
--- trunk/punit/src/org/punit/type/VM.java	2007-05-15 10:25:34 UTC (rev 80)
+++ trunk/punit/src/org/punit/type/VM.java	2007-05-15 11:11:19 UTC (rev 81)
@@ -2,14 +2,11 @@
 
 public class VM implements PUnitName {
 	private String _path;
-	
-	private String _classPath;
 
 	private String _name;
 
-	public VM(String path, String classPath, String name) {
+	public VM(String path, String name) {
 		_path = path;
-		_classPath = classPath;
 		_name = name;
 	}
 
@@ -19,9 +16,5 @@
 
 	public String path() {
 		return _path;
-	}
-	
-	public String classPath() {
-		return _classPath;
-	}
+	}	
 }

Modified: trunk/punit/src/org/punit/util/ArgUtil.java
===================================================================
--- trunk/punit/src/org/punit/util/ArgUtil.java	2007-05-15 10:25:34 UTC (rev 80)
+++ trunk/punit/src/org/punit/util/ArgUtil.java	2007-05-15 11:11:19 UTC (rev 81)
@@ -5,12 +5,13 @@
 
 public class ArgUtil {
 	public static PUnitArgs getPUnitArgs(String[] args) {
-		if (args.length < 1 || args.length > 3) {
+		if (args.length < 1 || args.length > 4) {
 			throw new IllegalArgumentException(Messages.getString("runner.05")); //$NON-NLS-1$
 		}
 		String className = args[0];
 		String resultFolder = args.length >= 2 ? args[1] : null;
-		boolean intermediate = args.length == 3 ? Boolean.parseBoolean(args[2]) : false;
-		return new PUnitArgs(className, resultFolder, intermediate);
+		boolean intermediate = args.length >= 3 ? Boolean.parseBoolean(args[2]) : false;
+		String vm = args.length >= 4 ? args[3] : null;
+		return new PUnitArgs(className, resultFolder, intermediate, vm);
 	}
 }

Modified: trunk/punit.test/src/tests/api/org/punit/util/ArgUtilTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/util/ArgUtilTest.java	2007-05-15 10:25:34 UTC (rev 80)
+++ trunk/punit.test/src/tests/api/org/punit/util/ArgUtilTest.java	2007-05-15 11:11:19 UTC (rev 81)
@@ -11,6 +11,8 @@
 	private static String CLASS_NAME = "a"; //$NON-NLS-1$
 
 	private static String RESULT_FOLDER = "b"; //$NON-NLS-1$
+	
+	private static String VM_NAME = "c"; //$NON-NLS-1$
 
 	public void testGetPUnitArgs() {
 		PUnitArgs parg = ArgUtil.getPUnitArgs(new String[] { CLASS_NAME });
@@ -29,6 +31,13 @@
 		assertEquals(RESULT_FOLDER, parg.resultFolder);
 		assertTrue(parg.intermediate);
 		
+		parg = ArgUtil.getPUnitArgs(new String[] { CLASS_NAME, RESULT_FOLDER, "true", VM_NAME }); //$NON-NLS-1$
+		assertEquals(CLASS_NAME, parg.testClassName);
+		assertEquals(RESULT_FOLDER, parg.resultFolder);
+		assertTrue(parg.intermediate);
+		assertEquals(VM_NAME, parg.vm);
+
+		
 		parg = ArgUtil.getPUnitArgs(new String[] { CLASS_NAME, RESULT_FOLDER, "false" }); //$NON-NLS-1$
 		assertEquals(CLASS_NAME, parg.testClassName);
 		assertEquals(RESULT_FOLDER, parg.resultFolder);
@@ -46,7 +55,7 @@
 				new CodeRunner() {
 					public void run() throws Throwable {
 						ArgUtil.getPUnitArgs(new String[] { CLASS_NAME,
-								RESULT_FOLDER, null, null });
+								RESULT_FOLDER, null, null, null });
 					}
 				});
 	}

Modified: trunk/punit.test/src/tests/samples/VMsSample.java
===================================================================
--- trunk/punit.test/src/tests/samples/VMsSample.java	2007-05-15 10:25:34 UTC (rev 80)
+++ trunk/punit.test/src/tests/samples/VMsSample.java	2007-05-15 11:11:19 UTC (rev 81)
@@ -8,18 +8,19 @@
 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();
 	}
+	
+	private static String HARMONY = "D:\\harmony_trunk\\harmony-jre-r530500\\bin\\java" + CLASSPATH; //$NON-NLS-1$
 
+	private static String SUN = "D:\\tools\\jdk1.5.0_07\\bin\\java" + CLASSPATH; //$NON-NLS-1$
+
 	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$
+		VM harmonyVM = new VM(HARMONY, "Harmony"); //$NON-NLS-1$
+		VM sunVM = new VM(SUN, "SUN"); //$NON-NLS-1$
 		new PUnitSoloRunner().runVMs(VMsSample.class, new VM[] { harmonyVM,
 				sunVM });
 	}


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