[P-unit-devel] SF.net SVN: p-unit: [253] trunk/punit/src/org/punit

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

Revision: 253
          http://p-unit.svn.sourceforge.net/p-unit/?rev=253&view=rev
Author:   zhanghuangzhu
Date:     2007-11-18 21:22:16 -0800 (Sun, 18 Nov 2007)

Log Message:
-----------
Andrew Zhang: make result folder configurable.

Modified Paths:
--------------
    trunk/punit/src/org/punit/reporter/stream/StreamLogger.java
    trunk/punit/src/org/punit/reporter/stream/file/FileLogger.java
    trunk/punit/src/org/punit/runner/AbstractRunner.java
    trunk/punit/src/org/punit/runner/Runner.java
    trunk/punit/src/org/punit/util/ReporterUtil.java

Removed Paths:
-------------
    trunk/punit/src/org/punit/runner/RunnerConstants.java

Modified: trunk/punit/src/org/punit/reporter/stream/StreamLogger.java
===================================================================
--- trunk/punit/src/org/punit/reporter/stream/StreamLogger.java	2007-11-19 05:21:48 UTC (rev 252)
+++ trunk/punit/src/org/punit/reporter/stream/StreamLogger.java	2007-11-19 05:22:16 UTC (rev 253)
@@ -174,7 +174,7 @@
         log(_errStream, message, level);
     }
 
-    public void log(PrintStream ps, String message, Level level) {
+    private void log(PrintStream ps, String message, Level level) {
         if (ps == null) {
             return;
         }

Modified: trunk/punit/src/org/punit/reporter/stream/file/FileLogger.java
===================================================================
--- trunk/punit/src/org/punit/reporter/stream/file/FileLogger.java	2007-11-19 05:21:48 UTC (rev 252)
+++ trunk/punit/src/org/punit/reporter/stream/file/FileLogger.java	2007-11-19 05:22:16 UTC (rev 253)
@@ -25,10 +25,11 @@
     public void onRunnerStart(Class clazz, Runner runner) {
     	if(_fileName == null) {
     		_fileName = ReporterUtil.defaultFileName(clazz, runner) + ".txt"; //$NON-NLS-1$
+    		_fileName = ReporterUtil.generateFileName(_fileName, runner);
     	}
-        String fileName = ReporterUtil.generateFileName(_fileName);
+ 
         try {
-            PrintStream ps = new PrintStream(fileName);
+            PrintStream ps = new PrintStream(_fileName);
             setStream(ps, ps);
         } catch (Exception e) {
             throw new IllegalStateException(e);

Modified: trunk/punit/src/org/punit/runner/AbstractRunner.java
===================================================================
--- trunk/punit/src/org/punit/runner/AbstractRunner.java	2007-11-19 05:21:48 UTC (rev 252)
+++ trunk/punit/src/org/punit/runner/AbstractRunner.java	2007-11-19 05:22:16 UTC (rev 253)
@@ -13,6 +13,7 @@
 import org.punit.events.EventListener;
 import org.punit.exception.IOException;
 import org.punit.exception.ReflectionException;
+import org.punit.message.Messages;
 import org.punit.method.builder.TestMethodBuilder;
 import org.punit.method.runner.MethodRunner;
 import org.punit.reporter.TestResult;
@@ -48,6 +49,8 @@
 
     private Convention _convention;
 
+	private String _folder;
+
     public AbstractRunner(TestSuiteBuilder testSuiteBuiler,
             TestMethodBuilder testMethodBuilder, MethodRunner testMethodRunner) {
         _testSuiteBuiler = testSuiteBuiler;
@@ -67,7 +70,7 @@
     }
 
     public int run(Class clazz) {
-        initResultFolder();
+    	initResultFolder();
         onRunnerStart(clazz);
         Object[] testClasses = _testSuiteBuiler.buildTestClasses(clazz);
         runTestClasses(testClasses);
@@ -75,7 +78,11 @@
         return _testResult.failures().size();
     }
 
-    public int run(Class clazz, RunnerProperties properties) {
+    private void initResultFolder() {
+		new File(resultFolder()).mkdirs();
+	}
+
+	public int run(Class clazz, RunnerProperties properties) {
         setRunnerProperties(properties);
         return run(clazz);
     }
@@ -115,7 +122,6 @@
     }
 
     public void runVMs(Class clazz, VM[] vms) {
-        initResultFolder();
         _properties.isParent = true;
         _properties.vms = vms;
         for (int i = 0; i < vms.length; ++i) {
@@ -180,12 +186,12 @@
     }
 
     private String runnerConfigFileName(VM vm) {
-        return RunnerConstants.RESULT_FOLDER + File.separator + vm.punitName()
+        return resultFolder() + File.separator + vm.punitName()
                 + ".cfg"; //$NON-NLS-1$
     }
 
     private String runnerPropertiesFileName(VM vm) {
-        return RunnerConstants.RESULT_FOLDER + File.separator + vm.punitName()
+        return resultFolder() + File.separator + vm.punitName()
                 + ".props"; //$NON-NLS-1$
     }
 
@@ -215,10 +221,6 @@
         });
     }
 
-    private void initResultFolder() {
-        new File(RunnerConstants.RESULT_FOLDER).mkdir();
-    }
-
     private void onRunnerEnd(final Class clazz) {
         TraverserUtil.traverse(_eventListeners.iterator(), new Traverser() {
             public void traverse(Object obj) {
@@ -235,6 +237,17 @@
         }
     }
 
+    public void resultFolder(String folder) {
+    	_folder = folder;
+    }
+    
+    public String resultFolder() {
+    	if(_folder == null) {
+    		_folder = Messages.getString("reporter.01"); //$NON-NLS-1$
+    	}
+    	return _folder;
+    }
+    
     private class RunTestClassTask implements Runnable {
         private Class _clazz;
 

Modified: trunk/punit/src/org/punit/runner/Runner.java
===================================================================
--- trunk/punit/src/org/punit/runner/Runner.java	2007-11-19 05:21:48 UTC (rev 252)
+++ trunk/punit/src/org/punit/runner/Runner.java	2007-11-19 05:22:16 UTC (rev 253)
@@ -27,4 +27,8 @@
 
     public TestResult testResult();
     
+    public void resultFolder(String folder);
+    
+    public String resultFolder();
+    
 }

Deleted: trunk/punit/src/org/punit/runner/RunnerConstants.java
===================================================================
--- trunk/punit/src/org/punit/runner/RunnerConstants.java	2007-11-19 05:21:48 UTC (rev 252)
+++ trunk/punit/src/org/punit/runner/RunnerConstants.java	2007-11-19 05:22:16 UTC (rev 253)
@@ -1,10 +0,0 @@
-package org.punit.runner;
-
-import org.punit.message.*;
-
-public class RunnerConstants {
-	
-	public static final String RESULT_FOLDER = Messages
-			.getString("reporter.01"); //$NON-NLS-1$
-
-}

Modified: trunk/punit/src/org/punit/util/ReporterUtil.java
===================================================================
--- trunk/punit/src/org/punit/util/ReporterUtil.java	2007-11-19 05:21:48 UTC (rev 252)
+++ trunk/punit/src/org/punit/util/ReporterUtil.java	2007-11-19 05:22:16 UTC (rev 253)
@@ -4,7 +4,6 @@
 import java.lang.reflect.Method;
 
 import org.punit.runner.Runner;
-import org.punit.runner.RunnerConstants;
 import org.punit.runner.RunnerProperties;
 
 public class ReporterUtil {
@@ -38,11 +37,11 @@
         return sb.toString();
     }
 
-    public static String generateFileName(String fileName) {
+    public static String generateFileName(String fileName, Runner runner) {
         StringBuffer sb = new StringBuffer();
         sb.append(IOUtil.getCurrentPath());
         sb.append(File.separator);
-        sb.append(RunnerConstants.RESULT_FOLDER);
+        sb.append(runner.resultFolder());
         sb.append(File.separator);
         sb.append(fileName);
         return sb.toString();


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