Thread: [P-unit-devel] SF.net SVN: p-unit: [78] trunk/punit (Page 2)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

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

Modified Paths:
--------------
    trunk/punit/src/org/punit/exception/ConcurrentException.java
    trunk/punit/src/org/punit/exception/ReflectionException.java
    trunk/punit/src/org/punit/runner/PUnitAbstractRunner.java
    trunk/punit/src/org/punit/runner/PUnitSoloRunner.java
    trunk/punit/src/org/punit/runner/Runner.java
    trunk/punit/src/org/punit/type/VM.java
    trunk/punit/src/org/punit/util/ReflectionUtil.java
    trunk/punit/src/punit.properties
    trunk/punit.test/src/tests/api/org/punit/all/AllTests.java
    trunk/punit.test/src/tests/api/org/punit/util/ReflectionUtilTest.java

Added Paths:
-----------
    trunk/punit/src/org/punit/exception/PUnitException.java
    trunk/punit/src/org/punit/exception/PUnitIOException.java
    trunk/punit/src/org/punit/util/ArgUtil.java
    trunk/punit/src/org/punit/util/IOUtil.java
    trunk/punit.test/src/tests/api/org/punit/util/ArgUtilTest.java

Modified: trunk/punit/src/org/punit/exception/ConcurrentException.java
===================================================================

--- trunk/punit/src/org/punit/exception/ConcurrentException.java	2007-05-14 20:49:15 UTC (rev 77)
+++ trunk/punit/src/org/punit/exception/ConcurrentException.java	2007-05-15 08:25:22 UTC (rev 78)
@@ -5,7 +5,7 @@
 
 import org.punit.util.*;
 
-public class ConcurrentException extends RuntimeException {
+public class ConcurrentException extends PUnitException {
 	private static final long serialVersionUID = 1253114975237734895L;
 
 	private Vector _throwables = new Vector();

Added: trunk/punit/src/org/punit/exception/PUnitException.java
===================================================================
--- trunk/punit/src/org/punit/exception/PUnitException.java	                        (rev 0)
+++ trunk/punit/src/org/punit/exception/PUnitException.java	2007-05-15 08:25:22 UTC (rev 78)
@@ -0,0 +1,14 @@
+package org.punit.exception;
+
+public class PUnitException extends RuntimeException {
+	
+	public PUnitException() {
+		
+	}
+	
+	public PUnitException(Throwable e) {
+		super(e);
+	}
+
+	private static final long serialVersionUID = -6845936853491862388L;
+}

Added: trunk/punit/src/org/punit/exception/PUnitIOException.java
===================================================================
--- trunk/punit/src/org/punit/exception/PUnitIOException.java	                        (rev 0)
+++ trunk/punit/src/org/punit/exception/PUnitIOException.java	2007-05-15 08:25:22 UTC (rev 78)
@@ -0,0 +1,10 @@
+package org.punit.exception;
+
+public class PUnitIOException extends PUnitException {
+	
+	private static final long serialVersionUID = 7098221975109413569L;
+
+	public PUnitIOException(Throwable e) {
+		super(e);
+	}
+}

Modified: trunk/punit/src/org/punit/exception/ReflectionException.java
===================================================================
--- trunk/punit/src/org/punit/exception/ReflectionException.java	2007-05-14 20:49:15 UTC (rev 77)
+++ trunk/punit/src/org/punit/exception/ReflectionException.java	2007-05-15 08:25:22 UTC (rev 78)
@@ -1,6 +1,6 @@
 package org.punit.exception;
 
-public class ReflectionException extends RuntimeException {
+public class ReflectionException extends PUnitException {
 
 	private static final long serialVersionUID = -5498831354775690972L;
 

Modified: trunk/punit/src/org/punit/runner/PUnitAbstractRunner.java
===================================================================
--- trunk/punit/src/org/punit/runner/PUnitAbstractRunner.java	2007-05-14 20:49:15 UTC (rev 77)
+++ trunk/punit/src/org/punit/runner/PUnitAbstractRunner.java	2007-05-15 08:25:22 UTC (rev 78)
@@ -1,5 +1,6 @@
 package org.punit.runner;
 
+import java.io.*;
 import java.lang.reflect.*;
 import java.util.*;
 
@@ -7,7 +8,6 @@
 import org.punit.events.*;
 import org.punit.reporter.stream.console.*;
 import org.punit.reporter.stream.file.*;
-import org.punit.result.*;
 import org.punit.runner.method.*;
 import org.punit.type.*;
 import org.punit.util.*;
@@ -36,20 +36,49 @@
 		registerLoggerListeners();
 	}
 
-	public Result run(Class clazz) {
+	public void run(Class clazz) {
 		onRunnerStart(clazz);
 		Object[] testClasses = _testSuiteBuiler.buildTestClasses(clazz);
 		for (int i = 0; i < testClasses.length; ++i) {
 			runTestClass((Class) testClasses[i]);
 		}
 		onRunnerEnd(clazz);
-		return null;
 	}
 
+	public void run(String className, String resultFolder) {
+		Class clazz = ReflectionUtil.newClass(className);
+		run(clazz);
+	}
+
+	public void runVMs(Class clazz, VM[] vm) {
+		for (int i = 0; i < vm.length; ++i) {
+			String command = generateVMCommand(vm[i], clazz);
+			IOUtil.exec(command);
+		}
+	}
+
+	/*
+	 * VM command: /path/java -classpath a.jar;path/lib/b.jar
+	 * org.punit.runner.PUnitSoloRunner TestSuite1.class /output/
+	 */
+	private String generateVMCommand(VM vm, Class testClass) {
+		StringBuffer sb = new StringBuffer();
+		sb.append(vm.path());
+		sb.append(" -classpath "); //$NON-NLS-1$
+		sb.append(vm.classPath());
+		sb.append(" "); //$NON-NLS-1$
+		sb.append(this.getClass().getName());
+		sb.append(testClass.getName());
+		sb.append(" "); //$NON-NLS-1$
+		sb.append(IOUtil.getCurrentPath());
+		return sb.toString();
+	}
+
 	private void onRunnerStart(final Class clazz) {
 		VisitorUtil.traverse(_runnerEventListeners.iterator(), new Traverser() {
 			public void traverse(Object obj) {
-				((RunnerEventListener) obj).onRunnerStart(clazz, PUnitAbstractRunner.this);
+				((RunnerEventListener) obj).onRunnerStart(clazz,
+						PUnitAbstractRunner.this);
 			}
 		});
 	}
@@ -57,7 +86,8 @@
 	private void onRunnerEnd(final Class clazz) {
 		VisitorUtil.traverse(_runnerEventListeners.iterator(), new Traverser() {
 			public void traverse(Object obj) {
-				((RunnerEventListener) obj).onRunnerEnd(clazz, PUnitAbstractRunner.this);
+				((RunnerEventListener) obj).onRunnerEnd(clazz,
+						PUnitAbstractRunner.this);
 			}
 		});
 	}
@@ -190,9 +220,8 @@
 	public FileLoggerListener fileLogger() {
 		return _fileLogger;
 	}
-	
+
 	public void addTestInterfaces(Class[] interfaces) {
 		_testMethodBuilder.addTestInterfaces(interfaces);
 	}
-	
 }

Modified: trunk/punit/src/org/punit/runner/PUnitSoloRunner.java
===================================================================
--- trunk/punit/src/org/punit/runner/PUnitSoloRunner.java	2007-05-14 20:49:15 UTC (rev 77)
+++ trunk/punit/src/org/punit/runner/PUnitSoloRunner.java	2007-05-15 08:25:22 UTC (rev 78)
@@ -6,9 +6,25 @@
 
 public class PUnitSoloRunner extends PUnitAbstractRunner {
 
+	/**
+	 * 
+	 * @param args
+	 *            args[0] test class; args[1] test result folder. uses current
+	 *            folder if it is not specified
+	 */
+	public static void main(String[] args) {
+		if(args.length < 1 || args.length > 2) {
+			throw new IllegalArgumentException();
+		}
+		String className = args[0];
+		String resultFolder = args.length == 1 ? null : args[1];
+		new PUnitSoloRunner().run(className, resultFolder);
+	}
+
 	public PUnitSoloRunner() {
-		super(new PUnitTestSuiteBuilder(), new PUnitTestMethodBuilder(), new SoloTestMethodRunner());
-		
+		super(new PUnitTestSuiteBuilder(), new PUnitTestMethodBuilder(),
+				new SoloTestMethodRunner());
+
 	}
 
 	public boolean accept(Class clazz) {

Modified: trunk/punit/src/org/punit/runner/Runner.java
===================================================================
--- trunk/punit/src/org/punit/runner/Runner.java	2007-05-14 20:49:15 UTC (rev 77)
+++ trunk/punit/src/org/punit/runner/Runner.java	2007-05-15 08:25:22 UTC (rev 78)
@@ -7,7 +7,7 @@
 import org.punit.type.*;
 
 public interface Runner extends RunnerEvent, ClassEvent, PUnitName {
-	public Result run(Class clazz);
+	public void run(Class clazz);
 	
 	public TestMethodBuilder testMethodBuilder();
 		

Modified: trunk/punit/src/org/punit/type/VM.java
===================================================================
--- trunk/punit/src/org/punit/type/VM.java	2007-05-14 20:49:15 UTC (rev 77)
+++ trunk/punit/src/org/punit/type/VM.java	2007-05-15 08:25:22 UTC (rev 78)
@@ -1,21 +1,27 @@
 package org.punit.type;
 
-public class VM {
-	private String _vmPath;
+public class VM implements PUnitName {
+	private String _path;
+	
+	private String _classPath;
 
-	private String _vmName;
+	private String _name;
 
-	public VM(String path, String name) {
-		super();
-		_vmPath = path;
-		_vmName = name;
+	public VM(String path, String classPath, String name) {
+		_path = path;
+		_classPath = classPath;
+		_name = name;
 	}
 
-	public String vmName() {
-		return _vmName;
+	public String punitName() {
+		return _name;
 	}
 
-	public String vmPath() {
-		return _vmPath;
+	public String path() {
+		return _path;
 	}
+	
+	public String classPath() {
+		return _classPath;
+	}
 }

Added: trunk/punit/src/org/punit/util/ArgUtil.java
===================================================================
--- trunk/punit/src/org/punit/util/ArgUtil.java	                        (rev 0)
+++ trunk/punit/src/org/punit/util/ArgUtil.java	2007-05-15 08:25:22 UTC (rev 78)
@@ -0,0 +1,25 @@
+package org.punit.util;
+
+import org.punit.message.*;
+
+public class ArgUtil {
+	public static class PUnitArgs {
+		public PUnitArgs(String className, String folder) {
+			testClassName = className;
+			resultFolder = folder;
+		}
+
+		public String testClassName;
+
+		public String resultFolder;
+	}
+
+	public static PUnitArgs getPUnitArgs(String[] args) {
+		if (args.length < 1 || args.length > 2) {
+			throw new IllegalArgumentException(Messages.getString("runner.05")); //$NON-NLS-1$
+		}
+		String className = args[0];
+		String resultFolder = args.length == 1 ? null : args[1];
+		return new PUnitArgs(className, resultFolder);
+	}
+}

Added: trunk/punit/src/org/punit/util/IOUtil.java
===================================================================
--- trunk/punit/src/org/punit/util/IOUtil.java	                        (rev 0)
+++ trunk/punit/src/org/punit/util/IOUtil.java	2007-05-15 08:25:22 UTC (rev 78)
@@ -0,0 +1,23 @@
+package org.punit.util;
+
+import java.io.*;
+
+import org.punit.exception.*;
+
+public class IOUtil {
+	public static String getCurrentPath() {
+		try {
+			return new File(".").getCanonicalPath(); //$NON-NLS-1$
+		} catch (IOException e) {
+			throw new PUnitIOException(e);
+		}
+	}
+	
+	public static Process exec(String command) {
+		try {
+			return Runtime.getRuntime().exec(command);
+		} catch (IOException e) {
+			throw new PUnitIOException(e);
+		}
+	}
+}

Modified: trunk/punit/src/org/punit/util/ReflectionUtil.java
===================================================================
--- trunk/punit/src/org/punit/util/ReflectionUtil.java	2007-05-14 20:49:15 UTC (rev 77)
+++ trunk/punit/src/org/punit/util/ReflectionUtil.java	2007-05-15 08:25:22 UTC (rev 78)
@@ -16,6 +16,14 @@
 		}
 	}
 	
+	public static Class newClass(String className) {
+		try {
+			return Class.forName(className);
+		} catch (Exception e) {
+			throw new ReflectionException(e);
+		}
+	}
+	
 	public static Method getMethod(Class clazz, String methodName, Class[] params) {
 		try {
 			Method method = clazz.getDeclaredMethod(methodName, params);

Modified: trunk/punit/src/punit.properties
===================================================================
--- trunk/punit/src/punit.properties	2007-05-14 20:49:15 UTC (rev 77)
+++ trunk/punit/src/punit.properties	2007-05-15 08:25:22 UTC (rev 78)
@@ -8,6 +8,7 @@
 runner.02=solo.param
 runner.03=concurrent
 runner.04=concurrent.param
+runner.05=PUnitXXXRunner className [result path]
 watcher.01=bytes
 watcher.02=ms
 watcher.03=memory

Modified: trunk/punit.test/src/tests/api/org/punit/all/AllTests.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/all/AllTests.java	2007-05-14 20:49:15 UTC (rev 77)
+++ trunk/punit.test/src/tests/api/org/punit/all/AllTests.java	2007-05-15 08:25:22 UTC (rev 78)
@@ -23,6 +23,7 @@
 
 	public static Class[] testCases() {
 		return new Class[] { 
+				ArgUtilTest.class,
 				ConcurrentExceptionTest.class,
 				LoggerUtilTest.class, 
 				MemoryWatcherTest.class,

Added: trunk/punit.test/src/tests/api/org/punit/util/ArgUtilTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/util/ArgUtilTest.java	                        (rev 0)
+++ trunk/punit.test/src/tests/api/org/punit/util/ArgUtilTest.java	2007-05-15 08:25:22 UTC (rev 78)
@@ -0,0 +1,40 @@
+package tests.api.org.punit.util;
+
+import junit.framework.*;
+
+import org.punit.util.*;
+import org.punit.util.ArgUtil.*;
+
+import tests.util.*;
+
+public class ArgUtilTest extends TestCase {
+	private static String CLASS_NAME = "a"; //$NON-NLS-1$
+
+	private static String RESULT_FOLDER = "b"; //$NON-NLS-1$
+
+	public void testGetPUnitArgs() {
+
+		PUnitArgs parg = ArgUtil.getPUnitArgs(new String[] { CLASS_NAME });
+		assertEquals(CLASS_NAME, parg.testClassName);
+		assertNull(parg.resultFolder);
+
+		parg = ArgUtil.getPUnitArgs(new String[] { CLASS_NAME, RESULT_FOLDER });
+		assertEquals(CLASS_NAME, parg.testClassName);
+		assertEquals(RESULT_FOLDER, parg.resultFolder);
+
+		AssertUtil.assertException(IllegalArgumentException.class,
+				new CodeRunner() {
+					public void run() throws Throwable {
+						ArgUtil.getPUnitArgs(new String[] {});
+					}
+				});
+
+		AssertUtil.assertException(IllegalArgumentException.class,
+				new CodeRunner() {
+					public void run() throws Throwable {
+						ArgUtil.getPUnitArgs(new String[] { CLASS_NAME,
+								RESULT_FOLDER, null });
+					}
+				});
+	}
+}

Modified: trunk/punit.test/src/tests/api/org/punit/util/ReflectionUtilTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/util/ReflectionUtilTest.java	2007-05-14 20:49:15 UTC (rev 77)
+++ trunk/punit.test/src/tests/api/org/punit/util/ReflectionUtilTest.java	2007-05-15 08:25:22 UTC (rev 78)
@@ -11,6 +11,16 @@
 
 public class ReflectionUtilTest extends TestCase {
 
+	public void testNewClass() {
+		Class clazz = ReflectionUtil.newClass(Test1.class.getName());
+		assertSame(Test1.class, clazz);
+		AssertUtil.assertException(ReflectionException.class, new CodeRunner() {
+			public void run() throws Throwable {
+				ReflectionUtil.newClass("unknown"); //$NON-NLS-1$
+			}
+		});
+	}
+	
 	public void testNewInstance() {
 		Object obj = ReflectionUtil.newInstance(Test1.class);
 		assertNotNull(obj);


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




Thread: [P-unit-devel] SF.net SVN: p-unit: [78] trunk/punit (Page 2)

p-unit-devel