Modified:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/CleanupHookTask.java
URL:
http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/CleanupHookTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
---
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/CleanupHookTask.java
(original)
+++
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/CleanupHookTask.java
Fri Aug 12 08:12:28 2005
@@ -1,28 +1,28 @@
-package org.apache.beehive.test.tools.tch.core;
-
-import org.apache.tools.ant.BuildException;
-
-//Just here so that addTask() may differentiate with dependencies on tasdef in
Ant XML
-
-public class CleanupHookTask extends HookTask
-{
- protected String getDefaultName()
- {
- return "cleanup-hook";
- }
-
- public boolean run() throws BuildException
- {
- // if the init-hook ran, the cleanup-hook must run regardless of
- // the test-suite's skip status
- if (testNodeTask instanceof TestSuiteTask)
- {
- if (((TestSuiteTask)testNodeTask).getInitHookStarted())
- {
- setAlwaysRun(true);
- }
- }
- return super.run();
- }
-
-}
+package org.apache.beehive.test.tools.tch.core;
+
+import org.apache.tools.ant.BuildException;
+
+//Just here so that addTask() may differentiate with dependencies on tasdef in
Ant XML
+
+public class CleanupHookTask extends HookTask
+{
+ protected String getDefaultName()
+ {
+ return "cleanup-hook";
+ }
+
+ public boolean run() throws BuildException
+ {
+ // if the init-hook ran, the cleanup-hook must run regardless of
+ // the test-suite's skip status
+ if (testNodeTask instanceof TestSuiteTask)
+ {
+ if (((TestSuiteTask)testNodeTask).getInitHookStarted())
+ {
+ setAlwaysRun(true);
+ }
+ }
+ return super.run();
+ }
+
+}
Propchange:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/CleanupHookTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/CmdlineParams.java
URL:
http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/CmdlineParams.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
---
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/CmdlineParams.java
(original)
+++
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/CmdlineParams.java
Fri Aug 12 08:12:28 2005
@@ -1,38 +1,38 @@
-package org.apache.beehive.test.tools.tch.core;
-
-/**
- * Interface for constants regarding the command line of Tch
- * No names in here for general property access! Use AntProperties,
- * create a method.
- */
-public interface CmdlineParams {
-
- public static String
- TCH_TARGET = "run",
- BASE = "tch " + TCH_TARGET,
- TEST_SUITE_PARAM = PropertyNames.TEST_SUITE_PROPERTY,
- CONFIG_FILE_PARAM = PropertyNames.PROCESS_CONFIG_PROPERTY,
- SUBSET_TEST_PARAM = PropertyNames.TCH_PREFIX
- +PropertyNames.TCH_TEST_NAMES_PROPERTY,
- TEST_NAMES_DELIMITER = PropertyNames.DELIMITER,
- SPECIAL_TCH_PROPERTY_PREFIX = PropertyNames.TCH_PREFIX,
- TCH_HOME_PROPERTY_NAME = PropertyNames.TCH_PREFIX +
- PropertyNames.TCH_HOME_PROPERTY,
- TCH_BASEDIR_PROPERTY_NAME = PropertyNames.TCH_PREFIX +
- PropertyNames.TCH_BASEDIR_PROPERTY,
- TCH_FAILFAST_VALIDATION_PROPERTY_NAME = PropertyNames.TCH_PREFIX +
- PropertyNames.TCH_FAILFAST_VALIDATION_PROPERTY,
-
- // Stuff for java command line
- JAVA_BASE = "java",
- MAIN_CLASS = "org.apache.tools.ant.Main",
- TCH_JAVAOPTS_PROPERTY_NAME = PropertyNames.TCH_PREFIX +
- PropertyNames.TCH_JAVAOPTS_PROPERTY,
- TCH_VERBOSE_PROPERTY_NAME = PropertyNames.TCH_PREFIX +
- PropertyNames.TCH_VERBOSE_PROPERTY,
- TOP_LEVEL_BUILDFILE = "tch-root.xml",
- OUTER_ANT_BUILDFILE = "build.xml",
- TCH_FORK_PROPERTY_NAME = PropertyNames.TCH_PREFIX +
- PropertyNames.TCH_FORK_PROPERTY;
-}
-
+package org.apache.beehive.test.tools.tch.core;
+
+/**
+ * Interface for constants regarding the command line of Tch
+ * No names in here for general property access! Use AntProperties,
+ * create a method.
+ */
+public interface CmdlineParams {
+
+ public static String
+ TCH_TARGET = "run",
+ BASE = "tch " + TCH_TARGET,
+ TEST_SUITE_PARAM = PropertyNames.TEST_SUITE_PROPERTY,
+ CONFIG_FILE_PARAM = PropertyNames.PROCESS_CONFIG_PROPERTY,
+ SUBSET_TEST_PARAM = PropertyNames.TCH_PREFIX
+ +PropertyNames.TCH_TEST_NAMES_PROPERTY,
+ TEST_NAMES_DELIMITER = PropertyNames.DELIMITER,
+ SPECIAL_TCH_PROPERTY_PREFIX = PropertyNames.TCH_PREFIX,
+ TCH_HOME_PROPERTY_NAME = PropertyNames.TCH_PREFIX +
+ PropertyNames.TCH_HOME_PROPERTY,
+ TCH_BASEDIR_PROPERTY_NAME = PropertyNames.TCH_PREFIX +
+ PropertyNames.TCH_BASEDIR_PROPERTY,
+ TCH_FAILFAST_VALIDATION_PROPERTY_NAME = PropertyNames.TCH_PREFIX +
+ PropertyNames.TCH_FAILFAST_VALIDATION_PROPERTY,
+
+ // Stuff for java command line
+ JAVA_BASE = "java",
+ MAIN_CLASS = "org.apache.tools.ant.Main",
+ TCH_JAVAOPTS_PROPERTY_NAME = PropertyNames.TCH_PREFIX +
+ PropertyNames.TCH_JAVAOPTS_PROPERTY,
+ TCH_VERBOSE_PROPERTY_NAME = PropertyNames.TCH_PREFIX +
+ PropertyNames.TCH_VERBOSE_PROPERTY,
+ TOP_LEVEL_BUILDFILE = "tch-root.xml",
+ OUTER_ANT_BUILDFILE = "build.xml",
+ TCH_FORK_PROPERTY_NAME = PropertyNames.TCH_PREFIX +
+ PropertyNames.TCH_FORK_PROPERTY;
+}
+
Propchange:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/CmdlineParams.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ConfigurationDependencyTask.java
URL:
http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ConfigurationDependencyTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
---
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ConfigurationDependencyTask.java
(original)
+++
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ConfigurationDependencyTask.java
Fri Aug 12 08:12:28 2005
@@ -1,138 +1,138 @@
-package org.apache.beehive.test.tools.tch.core;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.Reader;
-import java.io.StringReader;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.tools.ant.BuildException;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-
-import
org.apache.beehive.test.tools.tch.core.configuration.NonfatalValidationException;
-import
org.apache.beehive.test.tools.tch.core.configuration.UnitConfigurationInfo;
-import org.apache.beehive.test.tools.tch.core.configuration.XMLHandler;
-import org.apache.beehive.test.tools.tch.core.process.ProcessRegistry;
-
-public class ConfigurationDependencyTask
- extends BaseTwoPassTask
- implements RunOnceTask
-{
- ProcessRegistry processRegistry = null;
- String parentProcessName = null;
-
- File file = null; //contains the XML for the dependencies
- String contents = null;
-
- UnitConfigurationInfo unitConfigInfo = null;
-
- public void setProcessRegistry(ProcessRegistry in)
- {
- processRegistry = in;
- }
-
- public void setProcessName(String in)
- {
- parentProcessName = handleValue(in);
- }
-
- public void addText(String in)
- {
- contents = handleValue(in.trim());
- }
-
- public void setFile(String in)
- {
- file = new File(handleValue(in));
- }
-
- public UnitConfigurationInfo getUnitConfigurationInfo()
- {
- return unitConfigInfo;
- }
-
- protected boolean initialize() throws BuildException
- {
- if (super.initialize())
- {
- org.apache.beehive.test.tools.tch.util.DebugLogger.log(
- "In ConfigurationDependencyTask.initialize()",
- getLocation());
- //Retrieves the XMLHandler for this Process (using the ProcessRegistry)
- //and uses it to generate the UnitConfigurationInfo, stores for use by
parent ProcessTask
- try
- {
- Reader reader = getReader(); //do early for validation purposes
-
- if (parentProcessName != null) //could be invalid process name
- {
- XMLHandler handler =
- processRegistry
- .getProcessEntry(parentProcessName)
- .getConfiguredProcessType()
- .getProcessType()
- .getXMLHandler();
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setValidating(false); // no loading the DTD.
- dbf.setNamespaceAware(false); // turn on/off namespaces
- DocumentBuilder db = dbf.newDocumentBuilder();
- Document document = db.parse(new InputSource(reader));
- //FIXME: we need to do some null checks here, otherwise we'll just
- //spew NPE in the case of misconfigured build.xml's
-
- unitConfigInfo =
- handler.getUnitConfigurationInfo(
- document,
- getLocation(),
- getCallingChain());
- }
- }
- catch (FileNotFoundException ex)
- {
- //VALIDATION ERROR
- NonfatalValidationException nve =
- new NonfatalValidationException(
- ex,
- ErrorMessageConstants.NO_CONFIG_DEPENDENCY_FILE_FOUND_ERROR_CODE,
- ErrorMessageConstants.FILENAME,
- file.getAbsolutePath());
- invalidate(nve);
- }
- catch (NonfatalValidationException e)
- {
- //VALIDATION ERROR
- invalidate(e);
- }
- catch (Exception e)
- {
- throw new BuildException(
- "Trouble getting UnitConfigurationInfo: ",
- e,
- getLocation());
- }
- return true;
- }
- else
- return false;
- }
-
- private Reader getReader()
- throws FileNotFoundException, NonfatalValidationException
- {
- if (contents != null)
- return new StringReader(contents);
- else
- {
- if (file != null)
- return new FileReader(file);
- else
- throw new NonfatalValidationException(
- ErrorMessageConstants
- .NO_CONFIG_DEPENDENCY_FILE_OR_CDATA_GIVEN_ERROR_CODE);
- }
- }
-}
+package org.apache.beehive.test.tools.tch.core;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.Reader;
+import java.io.StringReader;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.tools.ant.BuildException;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+
+import
org.apache.beehive.test.tools.tch.core.configuration.NonfatalValidationException;
+import
org.apache.beehive.test.tools.tch.core.configuration.UnitConfigurationInfo;
+import org.apache.beehive.test.tools.tch.core.configuration.XMLHandler;
+import org.apache.beehive.test.tools.tch.core.process.ProcessRegistry;
+
+public class ConfigurationDependencyTask
+ extends BaseTwoPassTask
+ implements RunOnceTask
+{
+ ProcessRegistry processRegistry = null;
+ String parentProcessName = null;
+
+ File file = null; //contains the XML for the dependencies
+ String contents = null;
+
+ UnitConfigurationInfo unitConfigInfo = null;
+
+ public void setProcessRegistry(ProcessRegistry in)
+ {
+ processRegistry = in;
+ }
+
+ public void setProcessName(String in)
+ {
+ parentProcessName = handleValue(in);
+ }
+
+ public void addText(String in)
+ {
+ contents = handleValue(in.trim());
+ }
+
+ public void setFile(String in)
+ {
+ file = new File(handleValue(in));
+ }
+
+ public UnitConfigurationInfo getUnitConfigurationInfo()
+ {
+ return unitConfigInfo;
+ }
+
+ protected boolean initialize() throws BuildException
+ {
+ if (super.initialize())
+ {
+ org.apache.beehive.test.tools.tch.util.DebugLogger.log(
+ "In ConfigurationDependencyTask.initialize()",
+ getLocation());
+ //Retrieves the XMLHandler for this Process (using the ProcessRegistry)
+ //and uses it to generate the UnitConfigurationInfo, stores for use by
parent ProcessTask
+ try
+ {
+ Reader reader = getReader(); //do early for validation purposes
+
+ if (parentProcessName != null) //could be invalid process name
+ {
+ XMLHandler handler =
+ processRegistry
+ .getProcessEntry(parentProcessName)
+ .getConfiguredProcessType()
+ .getProcessType()
+ .getXMLHandler();
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setValidating(false); // no loading the DTD.
+ dbf.setNamespaceAware(false); // turn on/off namespaces
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ Document document = db.parse(new InputSource(reader));
+ //FIXME: we need to do some null checks here, otherwise we'll just
+ //spew NPE in the case of misconfigured build.xml's
+
+ unitConfigInfo =
+ handler.getUnitConfigurationInfo(
+ document,
+ getLocation(),
+ getCallingChain());
+ }
+ }
+ catch (FileNotFoundException ex)
+ {
+ //VALIDATION ERROR
+ NonfatalValidationException nve =
+ new NonfatalValidationException(
+ ex,
+ ErrorMessageConstants.NO_CONFIG_DEPENDENCY_FILE_FOUND_ERROR_CODE,
+ ErrorMessageConstants.FILENAME,
+ file.getAbsolutePath());
+ invalidate(nve);
+ }
+ catch (NonfatalValidationException e)
+ {
+ //VALIDATION ERROR
+ invalidate(e);
+ }
+ catch (Exception e)
+ {
+ throw new BuildException(
+ "Trouble getting UnitConfigurationInfo: ",
+ e,
+ getLocation());
+ }
+ return true;
+ }
+ else
+ return false;
+ }
+
+ private Reader getReader()
+ throws FileNotFoundException, NonfatalValidationException
+ {
+ if (contents != null)
+ return new StringReader(contents);
+ else
+ {
+ if (file != null)
+ return new FileReader(file);
+ else
+ throw new NonfatalValidationException(
+ ErrorMessageConstants
+ .NO_CONFIG_DEPENDENCY_FILE_OR_CDATA_GIVEN_ERROR_CODE);
+ }
+ }
+}
Propchange:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ConfigurationDependencyTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/DependentTask.java
URL:
http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/DependentTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
---
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/DependentTask.java
(original)
+++
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/DependentTask.java
Fri Aug 12 08:12:28 2005
@@ -1,25 +1,25 @@
-package org.apache.beehive.test.tools.tch.core;
-
-import org.apache.tools.ant.Task;
-
-public class DependentTask
- extends BaseTaskContainer
- implements ChildTask
-{
- private Task parentTask = null;
-
- //ChildTask implementation.
-
- public void setParentTask(Task in)
- {
- parentTask = in;
- }
-
- public Task handleTask(Task task)
- {
- task = super.handleTask(task);
- if(task instanceof ChildTask)
- ((ChildTask)task).setParentTask(parentTask);
- return task;
- }
-}
+package org.apache.beehive.test.tools.tch.core;
+
+import org.apache.tools.ant.Task;
+
+public class DependentTask
+ extends BaseTaskContainer
+ implements ChildTask
+{
+ private Task parentTask = null;
+
+ //ChildTask implementation.
+
+ public void setParentTask(Task in)
+ {
+ parentTask = in;
+ }
+
+ public Task handleTask(Task task)
+ {
+ task = super.handleTask(task);
+ if(task instanceof ChildTask)
+ ((ChildTask)task).setParentTask(parentTask);
+ return task;
+ }
+}
Propchange:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/DependentTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/DirtyClass.java
URL:
http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/DirtyClass.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
---
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/DirtyClass.java
(original)
+++
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/DirtyClass.java
Fri Aug 12 08:12:28 2005
@@ -1,71 +1,71 @@
-package org.apache.beehive.test.tools.tch.core;
-
-import org.apache.beehive.test.tools.tch.core.process.ProcessRegistry;
-import org.apache.beehive.test.tools.tch.core.test.TestRegistry;
-
-public class DirtyClass
-{
- private static boolean firstPass = true;
- private static boolean runSubsetPass = false;
- private static boolean testsToRun = false;
- //"short-test-2";
-
- public static boolean isFirstPass()
- {
- return firstPass;
- }
-
- public static void setFirstPass(boolean in)
- {
- firstPass = in;
- }
-
- public static boolean isRunSubsetPass()
- {
- return runSubsetPass;
- }
-
- public static void setRunSubsetPass(boolean in)
- {
- runSubsetPass = in;
- }
-
- // returns true if we want to run all tests, as opposed to a subset of tests.
- public static boolean runAll()
- {
- return !testsToRun;
- }
-
- public static void setTestsToRun()
- {
- testsToRun = true;
- }
-
- public static void main(String dirtyArgs[])
- {
- if(isFirstPass())
- {
- org.apache.beehive.test.tools.tch.util.DebugLogger.log("Setting first
pass to false"+"\n\n");
- setFirstPass(false);
-
- TestRegistry testRegistry = TestRegistry.getRegistry();
- org.apache.beehive.test.tools.tch.util.DebugLogger.log("TestRegistry
is:");
-
org.apache.beehive.test.tools.tch.util.DebugLogger.log("==============================");
-
org.apache.beehive.test.tools.tch.util.DebugLogger.log(testRegistry.dump());
-
org.apache.beehive.test.tools.tch.util.DebugLogger.log("==============================");
- }
-
- if(!isFirstPass())
- printProcessRegistry();
- }
-
- public static void printProcessRegistry()
- {
- ProcessRegistry processRegistry = ProcessRegistry.getRegistry();
- org.apache.beehive.test.tools.tch.util.DebugLogger.log("ProcessRegistry
is:");
-
org.apache.beehive.test.tools.tch.util.DebugLogger.log("==============================");
-
org.apache.beehive.test.tools.tch.util.DebugLogger.log(processRegistry.toString());
-
org.apache.beehive.test.tools.tch.util.DebugLogger.log("==============================");
-
- }
-}
+package org.apache.beehive.test.tools.tch.core;
+
+import org.apache.beehive.test.tools.tch.core.process.ProcessRegistry;
+import org.apache.beehive.test.tools.tch.core.test.TestRegistry;
+
+public class DirtyClass
+{
+ private static boolean firstPass = true;
+ private static boolean runSubsetPass = false;
+ private static boolean testsToRun = false;
+ //"short-test-2";
+
+ public static boolean isFirstPass()
+ {
+ return firstPass;
+ }
+
+ public static void setFirstPass(boolean in)
+ {
+ firstPass = in;
+ }
+
+ public static boolean isRunSubsetPass()
+ {
+ return runSubsetPass;
+ }
+
+ public static void setRunSubsetPass(boolean in)
+ {
+ runSubsetPass = in;
+ }
+
+ // returns true if we want to run all tests, as opposed to a subset of tests.
+ public static boolean runAll()
+ {
+ return !testsToRun;
+ }
+
+ public static void setTestsToRun()
+ {
+ testsToRun = true;
+ }
+
+ public static void main(String dirtyArgs[])
+ {
+ if(isFirstPass())
+ {
+ org.apache.beehive.test.tools.tch.util.DebugLogger.log("Setting first
pass to false"+"\n\n");
+ setFirstPass(false);
+
+ TestRegistry testRegistry = TestRegistry.getRegistry();
+ org.apache.beehive.test.tools.tch.util.DebugLogger.log("TestRegistry
is:");
+
org.apache.beehive.test.tools.tch.util.DebugLogger.log("==============================");
+
org.apache.beehive.test.tools.tch.util.DebugLogger.log(testRegistry.dump());
+
org.apache.beehive.test.tools.tch.util.DebugLogger.log("==============================");
+ }
+
+ if(!isFirstPass())
+ printProcessRegistry();
+ }
+
+ public static void printProcessRegistry()
+ {
+ ProcessRegistry processRegistry = ProcessRegistry.getRegistry();
+ org.apache.beehive.test.tools.tch.util.DebugLogger.log("ProcessRegistry
is:");
+
org.apache.beehive.test.tools.tch.util.DebugLogger.log("==============================");
+
org.apache.beehive.test.tools.tch.util.DebugLogger.log(processRegistry.toString());
+
org.apache.beehive.test.tools.tch.util.DebugLogger.log("==============================");
+
+ }
+}
Propchange:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/DirtyClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/EntryPoint.java
URL:
http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/EntryPoint.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
---
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/EntryPoint.java
(original)
+++
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/EntryPoint.java
Fri Aug 12 08:12:28 2005
@@ -1,30 +1,30 @@
-package org.apache.beehive.test.tools.tch.core;
-
-import java.util.Collection;
-
-import org.apache.beehive.test.tools.tch.util.TestResultBean;
-
-
-/**
- */
-public interface EntryPoint extends ExtendedAntTask
-{
- public String getName();
-
- public boolean runFailedTestOnly();
-
- /**
- * This method should return all processes which have
- * been mapped somewhere under the EntryPoint. This is
- * used to control which processes are marked active.
- */
- public Collection getContainedProcessNames();
-
- public Collection getContainedLogicalTests();
-
- public void populateCommandLine(String fullName, TestResultBean res);
-
- public void populateJavaCommandLine(String fullName, TestResultBean res);
-
- public String getAntReplicationFile(String fullName);
-}
+package org.apache.beehive.test.tools.tch.core;
+
+import java.util.Collection;
+
+import org.apache.beehive.test.tools.tch.util.TestResultBean;
+
+
+/**
+ */
+public interface EntryPoint extends ExtendedAntTask
+{
+ public String getName();
+
+ public boolean runFailedTestOnly();
+
+ /**
+ * This method should return all processes which have
+ * been mapped somewhere under the EntryPoint. This is
+ * used to control which processes are marked active.
+ */
+ public Collection getContainedProcessNames();
+
+ public Collection getContainedLogicalTests();
+
+ public void populateCommandLine(String fullName, TestResultBean res);
+
+ public void populateJavaCommandLine(String fullName, TestResultBean res);
+
+ public String getAntReplicationFile(String fullName);
+}
Propchange:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/EntryPoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ErrorMessageConstants.java
URL:
http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ErrorMessageConstants.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
---
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ErrorMessageConstants.java
(original)
+++
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ErrorMessageConstants.java
Fri Aug 12 08:12:28 2005
@@ -1,73 +1,73 @@
-package org.apache.beehive.test.tools.tch.core;
-
-public interface ErrorMessageConstants
-{
- public static final int ANT_PROPERTY_NOT_FOUND_ERROR_CODE = 100;
- public static final int TCH_PROPERTIES_ERROR_CODE = 110;
- public static final int SSL_PROPERTY_ERROR_CODE = 120;
- public static final String PROPNAME = "propname";
- public static final String PROPFILENAME = "propfilename";
-
- public static final int INTEGER_PARSE_ERROR_CODE = 130;
- public static final String BROKEN_INT_VAL = "broken-int-val";
-
- public static final int NO_LONGER_VALID_PROPERTY_CODE = 150;
- public static final String ALTERNATIVE = "alternative";
-
- public static final int TEST_UNIT_LENGTH_ERROR_CODE = 201;
- public static final String TESTUNIT = "testunit";
- public static final String MAXCHARS = "maxchars";
- public static final String NUMCHARS = "numchars";
-
- public static final int NO_TEST_UNIT_ERROR_CODE = 202;
-
- public static final int TEST_NOT_FOUND_CODE = 214;
-
- public static final int TEST_NAME_LENGTH_ERROR_CODE = 215;
-
- public static final int TEST_UNIT_AT_WRONG_LEVEL_ERROR_CODE = 220;
-
- public static final int MISSING_REQUIRES_REFERENCE = 230;
- public static final int NON_TESTSUITE_REQUIRES_REFERENCE = 231;
- public static final int CYCLICAL_REQUIRES_REFERENCE = 232;
- public static final String REFERENCE = "reference";
-
- public static final int NO_IMPLICIT_PROCESS_ERROR_CODE = 300;
-
- public static final int MULTIPLE_DEFAULT_PROCESS_ERROR_CODE = 310;
- public static final String PROCESS = "process";
- public static final String OTHERPROCESS = "process2";
-
- public static final int NO_DEFAULT_PROCESS_FOR_TEST_VEHICLE_ERROR_CODE = 311;
- public static final int NO_PROCESS_FOR_TEST_FOR_TEST_VEHICLE_ERROR_CODE =
321;
- public static final String TESTNAME = "test";
-
- public static final int INVALID_TESTFILE_ERROR_CODE = 400;
- public static final String FILENAME = "file";
- public static final String MESSAGE = "message";
-
- public static final int INVALID_TEST_SUITE_CALL_ERROR_CODE = 401;
-
- public static final int UNKNOWN_TEST_VEHICLE_ERROR_CODE = 500;
- public static final String TESTVEHICLE = "test-vehicle";
-
- // error when global-test-vehicle-process specified but not
global-test-vehicle
- public static final int MANDATORY_GLOBAL_TEST_VEHICLE_ERROR_CODE = 501;
-
- // error when global-test-vehicle specified but not
global-test-vehicle-process
- public static final int MANDATORY_GLOBAL_TEST_VEHICLE_PROCESS_ERROR_CODE =
- 502;
-
- public static final int
GLOBAL_TEST_VEHICLE_PROCESS_NOT_REGISTERED_ERROR_CODE = 503;
-
- public static final int NO_CONFIG_DEPENDENCY_FILE_OR_CDATA_GIVEN_ERROR_CODE =
- 600;
- public static final int NO_CONFIG_DEPENDENCY_FILE_FOUND_ERROR_CODE = 601;
-
- public static final int EXEC_TASK_ERROR_CODE = 700;
- public static final int EXEC_TASK_WRAPPED_ERROR_CODE = 701;
- public static final int CUSTOM_TASK_WRAPPED_ERROR_CODE = 750;
-
- public static final int PROCESS_MANAGEMENT_ERROR_CODE = 800;
-
-}
+package org.apache.beehive.test.tools.tch.core;
+
+public interface ErrorMessageConstants
+{
+ public static final int ANT_PROPERTY_NOT_FOUND_ERROR_CODE = 100;
+ public static final int TCH_PROPERTIES_ERROR_CODE = 110;
+ public static final int SSL_PROPERTY_ERROR_CODE = 120;
+ public static final String PROPNAME = "propname";
+ public static final String PROPFILENAME = "propfilename";
+
+ public static final int INTEGER_PARSE_ERROR_CODE = 130;
+ public static final String BROKEN_INT_VAL = "broken-int-val";
+
+ public static final int NO_LONGER_VALID_PROPERTY_CODE = 150;
+ public static final String ALTERNATIVE = "alternative";
+
+ public static final int TEST_UNIT_LENGTH_ERROR_CODE = 201;
+ public static final String TESTUNIT = "testunit";
+ public static final String MAXCHARS = "maxchars";
+ public static final String NUMCHARS = "numchars";
+
+ public static final int NO_TEST_UNIT_ERROR_CODE = 202;
+
+ public static final int TEST_NOT_FOUND_CODE = 214;
+
+ public static final int TEST_NAME_LENGTH_ERROR_CODE = 215;
+
+ public static final int TEST_UNIT_AT_WRONG_LEVEL_ERROR_CODE = 220;
+
+ public static final int MISSING_REQUIRES_REFERENCE = 230;
+ public static final int NON_TESTSUITE_REQUIRES_REFERENCE = 231;
+ public static final int CYCLICAL_REQUIRES_REFERENCE = 232;
+ public static final String REFERENCE = "reference";
+
+ public static final int NO_IMPLICIT_PROCESS_ERROR_CODE = 300;
+
+ public static final int MULTIPLE_DEFAULT_PROCESS_ERROR_CODE = 310;
+ public static final String PROCESS = "process";
+ public static final String OTHERPROCESS = "process2";
+
+ public static final int NO_DEFAULT_PROCESS_FOR_TEST_VEHICLE_ERROR_CODE = 311;
+ public static final int NO_PROCESS_FOR_TEST_FOR_TEST_VEHICLE_ERROR_CODE =
321;
+ public static final String TESTNAME = "test";
+
+ public static final int INVALID_TESTFILE_ERROR_CODE = 400;
+ public static final String FILENAME = "file";
+ public static final String MESSAGE = "message";
+
+ public static final int INVALID_TEST_SUITE_CALL_ERROR_CODE = 401;
+
+ public static final int UNKNOWN_TEST_VEHICLE_ERROR_CODE = 500;
+ public static final String TESTVEHICLE = "test-vehicle";
+
+ // error when global-test-vehicle-process specified but not
global-test-vehicle
+ public static final int MANDATORY_GLOBAL_TEST_VEHICLE_ERROR_CODE = 501;
+
+ // error when global-test-vehicle specified but not
global-test-vehicle-process
+ public static final int MANDATORY_GLOBAL_TEST_VEHICLE_PROCESS_ERROR_CODE =
+ 502;
+
+ public static final int
GLOBAL_TEST_VEHICLE_PROCESS_NOT_REGISTERED_ERROR_CODE = 503;
+
+ public static final int NO_CONFIG_DEPENDENCY_FILE_OR_CDATA_GIVEN_ERROR_CODE =
+ 600;
+ public static final int NO_CONFIG_DEPENDENCY_FILE_FOUND_ERROR_CODE = 601;
+
+ public static final int EXEC_TASK_ERROR_CODE = 700;
+ public static final int EXEC_TASK_WRAPPED_ERROR_CODE = 701;
+ public static final int CUSTOM_TASK_WRAPPED_ERROR_CODE = 750;
+
+ public static final int PROCESS_MANAGEMENT_ERROR_CODE = 800;
+
+}
Propchange:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ErrorMessageConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExecutionTask.java
URL:
http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExecutionTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
---
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExecutionTask.java
(original)
+++
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExecutionTask.java
Fri Aug 12 08:12:28 2005
@@ -1,39 +1,39 @@
-package org.apache.beehive.test.tools.tch.core;
-
-import java.util.Collection;
-import java.util.List;
-import
org.apache.beehive.test.tools.tch.core.configuration.NonfatalValidationAggregate;
-import org.apache.beehive.test.tools.tch.core.test.TestLogicTask;
-
-
-public interface ExecutionTask extends ExtendedAntTask
-{
- public void setHelper(ExecutionTaskHelper in);
- public void validate() throws ExecutionTaskValidationException;
- public TestLogicTask getTestLogicTask();
- public int getNumOutcomes();
- public void setSkip(String message);
- public void setValidationSkip(String message);
- public void setNestedSkip(String message);
- public void abortTest(String message);
- public void abortTest(String message, Exception ex);
- public void setTestTimeoutSeconds(Integer in);
- public String getTestCaseName();
- public Collection getAllSubtestNames();
- public Collection getSubtestsConfiguredToRun();
-
- //in BaseTask, but added here to make code easier to read (no casting)
- public NonfatalValidationAggregate getNonfatalValidationAggregate();
-}
-
-
-
-
-
-
-
-
-
-
-
-
+package org.apache.beehive.test.tools.tch.core;
+
+import java.util.Collection;
+import java.util.List;
+import
org.apache.beehive.test.tools.tch.core.configuration.NonfatalValidationAggregate;
+import org.apache.beehive.test.tools.tch.core.test.TestLogicTask;
+
+
+public interface ExecutionTask extends ExtendedAntTask
+{
+ public void setHelper(ExecutionTaskHelper in);
+ public void validate() throws ExecutionTaskValidationException;
+ public TestLogicTask getTestLogicTask();
+ public int getNumOutcomes();
+ public void setSkip(String message);
+ public void setValidationSkip(String message);
+ public void setNestedSkip(String message);
+ public void abortTest(String message);
+ public void abortTest(String message, Exception ex);
+ public void setTestTimeoutSeconds(Integer in);
+ public String getTestCaseName();
+ public Collection getAllSubtestNames();
+ public Collection getSubtestsConfiguredToRun();
+
+ //in BaseTask, but added here to make code easier to read (no casting)
+ public NonfatalValidationAggregate getNonfatalValidationAggregate();
+}
+
+
+
+
+
+
+
+
+
+
+
+
Propchange:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExecutionTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExecutionTaskHelper.java
URL:
http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExecutionTaskHelper.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
---
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExecutionTaskHelper.java
(original)
+++
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExecutionTaskHelper.java
Fri Aug 12 08:12:28 2005
@@ -1,266 +1,266 @@
-package org.apache.beehive.test.tools.tch.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.beehive.test.tools.tch.compose.Parameters;
-import
org.apache.beehive.test.tools.tch.core.configuration.NonfatalValidationException;
-import org.apache.beehive.test.tools.tch.core.process.ProcessEngine;
-import org.apache.beehive.test.tools.tch.core.process.ProcessHandler;
-import
org.apache.beehive.test.tools.tch.core.process.ProcessManagementRuntimeException;
-import org.apache.beehive.test.tools.tch.core.process.ProcessRegistry;
-import org.apache.beehive.test.tools.tch.core.test.InternalParameters;
-import org.apache.beehive.test.tools.tch.core.test.ResultHandler;
-import org.apache.beehive.test.tools.tch.core.test.TestLogicTask;
-import org.apache.beehive.test.tools.tch.core.test.TestRegistry;
-import org.apache.beehive.test.tools.tch.core.test.vehicle.TestVehicle;
-import org.apache.beehive.test.tools.tch.core.test.vehicle.TestVehicleRegistry;
-import org.apache.beehive.test.tools.tch.task.TaskTransportException;
-
-public class ExecutionTaskHelper
-{
- private ResultHandler resultHandler = null;
- private TestTask testTask = null;
- private ExecutionTask executionTask = null;
-
- private String testVehicleType = null;
- private String testVehicleProcessName = null;
-
- private Throwable filterThrowable = null;
-
- public void setResultHandler(ResultHandler in)
- {
- resultHandler = in;
- }
-
- public ResultHandler getResultHandler()
- {
- return resultHandler;
- }
-
- public void setTestVehicleType(String in)
- {
- testVehicleType = in;
- }
-
- public String getTestVehicleType()
- {
- return testVehicleType;
- }
-
- public void registerTestVehicleWithTestRegistry()
- {
- // add to TestRegistry: test-name --> (test-vehicle-name, process-name)
- getTestTask().getTestRegistry().addTestVehicle(
- getTestTask().getLogicalTest().getKey(),
- getTestVehicleType(),
- getTestVehicleProcessName());
- }
-
- public void setTestVehicleProcessName(String in)
- {
- testVehicleProcessName = in;
- }
-
- public InternalParameters getParameters()
- {
- return testTask.getParameters();
- }
-
- public TestTask getTestTask()
- {
- return testTask;
- }
-
- public void setTestTask(TestTask in)
- {
- testTask = in;
- }
-
- public void setExecutionTask(ExecutionTask in)
- {
- // we only set it once, so we store the top-level execution task.
- if (executionTask == null)
- executionTask = in;
- }
-
- public void notifyTimeout(TestLogicTask inTask)
- {
- getTestVehicle().notifyTimeout(inTask);
- }
-
- public ProcessEngine getProcessEngine()
- {
- return getTestTask().getProcessEngine();
- }
-
- protected Throwable getFilterThrowable()
- {
- return filterThrowable;
- }
-
- void runTestLogic()
- {
- TestVehicle tv = getTestVehicle();
- ProcessHandler ph = null;
-
- // only get a process handler if this is not the 'local' test-vehicle.
- // we should fix this, so that the default process handler we get here
- // is actually 'tch'.
- if (!tv.isLocal())
- {
- // this could be refactored so that at test-run-time, we always get
- // the test-vehicle process name from the test-registry
- if (runningWithGloballySetTestVehicle())
- {
- // here all we have to do is get the right
- // process handler from the process registry
- ph =
- getTestTask()
- .getProcessRegistry()
- .getProcessEntryAssumeValidated(getTestVehicleProcessName())
- .getProcessHandler();
- }
- else
- {
- // else we get the process handler we need from the process engine
- ph = getProcessEngine().getProcessHandler(getTestVehicleProcessName());
- }
- }
-
- filterThrowable = new Throwable();
-
- try
- {
- if (!tv.isLocal())
- getTestTask().logInternal(
- "test-vehicle: "
- + tv.getType()
- + " test-vehicle-process: "
- + ph.getName());
- tv.run(ph, executionTask.getTestLogicTask());
- }
- catch (TaskTransportException ex)
- {
- executionTask.abortTest("transport failed with exception", ex);
- }
- catch (Exception ex)
- {
- executionTask.abortTest("test-logic failed with exception", ex);
- }
- }
-
- public void validateTestVehicleType() throws NonfatalValidationException
- {
- // check that the test-vehicle we're going to use actually exists
- if (getTestVehicle() == null)
- {
- throw new NonfatalValidationException(
- ErrorMessageConstants.UNKNOWN_TEST_VEHICLE_ERROR_CODE,
- ErrorMessageConstants.TESTVEHICLE,
- testVehicleType);
- }
- }
-
- public String getTestVehicleProcessName()
- {
- if (testVehicleProcessName == null)
- {
- // This checks if there is a default process, if not returns null.
- // For example, if there are two processes mapped at both
- // test and test-suite level, there is no default process.
- testVehicleProcessName = getDefaultProcessName();
- }
- return testVehicleProcessName;
- }
-
- private TestVehicle getTestVehicle()
- {
- TestVehicleRegistry.Entry entry =
- getTestVehicleRegistry().getTestVehicleEntry(testVehicleType);
- if (entry == null)
- return null;
- return entry.getTestVehicle();
- }
-
- public void validateTestVehicleProcessName()
- throws NonfatalValidationException
- {
- // don't care about process handler if running locally.
- if (runningWithLocalTestVehicle())
- return;
-
- String processName = getTestVehicleProcessName();
-
- if (processName == null)
- {
- throw new NonfatalValidationException(
- ErrorMessageConstants.NO_DEFAULT_PROCESS_FOR_TEST_VEHICLE_ERROR_CODE);
- }
-
- // if we're not running with the global test vehicle set on the command
line, then we need to be
- // able to get the test vehicle process handler from the process engine,
so check if that works
- // see if getting the process engine from the test task will invalidate
- // the test task
-
- ProcessEngine processEngine = getProcessEngine();
- try
- {
- processEngine.getProcessHandler(processName);
- }
- catch (ProcessManagementRuntimeException ex)
- {
- if (runningWithGloballySetTestVehicle() &&
isGloballySetTestVehicleProcessSameAsDeclared(processName))
- {
- // No need to throw an Exception if Same Process is declared globally.
- return;
- }
- else
- {
- Map params = new HashMap(2);
- params.put(ErrorMessageConstants.PROCESS, processName);
- params.put(ErrorMessageConstants.TESTNAME, getTestTask().getName());
- throw new NonfatalValidationException(
-
ErrorMessageConstants.NO_PROCESS_FOR_TEST_FOR_TEST_VEHICLE_ERROR_CODE,
- params);
- }
- }
- }
-
- private boolean runningWithGloballySetTestVehicle()
- {
- return AntProperties.isGlobalTestVehicleSet();
- }
-
- private boolean isGloballySetTestVehicleProcessSameAsDeclared(String
inProcessName)
- {
- String globalProcessName = AntProperties.getGlobalTestVehicleProcess();
- if (globalProcessName != null &&
globalProcessName.equals(inProcessName))
- {
- return true;
- }
- else
- return false;
- }
-
- private boolean runningWithLocalTestVehicle()
- {
- TestVehicleRegistry.Entry entry =
- getTestVehicleRegistry().getTestVehicleEntry(getTestVehicleType());
- if (entry != null)
- {
- return entry.getTestVehicle().isLocal();
- }
- return false;
- }
-
- private TestVehicleRegistry getTestVehicleRegistry()
- {
- return TestVehicleRegistry.getRegistry();
- }
-
- private String getDefaultProcessName()
- {
- return getTestTask().getDefaultProcessName();
- }
-}
+package org.apache.beehive.test.tools.tch.core;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.beehive.test.tools.tch.compose.Parameters;
+import
org.apache.beehive.test.tools.tch.core.configuration.NonfatalValidationException;
+import org.apache.beehive.test.tools.tch.core.process.ProcessEngine;
+import org.apache.beehive.test.tools.tch.core.process.ProcessHandler;
+import
org.apache.beehive.test.tools.tch.core.process.ProcessManagementRuntimeException;
+import org.apache.beehive.test.tools.tch.core.process.ProcessRegistry;
+import org.apache.beehive.test.tools.tch.core.test.InternalParameters;
+import org.apache.beehive.test.tools.tch.core.test.ResultHandler;
+import org.apache.beehive.test.tools.tch.core.test.TestLogicTask;
+import org.apache.beehive.test.tools.tch.core.test.TestRegistry;
+import org.apache.beehive.test.tools.tch.core.test.vehicle.TestVehicle;
+import org.apache.beehive.test.tools.tch.core.test.vehicle.TestVehicleRegistry;
+import org.apache.beehive.test.tools.tch.task.TaskTransportException;
+
+public class ExecutionTaskHelper
+{
+ private ResultHandler resultHandler = null;
+ private TestTask testTask = null;
+ private ExecutionTask executionTask = null;
+
+ private String testVehicleType = null;
+ private String testVehicleProcessName = null;
+
+ private Throwable filterThrowable = null;
+
+ public void setResultHandler(ResultHandler in)
+ {
+ resultHandler = in;
+ }
+
+ public ResultHandler getResultHandler()
+ {
+ return resultHandler;
+ }
+
+ public void setTestVehicleType(String in)
+ {
+ testVehicleType = in;
+ }
+
+ public String getTestVehicleType()
+ {
+ return testVehicleType;
+ }
+
+ public void registerTestVehicleWithTestRegistry()
+ {
+ // add to TestRegistry: test-name --> (test-vehicle-name, process-name)
+ getTestTask().getTestRegistry().addTestVehicle(
+ getTestTask().getLogicalTest().getKey(),
+ getTestVehicleType(),
+ getTestVehicleProcessName());
+ }
+
+ public void setTestVehicleProcessName(String in)
+ {
+ testVehicleProcessName = in;
+ }
+
+ public InternalParameters getParameters()
+ {
+ return testTask.getParameters();
+ }
+
+ public TestTask getTestTask()
+ {
+ return testTask;
+ }
+
+ public void setTestTask(TestTask in)
+ {
+ testTask = in;
+ }
+
+ public void setExecutionTask(ExecutionTask in)
+ {
+ // we only set it once, so we store the top-level execution task.
+ if (executionTask == null)
+ executionTask = in;
+ }
+
+ public void notifyTimeout(TestLogicTask inTask)
+ {
+ getTestVehicle().notifyTimeout(inTask);
+ }
+
+ public ProcessEngine getProcessEngine()
+ {
+ return getTestTask().getProcessEngine();
+ }
+
+ protected Throwable getFilterThrowable()
+ {
+ return filterThrowable;
+ }
+
+ void runTestLogic()
+ {
+ TestVehicle tv = getTestVehicle();
+ ProcessHandler ph = null;
+
+ // only get a process handler if this is not the 'local' test-vehicle.
+ // we should fix this, so that the default process handler we get here
+ // is actually 'tch'.
+ if (!tv.isLocal())
+ {
+ // this could be refactored so that at test-run-time, we always get
+ // the test-vehicle process name from the test-registry
+ if (runningWithGloballySetTestVehicle())
+ {
+ // here all we have to do is get the right
+ // process handler from the process registry
+ ph =
+ getTestTask()
+ .getProcessRegistry()
+ .getProcessEntryAssumeValidated(getTestVehicleProcessName())
+ .getProcessHandler();
+ }
+ else
+ {
+ // else we get the process handler we need from the process engine
+ ph = getProcessEngine().getProcessHandler(getTestVehicleProcessName());
+ }
+ }
+
+ filterThrowable = new Throwable();
+
+ try
+ {
+ if (!tv.isLocal())
+ getTestTask().logInternal(
+ "test-vehicle: "
+ + tv.getType()
+ + " test-vehicle-process: "
+ + ph.getName());
+ tv.run(ph, executionTask.getTestLogicTask());
+ }
+ catch (TaskTransportException ex)
+ {
+ executionTask.abortTest("transport failed with exception", ex);
+ }
+ catch (Exception ex)
+ {
+ executionTask.abortTest("test-logic failed with exception", ex);
+ }
+ }
+
+ public void validateTestVehicleType() throws NonfatalValidationException
+ {
+ // check that the test-vehicle we're going to use actually exists
+ if (getTestVehicle() == null)
+ {
+ throw new NonfatalValidationException(
+ ErrorMessageConstants.UNKNOWN_TEST_VEHICLE_ERROR_CODE,
+ ErrorMessageConstants.TESTVEHICLE,
+ testVehicleType);
+ }
+ }
+
+ public String getTestVehicleProcessName()
+ {
+ if (testVehicleProcessName == null)
+ {
+ // This checks if there is a default process, if not returns null.
+ // For example, if there are two processes mapped at both
+ // test and test-suite level, there is no default process.
+ testVehicleProcessName = getDefaultProcessName();
+ }
+ return testVehicleProcessName;
+ }
+
+ private TestVehicle getTestVehicle()
+ {
+ TestVehicleRegistry.Entry entry =
+ getTestVehicleRegistry().getTestVehicleEntry(testVehicleType);
+ if (entry == null)
+ return null;
+ return entry.getTestVehicle();
+ }
+
+ public void validateTestVehicleProcessName()
+ throws NonfatalValidationException
+ {
+ // don't care about process handler if running locally.
+ if (runningWithLocalTestVehicle())
+ return;
+
+ String processName = getTestVehicleProcessName();
+
+ if (processName == null)
+ {
+ throw new NonfatalValidationException(
+ ErrorMessageConstants.NO_DEFAULT_PROCESS_FOR_TEST_VEHICLE_ERROR_CODE);
+ }
+
+ // if we're not running with the global test vehicle set on the command
line, then we need to be
+ // able to get the test vehicle process handler from the process engine,
so check if that works
+ // see if getting the process engine from the test task will invalidate
+ // the test task
+
+ ProcessEngine processEngine = getProcessEngine();
+ try
+ {
+ processEngine.getProcessHandler(processName);
+ }
+ catch (ProcessManagementRuntimeException ex)
+ {
+ if (runningWithGloballySetTestVehicle() &&
isGloballySetTestVehicleProcessSameAsDeclared(processName))
+ {
+ // No need to throw an Exception if Same Process is declared globally.
+ return;
+ }
+ else
+ {
+ Map params = new HashMap(2);
+ params.put(ErrorMessageConstants.PROCESS, processName);
+ params.put(ErrorMessageConstants.TESTNAME, getTestTask().getName());
+ throw new NonfatalValidationException(
+
ErrorMessageConstants.NO_PROCESS_FOR_TEST_FOR_TEST_VEHICLE_ERROR_CODE,
+ params);
+ }
+ }
+ }
+
+ private boolean runningWithGloballySetTestVehicle()
+ {
+ return AntProperties.isGlobalTestVehicleSet();
+ }
+
+ private boolean isGloballySetTestVehicleProcessSameAsDeclared(String
inProcessName)
+ {
+ String globalProcessName = AntProperties.getGlobalTestVehicleProcess();
+ if (globalProcessName != null &&
globalProcessName.equals(inProcessName))
+ {
+ return true;
+ }
+ else
+ return false;
+ }
+
+ private boolean runningWithLocalTestVehicle()
+ {
+ TestVehicleRegistry.Entry entry =
+ getTestVehicleRegistry().getTestVehicleEntry(getTestVehicleType());
+ if (entry != null)
+ {
+ return entry.getTestVehicle().isLocal();
+ }
+ return false;
+ }
+
+ private TestVehicleRegistry getTestVehicleRegistry()
+ {
+ return TestVehicleRegistry.getRegistry();
+ }
+
+ private String getDefaultProcessName()
+ {
+ return getTestTask().getDefaultProcessName();
+ }
+}
Propchange:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExecutionTaskHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExecutionTaskValidationException.java
URL:
http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExecutionTaskValidationException.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
---
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExecutionTaskValidationException.java
(original)
+++
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExecutionTaskValidationException.java
Fri Aug 12 08:12:28 2005
@@ -1,22 +1,22 @@
-package org.apache.beehive.test.tools.tch.core;
-
-import org.apache.beehive.test.tools.tch.util.NestedException;
-
-public class ExecutionTaskValidationException
- extends NestedException
-{
- public ExecutionTaskValidationException(String message)
- {
- super(message);
- }
-
- public ExecutionTaskValidationException(Throwable th)
- {
- super(th);
- }
-
- public ExecutionTaskValidationException(Throwable th, String message)
- {
- super(th, message);
- }
-}
+package org.apache.beehive.test.tools.tch.core;
+
+import org.apache.beehive.test.tools.tch.util.NestedException;
+
+public class ExecutionTaskValidationException
+ extends NestedException
+{
+ public ExecutionTaskValidationException(String message)
+ {
+ super(message);
+ }
+
+ public ExecutionTaskValidationException(Throwable th)
+ {
+ super(th);
+ }
+
+ public ExecutionTaskValidationException(Throwable th, String message)
+ {
+ super(th, message);
+ }
+}
Propchange:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExecutionTaskValidationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExtendedAntTask.java
URL:
http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExtendedAntTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
---
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExtendedAntTask.java
(original)
+++
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExtendedAntTask.java
Fri Aug 12 08:12:28 2005
@@ -1,20 +1,20 @@
-package org.apache.beehive.test.tools.tch.core;
-
-import org.apache.tools.ant.Location;
-
-/**
- * If Ant would have a Task interface, this would extend from it.
- *
- */
-public interface ExtendedAntTask
-{
- //from the Ant task
- public void perform();
-
- public Location getLocation();
-
- public String getTaskName();
-
- // our extensions
- public CallingChain getCallingChain();
-}
+package org.apache.beehive.test.tools.tch.core;
+
+import org.apache.tools.ant.Location;
+
+/**
+ * If Ant would have a Task interface, this would extend from it.
+ *
+ */
+public interface ExtendedAntTask
+{
+ //from the Ant task
+ public void perform();
+
+ public Location getLocation();
+
+ public String getTaskName();
+
+ // our extensions
+ public CallingChain getCallingChain();
+}
Propchange:
beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/core/ExtendedAntTask.java
------------------------------------------------------------------------------
svn:eol-style = native
