[P-unit-devel] SF.net SVN: p-unit: [324] trunk/punit/src/org/punit
Status: Beta
Brought to you by:
zhanghuangzhu
Menu
▾
▴
[P-unit-devel] SF.net SVN: p-unit: [324] trunk/punit/src/org/punit
|
From: <zha...@us...> - 2008-06-17 06:35:23
|
Revision: 324
http://p-unit.svn.sourceforge.net/p-unit/?rev=324&view=rev
Author: zhanghuangzhu
Date: 2008-06-16 23:35:30 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
Andrew Zhag: removed multiple virtual machine support.
Modified Paths:
--------------
trunk/punit/src/org/punit/method/runner/AbstractMethodRunner.java
trunk/punit/src/org/punit/method/runner/MethodRunner.java
trunk/punit/src/org/punit/runner/AbstractRunner.java
trunk/punit/src/org/punit/runner/ConcurrentRunner.java
trunk/punit/src/org/punit/runner/Runner.java
trunk/punit/src/org/punit/runner/SoloRunner.java
trunk/punit/src/org/punit/runner/VanillaRunner.java
trunk/punit/src/org/punit/util/ReporterUtil.java
Removed Paths:
-------------
trunk/punit/src/org/punit/runner/RunnerProperties.java
trunk/punit/src/org/punit/util/RunnerUtil.java
Modified: trunk/punit/src/org/punit/method/runner/AbstractMethodRunner.java
===================================================================
--- trunk/punit/src/org/punit/method/runner/AbstractMethodRunner.java 2008-06-17 06:35:04 UTC (rev 323)
+++ trunk/punit/src/org/punit/method/runner/AbstractMethodRunner.java 2008-06-17 06:35:30 UTC (rev 324)
@@ -22,8 +22,6 @@
private AbstractRunner _runner;
- private RunnerProperties _runnerProperties;
-
protected Convention _convention;
private transient ToStopThread _toStopThread;
@@ -57,10 +55,6 @@
_runner = runner;
}
- public void setRunnerProperties(RunnerProperties props) {
- _runnerProperties = props;
- }
-
public void addWatcher(Watcher watcher) {
_watchers.add(watcher);
}
@@ -71,28 +65,14 @@
public void run(Object testInstance, Method method, Object[] params) {
onMethodStart(method, testInstance, params);
- Throwable throwable = null;
- try {
- if (needsRunMethod()) {
- init(testInstance, method, params);
- runImpl( testInstance, method, params );
- } else {
- startWatchers(testInstance, method, params);
- }
- } catch (Throwable t) {
- throwable = t;
- } finally {
- try {
- if (!needsRunMethod()) {
- stopWatchers(testInstance, method, params);
- }
- } catch (Throwable t) {
- if(throwable == null) {
- throwable = t;
- }
- }
- }
- onMethodEnd(method, testInstance, params, throwable);
+ Throwable throwable = null;
+ try {
+ init(testInstance, method, params);
+ runImpl(testInstance, method, params);
+ } catch (Throwable t) {
+ throwable = t;
+ }
+ onMethodEnd(method, testInstance, params, throwable);
}
protected void startToStopThread() {
@@ -239,10 +219,6 @@
return _watchers;
}
- public boolean needsRunMethod() {
- return !_runnerProperties.isParent;
- }
-
@SuppressWarnings("unchecked")
public Object clone() {
try {
Modified: trunk/punit/src/org/punit/method/runner/MethodRunner.java
===================================================================
--- trunk/punit/src/org/punit/method/runner/MethodRunner.java 2008-06-17 06:35:04 UTC (rev 323)
+++ trunk/punit/src/org/punit/method/runner/MethodRunner.java 2008-06-17 06:35:30 UTC (rev 324)
@@ -19,8 +19,6 @@
public void run(Object testInstance, Method method, Object[] params);
public void setRunner(AbstractRunner runner);
-
- public void setRunnerProperties(RunnerProperties props);
/**
* @return watchers associated with this method runner
Modified: trunk/punit/src/org/punit/runner/AbstractRunner.java
===================================================================
--- trunk/punit/src/org/punit/runner/AbstractRunner.java 2008-06-17 06:35:04 UTC (rev 323)
+++ trunk/punit/src/org/punit/runner/AbstractRunner.java 2008-06-17 06:35:30 UTC (rev 324)
@@ -2,7 +2,6 @@
package org.punit.runner;
-import java.io.*;
import java.lang.reflect.*;
import java.util.*;
import java.util.concurrent.atomic.*;
@@ -10,7 +9,6 @@
import org.punit.convention.*;
import org.punit.events.EventListener;
import org.punit.exception.*;
-import org.punit.exception.IOException;
import org.punit.message.*;
import org.punit.method.builder.*;
import org.punit.method.runner.*;
@@ -34,8 +32,6 @@
private ConsoleLogger _consoleLogger = new ConsoleLogger();
- private RunnerProperties _properties = new RunnerProperties();
-
private ExecutorPool _executorPool;
private Convention _convention;
@@ -48,7 +44,6 @@
_testMethodBuilder = testMethodBuilder;
_methodRunner = testMethodRunner;
_methodRunner.setRunner(this);
- _methodRunner.setRunnerProperties(_properties);
registerDefaultListeners();
setConvention(new ByNameConvention());
}
@@ -109,11 +104,6 @@
});
}
- public int run(Class<?> clazz, RunnerProperties properties) {
- setRunnerProperties(properties);
- return run(clazz);
- }
-
public void setExecutorPool(ExecutorPool pool) {
_executorPool = pool;
}
@@ -130,105 +120,10 @@
}
}
- private void setRunnerProperties(RunnerProperties properties) {
- _properties = properties;
- _methodRunner.setRunnerProperties(_properties);
- }
-
- public void runVMs(Class<?> clazz, VM[] vms) {
- _properties.isParent = true;
- _properties.vms = vms;
- for (int i = 0; i < vms.length; ++i) {
- VM vm = vms[i];
- storeRunnerConfig(vm);
- storeRunnerProperties(vm);
- String command = generateVMCommand(clazz, vm);
- Process p = IOUtil.exec(command);
- readErrorStream(p);
- readOutputStream(p);
- try {
- p.waitFor();
- } catch (InterruptedException e) {
- throw new IOException(e);
- }
- deleteRunnerConfig(vm);
- deleteRunnerProperties(vm);
- }
- filterNonParentEventListeners();
- run(clazz);
- }
public void addWatcher(Watcher watcher) {
_methodRunner.addWatcher(watcher);
}
-
- private void readOutputStream(Process p) {
- new StreamReaderThread(p.getInputStream(), false).start();
- }
-
- private void readErrorStream(Process p) {
- new StreamReaderThread(p.getErrorStream(), true).start();
- }
-
- private void filterNonParentEventListeners() {
- final List<EventListener> newEventListener = new ArrayList<EventListener>();
- Iterator<EventListener> iter = _eventListeners.iterator();
- while (iter.hasNext()) {
- EventListener listener = iter.next();
- if (listener.supportParentRunner()) {
- newEventListener.add(listener);
- }
- }
- _eventListeners.clear();
- _eventListeners.addAll(newEventListener);
- }
-
- private void deleteRunnerProperties(VM vm) {
- IOUtil.deleteFile(runnerPropertiesFileName(vm));
- }
-
- private void deleteRunnerConfig(VM vm) {
- IOUtil.deleteFile(runnerConfigFileName(vm));
- }
-
- private void storeRunnerProperties(VM vm) {
- RunnerProperties properties = new RunnerProperties();
- properties.vmName = vm.punitName();
- properties.isIntermediate = true;
- IOUtil.serialize(properties, runnerPropertiesFileName(vm));
- }
-
- private void storeRunnerConfig(VM vm) {
- IOUtil.serialize(this, runnerConfigFileName(vm));
- }
-
- private String runnerConfigFileName(VM vm) {
- return resultFolder() + File.separator + vm.punitName()
- + ".cfg"; //$NON-NLS-1$
- }
-
- private String runnerPropertiesFileName(VM vm) {
- return resultFolder() + File.separator + vm.punitName()
- + ".props"; //$NON-NLS-1$
- }
-
- public RunnerProperties properties() {
- return _properties;
- }
-
- private String generateVMCommand(Class<?> clazz, VM vm) {
- final StringBuffer sb = new StringBuffer();
- sb.append(vm.path());
- sb.append(" "); //$NON-NLS-1$
- sb.append(this.getClass().getName());
- sb.append(" "); //$NON-NLS-1$
- sb.append(clazz.getName());
- sb.append(" "); //$NON-NLS-1$
- sb.append(runnerConfigFileName(vm));
- sb.append(" "); //$NON-NLS-1$
- sb.append(runnerPropertiesFileName(vm));
- return sb.toString();
- }
private void runTestClass(final Class<?> clazz) {
if (_executorPool == null) {
Modified: trunk/punit/src/org/punit/runner/ConcurrentRunner.java
===================================================================
--- trunk/punit/src/org/punit/runner/ConcurrentRunner.java 2008-06-17 06:35:04 UTC (rev 323)
+++ trunk/punit/src/org/punit/runner/ConcurrentRunner.java 2008-06-17 06:35:30 UTC (rev 324)
@@ -4,17 +4,12 @@
import org.punit.message.*;
import org.punit.method.builder.*;
import org.punit.method.runner.*;
-import org.punit.util.*;
public class ConcurrentRunner extends AbstractRunner {
private static final long serialVersionUID = -7193902024861434576L;
private static final int DEFAULT_CONCURRENT_COUNT = 10;
-
- public static void main(String[] args) {
- RunnerUtil.run(new ConcurrentRunner(), args);
- }
public ConcurrentRunner() {
this(ConcurrentRunner.DEFAULT_CONCURRENT_COUNT);
Modified: trunk/punit/src/org/punit/runner/Runner.java
===================================================================
--- trunk/punit/src/org/punit/runner/Runner.java 2008-06-17 06:35:04 UTC (rev 323)
+++ trunk/punit/src/org/punit/runner/Runner.java 2008-06-17 06:35:30 UTC (rev 324)
@@ -15,10 +15,6 @@
public int run(Class<?> clazz);
- public int run(Class<?> clazz, RunnerProperties properties);
-
- public RunnerProperties properties();
-
public TestMethodBuilder methodBuilder();
public MethodRunner methodRunner();
Deleted: trunk/punit/src/org/punit/runner/RunnerProperties.java
===================================================================
--- trunk/punit/src/org/punit/runner/RunnerProperties.java 2008-06-17 06:35:04 UTC (rev 323)
+++ trunk/punit/src/org/punit/runner/RunnerProperties.java 2008-06-17 06:35:30 UTC (rev 324)
@@ -1,21 +0,0 @@
-/* (C) Copyright 2007, by Andrew Zhang */
-
-package org.punit.runner;
-
-import java.io.Serializable;
-
-import org.punit.type.VM;
-
-public class RunnerProperties implements Serializable {
-
- private static final long serialVersionUID = -4832579362013257784L;
-
- public String vmName;
-
- public boolean isIntermediate;
-
- public boolean isParent;
-
- public VM[] vms;
-
-}
Modified: trunk/punit/src/org/punit/runner/SoloRunner.java
===================================================================
--- trunk/punit/src/org/punit/runner/SoloRunner.java 2008-06-17 06:35:04 UTC (rev 323)
+++ trunk/punit/src/org/punit/runner/SoloRunner.java 2008-06-17 06:35:30 UTC (rev 324)
@@ -5,16 +5,11 @@
import org.punit.message.*;
import org.punit.method.builder.*;
import org.punit.method.runner.*;
-import org.punit.util.*;
public class SoloRunner extends AbstractRunner {
private static final long serialVersionUID = 5938649527831492676L;
- public static void main(String[] args) {
- RunnerUtil.run(new SoloRunner(), args);
- }
-
public SoloRunner() {
super(new MethodBuilderImpl(), new SoloMethodRunner());
}
Modified: trunk/punit/src/org/punit/runner/VanillaRunner.java
===================================================================
--- trunk/punit/src/org/punit/runner/VanillaRunner.java 2008-06-17 06:35:04 UTC (rev 323)
+++ trunk/punit/src/org/punit/runner/VanillaRunner.java 2008-06-17 06:35:30 UTC (rev 324)
@@ -27,10 +27,6 @@
return _runner.methodRunner();
}
- public RunnerProperties properties() {
- return _runner.properties();
- }
-
public void resultFolder(String folder) {
_runner.resultFolder(folder);
}
@@ -43,10 +39,6 @@
return _runner.run(clazz);
}
- public int run(Class<?> clazz, RunnerProperties properties) {
- return _runner.run(clazz, properties);
- }
-
public TestResult testResult() {
return _runner.testResult();
}
Modified: trunk/punit/src/org/punit/util/ReporterUtil.java
===================================================================
--- trunk/punit/src/org/punit/util/ReporterUtil.java 2008-06-17 06:35:04 UTC (rev 323)
+++ trunk/punit/src/org/punit/util/ReporterUtil.java 2008-06-17 06:35:30 UTC (rev 324)
@@ -2,11 +2,10 @@
package org.punit.util;
-import java.io.File;
-import java.lang.reflect.Method;
+import java.io.*;
+import java.lang.reflect.*;
-import org.punit.runner.Runner;
-import org.punit.runner.RunnerProperties;
+import org.punit.runner.*;
public class ReporterUtil {
@@ -53,11 +52,6 @@
sb.append(clazz.getName());
sb.append("."); //$NON-NLS-1$
sb.append(runner.punitName());
- RunnerProperties properties = runner.properties();
- if(properties.vmName != null) {
- sb.append("."); //$NON-NLS-1$
- sb.append(properties.vmName);
- }
return sb.toString();
}
Deleted: trunk/punit/src/org/punit/util/RunnerUtil.java
===================================================================
--- trunk/punit/src/org/punit/util/RunnerUtil.java 2008-06-17 06:35:04 UTC (rev 323)
+++ trunk/punit/src/org/punit/util/RunnerUtil.java 2008-06-17 06:35:30 UTC (rev 324)
@@ -1,32 +0,0 @@
-/* (C) Copyright 2007, by Andrew Zhang */
-
-package org.punit.util;
-
-import org.punit.message.Messages;
-import org.punit.runner.Runner;
-import org.punit.runner.RunnerProperties;
-
-public class RunnerUtil {
-
- private static final int MAX_ARGS = 3;
-
- public static void run(Runner runner, String[] args) {
- int length = args.length;
- if (length == 0 || length > MAX_ARGS) {
- throw new IllegalArgumentException(length
- + Messages.getString("runner.arguments")); //$NON-NLS-1$
- }
- Runner testRunner = runner;
- RunnerProperties properties = runner.properties();
- Class<?> testClass = ReflectionUtil.newClass(args[0]);
- if (length >= 2) {
- testRunner = (Runner) IOUtil.getSerialiableObject(args[1]);
- }
- if (length >= 3) {
- properties = (RunnerProperties) IOUtil
- .getSerialiableObject(args[2]);
- }
- testRunner.run(testClass, properties);
- }
-
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
