Author: hansbak
Date: Tue Jan 10 23:29:24 2012
New Revision: 1229799
URL: http://svn.apache.org/viewvc?rev=1229799&view=rev
Log:
revert 1229478 : test result files are empty
Removed:
ofbiz/trunk/framework/testtools/config/TestToolsConfig.properties
Modified:
ofbiz/trunk/build.xml
ofbiz/trunk/framework/build.xml
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java
Modified: ofbiz/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1229799&r1=1229798&r2=1229799&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Tue Jan 10 23:29:24 2012
@@ -847,13 +847,12 @@ under the License.
<arg value="test"/>
<env key="LC_ALL" value="C"/>
</java>
- <property
file="${basedir}/framework/testtools/config/TestToolsConfig.properties"/>
- <mkdir dir="${testtools.test-results-dir}html"/>
- <junitreport todir="${testtools.test-results-dir}">
- <fileset dir="${testtools.test-results-dir}">
+ <mkdir dir="runtime/logs/test-results/html"/>
+ <junitreport todir="runtime/logs/test-results">
+ <fileset dir="runtime/logs/test-results/">
<include name="*.xml"/>
</fileset>
- <report format="frames" todir="${testtools.test-results-dir}html"/>
+ <report format="frames" todir="runtime/logs/test-results/html"/>
</junitreport>
<fail message="Test run was unsuccessful">
<condition>
@@ -892,11 +891,10 @@ under the License.
<arg value="-case=${test.case}"/>
<env key="LC_ALL" value="C"/>
</java>
- <property
file="${basedir}/framework/testtools/config/TestToolsConfig.properties"/>
- <delete
dir="${testtools.test-results-dir}${test.component}-${test.case}"/>
- <mkdir
dir="${testtools.test-results-dir}${test.component}-${test.case}"/>
- <move
todir="${testtools.test-results-dir}${test.component}-${test.case}">
- <fileset dir="${testtools.test-results-dir}" includes="*.xml"/>
+ <delete
dir="runtime/logs/test-results/${test.component}-${test.case}"/>
+ <mkdir dir="runtime/logs/test-results/${test.component}-${test.case}"/>
+ <move todir="runtime/logs/test-results/${test.component}-${test.case}">
+ <fileset dir="runtime/logs/test-results" includes="*.xml"/>
</move>
<fail message="Test run was unsuccessful">
<condition>
@@ -927,7 +925,7 @@ under the License.
</target>
<target name="run-test-list" depends="_setup-separated-test-run"
description="Run all configured tests, stopping/starting ofbiz
between each test">
- <delete dir="${testtools.test-results-dir}"/>
+ <delete dir="runtime/logs/test-results"/>
<ant antfile="runtime/test-list-build.xml" target="all-tests"/>
</target>
Modified: ofbiz/trunk/framework/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?rev=1229799&r1=1229798&r2=1229799&view=diff
==============================================================================
--- ofbiz/trunk/framework/build.xml (original)
+++ ofbiz/trunk/framework/build.xml Tue Jan 10 23:29:24 2012
@@ -49,6 +49,7 @@ under the License.
<mkdir dir="../runtime"/>
<mkdir dir="../runtime/output"/>
<mkdir dir="../runtime/logs"/>
+ <mkdir dir="../runtime/logs/test-results"/>
<mkdir dir="../runtime/data"/>
<mkdir dir="../runtime/data/derby"/>
<mkdir dir="../runtime/data/hsql"/>
@@ -91,8 +92,7 @@ under the License.
</target>
<target name="clean-logs">
- <property
file="${basedir}/framework/testtools/config/TestTools.properties"/>
- <delete verbose="on" dir="../${testtools.test-results-dir}"/>
+ <delete verbose="on" dir="../runtime/logs/test-results"/>
<delete dir="../runtime/logs/cobertura-report"/>
<delete verbose="on">
<fileset dir="../runtime/logs" includes="*">
Modified:
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java?rev=1229799&r1=1229798&r2=1229799&view=diff
==============================================================================
---
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java
(original)
+++
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java
Tue Jan 10 23:29:24 2012
@@ -40,7 +40,6 @@ import org.apache.tools.ant.taskdefs.opt
import org.ofbiz.base.container.Container;
import org.ofbiz.base.container.ContainerException;
import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilProperties;
import org.ofbiz.entity.Delegator;
/**
@@ -49,6 +48,7 @@ import org.ofbiz.entity.Delegator;
public class TestRunContainer implements Container {
public static final String module = TestRunContainer.class.getName();
+ public static final String logDir = "runtime/logs/test-results/";
protected String configFile = null;
protected String component = null;
@@ -93,7 +93,7 @@ public class TestRunContainer implements
}
}
}
- String logDir = UtilProperties.getPropertyValue("TestToolsConfig",
"test-results-dir");
+
// make sure the log dir exists
File dir = new File(logDir);
if (!dir.exists())
@@ -120,9 +120,6 @@ public class TestRunContainer implements
throw new ContainerException("No tests found (" + component + " /
" + suiteName + " / " + testCase + ")");
}
- // get logdir
- String logDir = UtilProperties.getPropertyValue("TestToolsConfig",
"test-results-dir");
-
boolean failedRun = false;
for (ModelTestSuite modelSuite: jsWrapper.getModelTestSuites()) {
Delegator testDelegator = modelSuite.getDelegator();
