You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/09/29 08:43:30 UTC
svn commit: r580550 -
/ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java
Author: jaz
Date: Fri Sep 28 23:43:30 2007
New Revision: 580550
URL: http://svn.apache.org/viewvc?rev=580550&view=rev
Log:
another change to XML output for test cases, now logs each ofbiz test suite in its own file
Modified:
ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java
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=580550&r1=580549&r2=580550&view=diff
==============================================================================
--- ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java (original)
+++ ofbiz/trunk/framework/testtools/src/org/ofbiz/testtools/TestRunContainer.java Fri Sep 28 23:43:30 2007
@@ -39,12 +39,11 @@
public class TestRunContainer implements Container {
public static final String module = TestRunContainer.class.getName();
- public static final String logFile = "runtime/logs/tests-junit.xml";
+ public static final String logDir = "runtime/logs/test-results/";
protected String configFile = null;
protected String component = null;
protected String testCase = null;
- protected String outFile = null;
protected String logLevel = null;
/**
@@ -75,15 +74,17 @@
if ("case".equalsIgnoreCase(argumentName)) {
this.testCase = argumentVal;
}
- if ("results".equalsIgnoreCase(argumentName)) {
- this.outFile = argumentVal;
- }
if ("loglevel".equalsIgnoreCase(argumentName)) {
this.logLevel = argumentVal;
}
}
}
}
+
+ // make sure the log dir exists
+ File dir = new File(logDir);
+ if (!dir.exists())
+ dir.mkdir();
}
public boolean start() throws ContainerException {
@@ -100,22 +101,6 @@
}
}
- // configure xml output
- if (outFile == null) {
- outFile = logFile;
- }
-
- JunitXmlListener xml;
- try {
- xml = new JunitXmlListener(new FileOutputStream(outFile));
- } catch (FileNotFoundException e) {
- throw new ContainerException(e);
- }
-
- TestResult results = new TestResult();
- results.addListener(new JunitListener());
- results.addListener(xml);
-
// get the tests to run
JunitSuiteWrapper jsWrapper = new JunitSuiteWrapper(component, testCase);
if (jsWrapper.getAllTestList().size() == 0) {
@@ -128,37 +113,52 @@
TestSuite suite = (TestSuite) i.next();
JUnitTest test = new JUnitTest();
test.setName(suite.getName());
+
+ // create the XML logger
+ JunitXmlListener xml;
+ try {
+ xml = new JunitXmlListener(new FileOutputStream(logDir + suite.getName() + ".xml"));
+ } catch (FileNotFoundException e) {
+ throw new ContainerException(e);
+ }
+
+ // per-suite results
+ TestResult results = new TestResult();
+ results.addListener(new JunitListener());
+ results.addListener(xml);
+
+ // add the suite to the xml listener
xml.startTestSuite(test);
// run the tests
suite.run(results);
xml.endTestSuite(test);
- }
-
- // dispay the results
- Debug.log("[JUNIT] Pass: " + results.wasSuccessful() + " | # Tests: " + results.runCount() + " | # Failed: " +
- results.failureCount() + " # Errors: " + results.errorCount(), module);
- if (Debug.importantOn()) {
- Debug.log("[JUNIT] ----------------------------- ERRORS ----------------------------- [JUNIT]", module);
- Enumeration err = results.errors();
- if (!err.hasMoreElements()) {
- Debug.log("None");
- } else {
- while (err.hasMoreElements()) {
- Debug.log("--> " + err.nextElement(), module);
+
+ // dispay the results
+ Debug.log("[JUNIT] Pass: " + results.wasSuccessful() + " | # Tests: " + results.runCount() + " | # Failed: " +
+ results.failureCount() + " # Errors: " + results.errorCount(), module);
+ if (Debug.importantOn()) {
+ Debug.log("[JUNIT] ----------------------------- ERRORS ----------------------------- [JUNIT]", module);
+ Enumeration err = results.errors();
+ if (!err.hasMoreElements()) {
+ Debug.log("None");
+ } else {
+ while (err.hasMoreElements()) {
+ Debug.log("--> " + err.nextElement(), module);
+ }
}
- }
- Debug.log("[JUNIT] ------------------------------------------------------------------ [JUNIT]", module);
- Debug.log("[JUNIT] ---------------------------- FAILURES ---------------------------- [JUNIT]", module);
- Enumeration fail = results.failures();
- if (!fail.hasMoreElements()) {
- Debug.log("None");
- } else {
- while (fail.hasMoreElements()) {
- Debug.log("--> " + fail.nextElement(), module);
+ Debug.log("[JUNIT] ------------------------------------------------------------------ [JUNIT]", module);
+ Debug.log("[JUNIT] ---------------------------- FAILURES ---------------------------- [JUNIT]", module);
+ Enumeration fail = results.failures();
+ if (!fail.hasMoreElements()) {
+ Debug.log("None");
+ } else {
+ while (fail.hasMoreElements()) {
+ Debug.log("--> " + fail.nextElement(), module);
+ }
}
+ Debug.log("[JUNIT] ------------------------------------------------------------------ [JUNIT]", module);
}
- Debug.log("[JUNIT] ------------------------------------------------------------------ [JUNIT]", module);
}
return true;