5:05 p.m.
Author: bdaw
Date: 2007-10-16 11:05:25 -0400 (Tue, 16 Oct 2007)
New Revision: 8670
Modified:
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java
modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/ToolingConstants.java
modules/test/trunk/unit/src/main/org/jboss/unit/tooling/Main.java
Log:
- improve LDAP config support for tests
- make Main print whole test output at the end of the run.
Modified:
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java
===================================================================
---
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java 2007-10-16
12:16:32 UTC (rev 8669)
+++
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java 2007-10-16
15:05:25 UTC (rev 8670)
@@ -31,9 +31,7 @@
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Iterator;
-import java.util.List;
/**
* Configuration of LDAP Directory Server used for tests. Corresponds with
directories.xml file
@@ -118,6 +116,30 @@
// return new MultiValuedTestParameterValue(list);
// }
+ public static DSConfig obtainConfig(String directories, String directoryName) throws
Exception
+ {
+ if (directoryName != null && directoryName.length() > 0)
+ {
+ URL url =
Thread.currentThread().getContextClassLoader().getResource(directories);
+
+ DSConfig[] configs = fromXML(url);
+
+ for (DSConfig config : configs)
+ {
+ if (config.getName().equals(directoryName))
+ {
+ return config;
+ }
+ }
+
+ throw new IllegalStateException("Could not obtain Config for
{directoryName:directories} - {" + directoryName + ":" + directories +
"}" );
+ }
+ else
+ {
+ return null;
+ }
+ }
+
public static DSConfig[] fromXML(URL url) throws Exception
{
ArrayList configs = new ArrayList();
Modified:
modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/ToolingConstants.java
===================================================================
---
modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/ToolingConstants.java 2007-10-16
12:16:32 UTC (rev 8669)
+++
modules/test/trunk/tooling/src/main/org/jboss/unit/tooling/ant/ToolingConstants.java 2007-10-16
15:05:25 UTC (rev 8670)
@@ -33,6 +33,10 @@
public static final String JBOSS_UNIT_PROPERTY = "jboss.unit.property";
+ public static final String JBOSS_UNIT_PARAMETER = "jboss.unit.parameter";
+
+ public static final String JBOSS_UNIT_PARAMETERS = "jboss.unit.parameters";
+
public static final String OPT_ID = "--id";
public static final String OPT_IDS = "--ids";
Modified: modules/test/trunk/unit/src/main/org/jboss/unit/tooling/Main.java
===================================================================
--- modules/test/trunk/unit/src/main/org/jboss/unit/tooling/Main.java 2007-10-16 12:16:32
UTC (rev 8669)
+++ modules/test/trunk/unit/src/main/org/jboss/unit/tooling/Main.java 2007-10-16 15:05:25
UTC (rev 8670)
@@ -28,12 +28,14 @@
import org.jboss.unit.runner.impl.TestRunnerEventBroadcaster;
import org.jboss.unit.runner.model.TestSuiteDef;
import org.jboss.unit.tooling.filter.MainTestFilter;
+import org.jboss.unit.report.impl.writer.PrintListener;
import java.util.Set;
import java.util.HashSet;
import java.util.Map;
import java.util.HashMap;
import java.util.Collections;
+import java.io.StringWriter;
/**
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot
com">Boleslaw Dawidowicz</a>
@@ -54,8 +56,12 @@
public static final String JBOSS_UNIT_PROPERTIES = "jboss.unit.properties";
- public static final String JBOSS_UNIT_PROPERTY = "jboss.unit.property";
+ public static final String JBOSS_UNIT_PROPERTY = "jboss.unit.property";
+ public static final String JBOSS_UNIT_PARAMETER = "jboss.unit.parameter";
+
+ public static final String JBOSS_UNIT_PARAMETERS = "jboss.unit.parameters";
+
public static final String OPT_ID = "--id";
public static final String OPT_IDS = "--ids";
@@ -147,7 +153,7 @@
this.broadcaster = broadcaster;
}
- public void execute()
+ public void execute() throws Exception
{
// For now lets just be verbose. Later we need some real logging + 'debug'
switch
System.out.println("TestRunnerContext contains: ");
@@ -159,9 +165,16 @@
//
// System.out.println(key + "=" + System.getProperty((String)key));
// }
-
+
+ StringWriter sw = new StringWriter();
+ broadcaster.addListener(new PrintListener(sw));
+
TestRunnerContextSupport runnerContext = new TestRunnerContextSupport(properties,
new ParametrizationSet(), mainFilter, broadcaster);
runner.run(runnerContext);
+
+ sw.close();
+
+ System.out.println(sw.toString());
}
public static void main(String[] args) throws Exception