You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/08/12 17:23:08 UTC

svn commit: r232310 [73/92] - in /beehive/trunk/controls/test: common/ infra/gtlf/ infra/gtlf/xsl/ infra/mantis/ infra/tch/ infra/tch/messages/ infra/tch/runtime/ infra/tch/schema/ perf/ perf/bin/ perf/cases/ perf/ctlsrc/org/apache/beehive/controls/per...

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ConstructorTimeoutTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ConstructorTimeoutTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ConstructorTimeoutTest.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ConstructorTimeoutTest.java Fri Aug 12 08:12:28 2005
@@ -1,58 +1,58 @@
-/*
- * Created on Oct 15, 2003
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-
-/**
- * Test to insure that when a test timeout happens in the constructor that the
- * correct number of results are logged
- */
-public class ConstructorTimeoutTest extends AutoTest
-{
-  public ConstructorTimeoutTest(TestContext tc)
-  {
-    super(tc);
-    try {
-    	Thread.sleep(10000);
-    }
-    catch (InterruptedException ie)
-    {
-			inform("sleep interrupted");
-    }
-  }
-
-  public boolean testSuccess()
-  {
-    // writing to stdout is useful for debugging if running remotely.
-    System.out.println("Running testSuccess");
-		try {
-			Thread.sleep(15000);
-		}
-		catch (InterruptedException ie)
-		{
-			inform("sleep interrupted");
-		}
-
-    return success("test succeeded");
-  }
-
-  public boolean testFailure()
-  {
-    // writing to stdout is useful for debugging if running remotely.
-    System.out.println("Running testFailure");
-		try {
-			Thread.sleep(20000);
-		}
-		catch (InterruptedException ie)
-		{
-			inform("sleep interrupted");
-		}
-    return failure("test failed");
-  }
-}
+/*
+ * Created on Oct 15, 2003
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - Java - Code Generation - Code and Comments
+ */
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+
+/**
+ * Test to insure that when a test timeout happens in the constructor that the
+ * correct number of results are logged
+ */
+public class ConstructorTimeoutTest extends AutoTest
+{
+  public ConstructorTimeoutTest(TestContext tc)
+  {
+    super(tc);
+    try {
+    	Thread.sleep(10000);
+    }
+    catch (InterruptedException ie)
+    {
+			inform("sleep interrupted");
+    }
+  }
+
+  public boolean testSuccess()
+  {
+    // writing to stdout is useful for debugging if running remotely.
+    System.out.println("Running testSuccess");
+		try {
+			Thread.sleep(15000);
+		}
+		catch (InterruptedException ie)
+		{
+			inform("sleep interrupted");
+		}
+
+    return success("test succeeded");
+  }
+
+  public boolean testFailure()
+  {
+    // writing to stdout is useful for debugging if running remotely.
+    System.out.println("Running testFailure");
+		try {
+			Thread.sleep(20000);
+		}
+		catch (InterruptedException ie)
+		{
+			inform("sleep interrupted");
+		}
+    return failure("test failed");
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ConstructorTimeoutTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EchoTestParameter.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EchoTestParameter.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EchoTestParameter.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EchoTestParameter.java Fri Aug 12 08:12:28 2005
@@ -1,23 +1,23 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-
-public class EchoTestParameter extends AutoTest
-{
-  public EchoTestParameter(TestContext tc)
-  {
-    super(tc);
-  }
-
-  public boolean testEcho()
-  {
-    String paramName = getTestContext().getParameters().getString("param-name");
-    inform(
-      "Param "
-        + paramName
-        + " = "
-        + getTestContext().getParameters().getString(paramName));
-    return success("done");
-  }
-}
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+
+public class EchoTestParameter extends AutoTest
+{
+  public EchoTestParameter(TestContext tc)
+  {
+    super(tc);
+  }
+
+  public boolean testEcho()
+  {
+    String paramName = getTestContext().getParameters().getString("param-name");
+    inform(
+      "Param "
+        + paramName
+        + " = "
+        + getTestContext().getParameters().getString(paramName));
+    return success("done");
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EchoTestParameter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EmptyFailureTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EmptyFailureTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EmptyFailureTest.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EmptyFailureTest.java Fri Aug 12 08:12:28 2005
@@ -1,17 +1,17 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-
-public class EmptyFailureTest extends AutoTest
-{
-  public EmptyFailureTest(TestContext tc)
-  {
-    super(tc);
-  }
-
-  public boolean testFailure()
-  {
-    return failure("test failed");
-  }
-}
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+
+public class EmptyFailureTest extends AutoTest
+{
+  public EmptyFailureTest(TestContext tc)
+  {
+    super(tc);
+  }
+
+  public boolean testFailure()
+  {
+    return failure("test failed");
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EmptyFailureTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EmptySuccessFailureTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EmptySuccessFailureTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EmptySuccessFailureTest.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EmptySuccessFailureTest.java Fri Aug 12 08:12:28 2005
@@ -1,24 +1,24 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-
-public class EmptySuccessFailureTest extends AutoTest
-{
-  public EmptySuccessFailureTest(TestContext tc)
-  {
-    super(tc);
-  }
-
-  public boolean testSuccess()
-  {
-    System.out.println("running empty success test");
-    return success("test succeeded");
-  }
-
-  public boolean testFailure()
-  {
-    System.out.println("running empty failure test");
-    return failure("test failed");
-  }
-}
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+
+public class EmptySuccessFailureTest extends AutoTest
+{
+  public EmptySuccessFailureTest(TestContext tc)
+  {
+    super(tc);
+  }
+
+  public boolean testSuccess()
+  {
+    System.out.println("running empty success test");
+    return success("test succeeded");
+  }
+
+  public boolean testFailure()
+  {
+    System.out.println("running empty failure test");
+    return failure("test failed");
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EmptySuccessFailureTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EmptySuccessTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EmptySuccessTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EmptySuccessTest.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EmptySuccessTest.java Fri Aug 12 08:12:28 2005
@@ -1,19 +1,19 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-
-public class EmptySuccessTest extends AutoTest
-{
-  public EmptySuccessTest(TestContext tc)
-  {
-    super(tc);
-  }
-
-  public boolean testSuccess()
-  {
-  	// writing to stdout is useful for debugging if running remotely.
-  	System.out.println("Running testSuccess");
-    return success("test succeeded");
-  }
-}
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+
+public class EmptySuccessTest extends AutoTest
+{
+  public EmptySuccessTest(TestContext tc)
+  {
+    super(tc);
+  }
+
+  public boolean testSuccess()
+  {
+  	// writing to stdout is useful for debugging if running remotely.
+  	System.out.println("Running testSuccess");
+    return success("test succeeded");
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/EmptySuccessTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ExceptionTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ExceptionTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ExceptionTest.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ExceptionTest.java Fri Aug 12 08:12:28 2005
@@ -1,35 +1,35 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-
-public class ExceptionTest extends AutoTest
-{
-  public ExceptionTest(TestContext tc)
-  {
-    super(tc);
-  }
-
-  public boolean testNestedException()
-  {
-    // writing to stdout is useful for debugging if running remotely.
-    System.out.println("Running testNestedException");
-    try
-    {
-      Exception e = new Exception("Inner Exception");
-      throw e;
-    }
-    catch (Exception ex)
-    {
-      throw new RuntimeException("Outer Exception", ex);
-    }
-  }
-
-  public boolean testException()
-  {
-    // writing to stdout is useful for debugging if running remotely.
-    System.out.println("Running testException");
-    throw new RuntimeException("test exception");
-    //return success("test succeeded");
-  }
-}
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+
+public class ExceptionTest extends AutoTest
+{
+  public ExceptionTest(TestContext tc)
+  {
+    super(tc);
+  }
+
+  public boolean testNestedException()
+  {
+    // writing to stdout is useful for debugging if running remotely.
+    System.out.println("Running testNestedException");
+    try
+    {
+      Exception e = new Exception("Inner Exception");
+      throw e;
+    }
+    catch (Exception ex)
+    {
+      throw new RuntimeException("Outer Exception", ex);
+    }
+  }
+
+  public boolean testException()
+  {
+    // writing to stdout is useful for debugging if running remotely.
+    System.out.println("Running testException");
+    throw new RuntimeException("test exception");
+    //return success("test succeeded");
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ExceptionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ExecProcessTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ExecProcessTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ExecProcessTest.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ExecProcessTest.java Fri Aug 12 08:12:28 2005
@@ -1,41 +1,41 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-import org.apache.beehive.test.tools.tch.core.process.ProcessHandler;
-import org.apache.beehive.test.tools.tch.extension.process.exec.ExecProcessHandler;
-
-public class ExecProcessTest
-  extends AutoTest {
-  
-  public ExecProcessTest(TestContext tc) {
-    super(tc);
-  } 
-
-  public boolean testGetProcessOutput()
-    throws Exception
-  {
-    ProcessHandler ph = 
-      getTestContext().getProcessEngine().getProcessHandler();
-    inform("Process name is:  " + ph.getName());
-    inform("Cmd is: " + ((ExecProcessHandler)ph).getCmd());
-    inform("home is: " + ((ExecProcessHandler)ph).getHome());
-    ph.startup(); 
-    inform("waiting for a second");
-    Thread.sleep(1000);
-    inform("Process output is: " + ((ExecProcessHandler)ph).getProcessOutput());
-    return failure("failing test on purpose, process output should also go to .debug-all file");
-  }
-
-  public boolean testKillProcess()
-    throws Exception
-  {
-    require("%GetProcessOutput");
-    ProcessHandler ph = 
-      getTestContext().getProcessEngine().getProcessHandler();
-    inform("Now shutting it down");
-    ph.shutdown();
-    return success("Was able to start process, wait, and shut it down");
-  }
-}
-
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+import org.apache.beehive.test.tools.tch.core.process.ProcessHandler;
+import org.apache.beehive.test.tools.tch.extension.process.exec.ExecProcessHandler;
+
+public class ExecProcessTest
+  extends AutoTest {
+  
+  public ExecProcessTest(TestContext tc) {
+    super(tc);
+  } 
+
+  public boolean testGetProcessOutput()
+    throws Exception
+  {
+    ProcessHandler ph = 
+      getTestContext().getProcessEngine().getProcessHandler();
+    inform("Process name is:  " + ph.getName());
+    inform("Cmd is: " + ((ExecProcessHandler)ph).getCmd());
+    inform("home is: " + ((ExecProcessHandler)ph).getHome());
+    ph.startup(); 
+    inform("waiting for a second");
+    Thread.sleep(1000);
+    inform("Process output is: " + ((ExecProcessHandler)ph).getProcessOutput());
+    return failure("failing test on purpose, process output should also go to .debug-all file");
+  }
+
+  public boolean testKillProcess()
+    throws Exception
+  {
+    require("%GetProcessOutput");
+    ProcessHandler ph = 
+      getTestContext().getProcessEngine().getProcessHandler();
+    inform("Now shutting it down");
+    ph.shutdown();
+    return success("Was able to start process, wait, and shut it down");
+  }
+}
+

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ExecProcessTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/KillUnmappedProcessTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/KillUnmappedProcessTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/KillUnmappedProcessTest.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/KillUnmappedProcessTest.java Fri Aug 12 08:12:28 2005
@@ -1,25 +1,25 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-import org.apache.beehive.test.tools.tch.core.process.ProcessHandler;
-
-/**
- * Just prints out the name of the process running the test.
- * Used for testing purposes.
- */
-public class KillUnmappedProcessTest
-  extends AutoTest 
-{  
-  public KillUnmappedProcessTest(TestContext tc) 
-  {
-    super(tc);
-  } 
-  
-  public boolean testTest()
-    throws Exception
-  {
-	  getTestContext().getProcessEngine().shutdownUnmappedProcesses();
-    return success("KillUnmappedProcessTest finished successfully");
-  }
-}
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+import org.apache.beehive.test.tools.tch.core.process.ProcessHandler;
+
+/**
+ * Just prints out the name of the process running the test.
+ * Used for testing purposes.
+ */
+public class KillUnmappedProcessTest
+  extends AutoTest 
+{  
+  public KillUnmappedProcessTest(TestContext tc) 
+  {
+    super(tc);
+  } 
+  
+  public boolean testTest()
+    throws Exception
+  {
+	  getTestContext().getProcessEngine().shutdownUnmappedProcesses();
+    return success("KillUnmappedProcessTest finished successfully");
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/KillUnmappedProcessTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ManySubtests.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ManySubtests.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ManySubtests.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ManySubtests.java Fri Aug 12 08:12:28 2005
@@ -1,42 +1,42 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-
-public class ManySubtests extends AutoTest
-{
-  public ManySubtests(TestContext in)
-  {
-    super(in);
-  }
-
-  public boolean testTiger()
-  {
-    return success("done");
-  }
-
-  public boolean testDog()
-  {
-    return success("done");
-  }
-
-  public boolean testCat()
-  {
-    return failure("done");
-  }
-
-  public boolean testWorm()
-  {
-    return success("done");
-  }
-
-  public boolean testBird()
-  {
-    return success("done");
-  }
-
-  public boolean testLion()
-  {
-    return success("done");
-  }
-}
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+
+public class ManySubtests extends AutoTest
+{
+  public ManySubtests(TestContext in)
+  {
+    super(in);
+  }
+
+  public boolean testTiger()
+  {
+    return success("done");
+  }
+
+  public boolean testDog()
+  {
+    return success("done");
+  }
+
+  public boolean testCat()
+  {
+    return failure("done");
+  }
+
+  public boolean testWorm()
+  {
+    return success("done");
+  }
+
+  public boolean testBird()
+  {
+    return success("done");
+  }
+
+  public boolean testLion()
+  {
+    return success("done");
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ManySubtests.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ParameterUsageTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ParameterUsageTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ParameterUsageTest.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ParameterUsageTest.java Fri Aug 12 08:12:28 2005
@@ -1,55 +1,55 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import java.util.Properties;
-import java.util.StringTokenizer;
-
-import org.apache.beehive.test.tools.tch.compose.Parameters;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-;
-
-/**
- * Test parameter usage
- */
-public class ParameterUsageTest extends AutoTest
-{
-  public ParameterUsageTest(TestContext tc)
-  {
-    super(tc);
-  }
-
-  public boolean testParams()
-  {
-    Parameters params = tc.getParameters();
-    inform("Here are the available params:  " + tc.getParameters());
-
-    String useparameters = null;
-    try
-    {
-      useparameters = params.getString("useonly");
-    }
-    catch (Exception ex)
-    {
-      // default behavior is useonly is not set is to use all parameters
-    }
-
-    // comma delimited list of parameter names for test to use
-    if (useparameters != null)
-    {
-      StringTokenizer st = new StringTokenizer(useparameters, ",");
-      while (st.hasMoreTokens())
-      {
-        String paramname = st.nextToken();
-        // the gettor will cause the parameter to get marked as used.
-        params.getString(paramname);
-      }
-    }
-    else
-    {
-      // This will cause all properties to get marked as being used
-      Properties props = params.getAll();
-    }
-
-    return success("ParameterUsageTest succeeded.");
-  }
-}
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import org.apache.beehive.test.tools.tch.compose.Parameters;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+;
+
+/**
+ * Test parameter usage
+ */
+public class ParameterUsageTest extends AutoTest
+{
+  public ParameterUsageTest(TestContext tc)
+  {
+    super(tc);
+  }
+
+  public boolean testParams()
+  {
+    Parameters params = tc.getParameters();
+    inform("Here are the available params:  " + tc.getParameters());
+
+    String useparameters = null;
+    try
+    {
+      useparameters = params.getString("useonly");
+    }
+    catch (Exception ex)
+    {
+      // default behavior is useonly is not set is to use all parameters
+    }
+
+    // comma delimited list of parameter names for test to use
+    if (useparameters != null)
+    {
+      StringTokenizer st = new StringTokenizer(useparameters, ",");
+      while (st.hasMoreTokens())
+      {
+        String paramname = st.nextToken();
+        // the gettor will cause the parameter to get marked as used.
+        params.getString(paramname);
+      }
+    }
+    else
+    {
+      // This will cause all properties to get marked as being used
+      Properties props = params.getAll();
+    }
+
+    return success("ParameterUsageTest succeeded.");
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ParameterUsageTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ProcessInfoTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ProcessInfoTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ProcessInfoTest.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ProcessInfoTest.java Fri Aug 12 08:12:28 2005
@@ -1,28 +1,28 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-import org.apache.beehive.test.tools.tch.core.process.ProcessHandler;
-
-/**
- * Just prints out the name of the process running the test.
- * Used for testing purposes.
- */
-public class ProcessInfoTest
-  extends AutoTest 
-{  
-  public ProcessInfoTest(TestContext tc) 
-  {
-    super(tc);
-  } 
-  
-  public boolean testTest()
-    throws Exception
-  {
-    ProcessHandler ph = 
-      getTestContext().getProcessEngine().getProcessHandler();
-    inform("The process handler is: " + ph.getName());
-    return success("ProcessInfoTest complete");
-  }
-}
-
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+import org.apache.beehive.test.tools.tch.core.process.ProcessHandler;
+
+/**
+ * Just prints out the name of the process running the test.
+ * Used for testing purposes.
+ */
+public class ProcessInfoTest
+  extends AutoTest 
+{  
+  public ProcessInfoTest(TestContext tc) 
+  {
+    super(tc);
+  } 
+  
+  public boolean testTest()
+    throws Exception
+  {
+    ProcessHandler ph = 
+      getTestContext().getProcessEngine().getProcessHandler();
+    inform("The process handler is: " + ph.getName());
+    return success("ProcessInfoTest complete");
+  }
+}
+

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ProcessInfoTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/SendTaskTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/SendTaskTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/SendTaskTest.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/SendTaskTest.java Fri Aug 12 08:12:28 2005
@@ -1,60 +1,60 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-import org.apache.beehive.test.tools.tch.core.process.ProcessHandler;
-import org.apache.beehive.test.tools.tch.extension.process.listener.RemoteListenerProcessHandler;
-import org.apache.beehive.test.tools.tch.task.BasicTaskContext;
-import org.apache.beehive.test.tools.tch.task.RemoteTaskRunner;
-import org.apache.beehive.test.tools.tch.task.TaskContext;
-import org.apache.beehive.test.tools.tch.task.AbstractTask;
-import org.apache.beehive.test.tools.tch.task.TaskException;
-
-public class SendTaskTest extends AutoTest
-{
-  public static final String KEY_TO_SET_KEY = "key-to-set",
-    VALUE_TO_SET_KEY = "value-to-set";
-
-  public SendTaskTest(TestContext tc)
-  {
-    super(tc);
-  }
-
-  public boolean testSendTask() throws Exception
-  {
-    ProcessHandler ph = getTestContext().getProcessEngine().getProcessHandler();
-    RemoteTaskRunner runner = ((RemoteListenerProcessHandler)ph).lookup();
-    TaskContext context = new BasicTaskContext();
-    context.put(KEY_TO_SET_KEY, "my-test-key");
-    context.put(VALUE_TO_SET_KEY, "my-test-value");
-    TaskContext returnContext =
-      runner.runTask(new ExampleTask("test-send-task"), context);
-    if (returnContext.get("my-test-key").equals("my-test-value"))
-      return success(
-        "Got back this TaskContext, as expected: " + returnContext);
-    return failure("Did not get back expected TaskContext: " + returnContext);
-  }
-
-  public static class ExampleTask
-    extends AbstractTask
-    implements java.io.Serializable
-  {
-    public ExampleTask(String in)
-    {
-      super(in);
-    }
-
-    public TaskContext runtask(TaskContext inContext) throws TaskException
-    {
-      TaskContext returnContext = new BasicTaskContext();
-      returnContext.put("foo-key", "foo-value");
-      if (inContext.get(SendTaskTest.KEY_TO_SET_KEY) != null
-        && inContext.get(SendTaskTest.VALUE_TO_SET_KEY) != null)
-        returnContext.put(
-          (String)inContext.get(SendTaskTest.KEY_TO_SET_KEY),
-          (String)inContext.get(SendTaskTest.VALUE_TO_SET_KEY));
-      return returnContext;
-    }
-  }
-
-}
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+import org.apache.beehive.test.tools.tch.core.process.ProcessHandler;
+import org.apache.beehive.test.tools.tch.extension.process.listener.RemoteListenerProcessHandler;
+import org.apache.beehive.test.tools.tch.task.BasicTaskContext;
+import org.apache.beehive.test.tools.tch.task.RemoteTaskRunner;
+import org.apache.beehive.test.tools.tch.task.TaskContext;
+import org.apache.beehive.test.tools.tch.task.AbstractTask;
+import org.apache.beehive.test.tools.tch.task.TaskException;
+
+public class SendTaskTest extends AutoTest
+{
+  public static final String KEY_TO_SET_KEY = "key-to-set",
+    VALUE_TO_SET_KEY = "value-to-set";
+
+  public SendTaskTest(TestContext tc)
+  {
+    super(tc);
+  }
+
+  public boolean testSendTask() throws Exception
+  {
+    ProcessHandler ph = getTestContext().getProcessEngine().getProcessHandler();
+    RemoteTaskRunner runner = ((RemoteListenerProcessHandler)ph).lookup();
+    TaskContext context = new BasicTaskContext();
+    context.put(KEY_TO_SET_KEY, "my-test-key");
+    context.put(VALUE_TO_SET_KEY, "my-test-value");
+    TaskContext returnContext =
+      runner.runTask(new ExampleTask("test-send-task"), context);
+    if (returnContext.get("my-test-key").equals("my-test-value"))
+      return success(
+        "Got back this TaskContext, as expected: " + returnContext);
+    return failure("Did not get back expected TaskContext: " + returnContext);
+  }
+
+  public static class ExampleTask
+    extends AbstractTask
+    implements java.io.Serializable
+  {
+    public ExampleTask(String in)
+    {
+      super(in);
+    }
+
+    public TaskContext runtask(TaskContext inContext) throws TaskException
+    {
+      TaskContext returnContext = new BasicTaskContext();
+      returnContext.put("foo-key", "foo-value");
+      if (inContext.get(SendTaskTest.KEY_TO_SET_KEY) != null
+        && inContext.get(SendTaskTest.VALUE_TO_SET_KEY) != null)
+        returnContext.put(
+          (String)inContext.get(SendTaskTest.KEY_TO_SET_KEY),
+          (String)inContext.get(SendTaskTest.VALUE_TO_SET_KEY));
+      return returnContext;
+    }
+  }
+
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/SendTaskTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/SimplePropResolveTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/SimplePropResolveTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/SimplePropResolveTest.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/SimplePropResolveTest.java Fri Aug 12 08:12:28 2005
@@ -1,21 +1,21 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-
-/**
- */
-public class SimplePropResolveTest extends AutoTest
-{
-  public SimplePropResolveTest(TestContext tc)
-  {
-    super(tc);
-  }
-
-  public boolean testPrintPropVal()
-  {
-    String paramName = getTestContext().getParameters().getString("param-name");
-    return success("The value of " + paramName + " is " +
-                   getTestContext().getParameters().getString(paramName));
-  }
-}
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+
+/**
+ */
+public class SimplePropResolveTest extends AutoTest
+{
+  public SimplePropResolveTest(TestContext tc)
+  {
+    super(tc);
+  }
+
+  public boolean testPrintPropVal()
+  {
+    String paramName = getTestContext().getParameters().getString("param-name");
+    return success("The value of " + paramName + " is " +
+                   getTestContext().getParameters().getString(paramName));
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/SimplePropResolveTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/StdoutLoggingFailureTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/StdoutLoggingFailureTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/StdoutLoggingFailureTest.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/StdoutLoggingFailureTest.java Fri Aug 12 08:12:28 2005
@@ -1,22 +1,22 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-
-public class StdoutLoggingFailureTest extends AutoTest
-{
-  public StdoutLoggingFailureTest(TestContext tc)
-  {
-    super(tc);
-  }
-
-  public boolean testFailure()
-  {
-    System.out.println("writing a line to stdout.");
-		inform("inform from test class");
-		System.out.print("writing another line ");
-		System.out.println("to stdout.");
-		inform("inform from test class");
-    return failure("test failed");
-  }
-}
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+
+public class StdoutLoggingFailureTest extends AutoTest
+{
+  public StdoutLoggingFailureTest(TestContext tc)
+  {
+    super(tc);
+  }
+
+  public boolean testFailure()
+  {
+    System.out.println("writing a line to stdout.");
+		inform("inform from test class");
+		System.out.print("writing another line ");
+		System.out.println("to stdout.");
+		inform("inform from test class");
+    return failure("test failed");
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/StdoutLoggingFailureTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/SystemExitTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/SystemExitTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/SystemExitTest.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/SystemExitTest.java Fri Aug 12 08:12:28 2005
@@ -1,19 +1,19 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-
-public class SystemExitTest extends AutoTest
-{
-  public SystemExitTest(TestContext inTc)
-  {
-    super(inTc);
-    System.exit(1);
-  }
-  
-  public boolean testNothing()
-  {
-  	return success("");
-  }
-
-}
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+
+public class SystemExitTest extends AutoTest
+{
+  public SystemExitTest(TestContext inTc)
+  {
+    super(inTc);
+    System.exit(1);
+  }
+  
+  public boolean testNothing()
+  {
+  	return success("");
+  }
+
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/SystemExitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/TestParamValue.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/TestParamValue.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/TestParamValue.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/TestParamValue.java Fri Aug 12 08:12:28 2005
@@ -1,23 +1,23 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-
-public class TestParamValue extends AutoTest
-{
-  public TestParamValue(TestContext tc)
-  {
-    super(tc);
-  }
-
-  public boolean testEqual()
-  {
-    String paramName = getTestContext().getParameters().getString("param-name");
-    String expectedValue = getTestContext().getParameters().getString("expected-value");
-    String realVal = getTestContext().getParameters().getString(paramName);
-    if (realVal.equals(expectedValue))
-      return success("param " + paramName + " has value " + expectedValue);
-    else
-      return failure("unexpected: param " + paramName + " has value " + realVal);
-  }
-}
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+
+public class TestParamValue extends AutoTest
+{
+  public TestParamValue(TestContext tc)
+  {
+    super(tc);
+  }
+
+  public boolean testEqual()
+  {
+    String paramName = getTestContext().getParameters().getString("param-name");
+    String expectedValue = getTestContext().getParameters().getString("expected-value");
+    String realVal = getTestContext().getParameters().getString(paramName);
+    if (realVal.equals(expectedValue))
+      return success("param " + paramName + " has value " + expectedValue);
+    else
+      return failure("unexpected: param " + paramName + " has value " + realVal);
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/TestParamValue.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/TimeoutTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/TimeoutTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/TimeoutTest.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/TimeoutTest.java Fri Aug 12 08:12:28 2005
@@ -1,86 +1,86 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-
-public class TimeoutTest
-  extends AutoTest {
-  
-  public TimeoutTest(TestContext tc) throws Exception {
-    super(tc);
-    System.out.println("out: Running TimeoutTest");
-	System.err.println("err: Running TimeoutTest");
-    if (getTestContext().getParameters().getBoolean("scratch", true))
-    {
-      // test with scratch
-      throw new RuntimeException("Forcing a scratch");
-    }
-	if (getTestContext().getParameters().getBoolean("timeout-in-cons", false))
-	{
-	  inform("Going to sleep 20 seconds in constructor");
-	  Thread.sleep(20000);
-	}
-  } 
-
-  public boolean testFirst() 
-  {
-    inform("First method");
-    return failure("Failed");
-  }
-
-  public boolean testSecond() 
-  {
-    inform("Second method");
-    return success("No problem");
-  }
-
-  public boolean testThird() 
-  {
-    inform("Third method");
-    return failure("Failed");
-  }
-  public boolean testForth() 
-  {
-    inform("Forth method");  
-    return failure("Failed");
-  }
-  public boolean testFith() 
-  {
-    inform("Fith method");
-    return success("No problem");
-  }
-  public boolean testSixth() 
-  {
-    inform("Sixth method");
-    return success("Ok");
-  }
-  public boolean testSeventh() 
-    throws Exception
-  {
-    inform("Seventh method");
-    inform("Going to sleep for 20 seconds");
-    Thread.sleep(200000);
-    return success("Cool");
-  }
-  public boolean testEigth() 
-  {
-    inform("Eigth method");
-    return success("Done");
-  }
-  public boolean testNinth() 
-    throws Exception
-  {
-    //require("Tenth");
-    inform("Ninth method");
-    inform("Going to sleep for 20 seconds");
-    Thread.sleep(200000);
-    return failure("Failed");
-  }
-  public boolean testTenth() 
-  {
-    //require("Seventh");
-    inform("Tenth method");
-    return success("Succeeded");
-  }
-}
-
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+
+public class TimeoutTest
+  extends AutoTest {
+  
+  public TimeoutTest(TestContext tc) throws Exception {
+    super(tc);
+    System.out.println("out: Running TimeoutTest");
+	System.err.println("err: Running TimeoutTest");
+    if (getTestContext().getParameters().getBoolean("scratch", true))
+    {
+      // test with scratch
+      throw new RuntimeException("Forcing a scratch");
+    }
+	if (getTestContext().getParameters().getBoolean("timeout-in-cons", false))
+	{
+	  inform("Going to sleep 20 seconds in constructor");
+	  Thread.sleep(20000);
+	}
+  } 
+
+  public boolean testFirst() 
+  {
+    inform("First method");
+    return failure("Failed");
+  }
+
+  public boolean testSecond() 
+  {
+    inform("Second method");
+    return success("No problem");
+  }
+
+  public boolean testThird() 
+  {
+    inform("Third method");
+    return failure("Failed");
+  }
+  public boolean testForth() 
+  {
+    inform("Forth method");  
+    return failure("Failed");
+  }
+  public boolean testFith() 
+  {
+    inform("Fith method");
+    return success("No problem");
+  }
+  public boolean testSixth() 
+  {
+    inform("Sixth method");
+    return success("Ok");
+  }
+  public boolean testSeventh() 
+    throws Exception
+  {
+    inform("Seventh method");
+    inform("Going to sleep for 20 seconds");
+    Thread.sleep(200000);
+    return success("Cool");
+  }
+  public boolean testEigth() 
+  {
+    inform("Eigth method");
+    return success("Done");
+  }
+  public boolean testNinth() 
+    throws Exception
+  {
+    //require("Tenth");
+    inform("Ninth method");
+    inform("Going to sleep for 20 seconds");
+    Thread.sleep(200000);
+    return failure("Failed");
+  }
+  public boolean testTenth() 
+  {
+    //require("Seventh");
+    inform("Tenth method");
+    return success("Succeeded");
+  }
+}
+

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/TimeoutTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/UtilityTest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/UtilityTest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/UtilityTest.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/UtilityTest.java Fri Aug 12 08:12:28 2005
@@ -1,21 +1,21 @@
-package org.apache.beehive.test.tools.tch.internal.test;
-
-import org.apache.beehive.test.tools.tch.compose.AutoTest;
-import org.apache.beehive.test.tools.tch.compose.TestContext;
-
-public class UtilityTest extends AutoTest
-{
-
-  public UtilityTest(TestContext tc)
-  {
-    super(tc);
-  }
-
-  public boolean utilityDummy()
-  {
-    tc.inform("Running utility method");
-    inform("Params are: " + getTestContext().getParameters());
-    inform("Process Engine: " + getTestContext().getProcessEngine());
-    return false;
-  }
-}
+package org.apache.beehive.test.tools.tch.internal.test;
+
+import org.apache.beehive.test.tools.tch.compose.AutoTest;
+import org.apache.beehive.test.tools.tch.compose.TestContext;
+
+public class UtilityTest extends AutoTest
+{
+
+  public UtilityTest(TestContext tc)
+  {
+    super(tc);
+  }
+
+  public boolean utilityDummy()
+  {
+    tc.inform("Running utility method");
+    inform("Params are: " + getTestContext().getParameters());
+    inform("Process Engine: " + getTestContext().getProcessEngine());
+    return false;
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/UtilityTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ant/DataDriverTask.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ant/DataDriverTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ant/DataDriverTask.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ant/DataDriverTask.java Fri Aug 12 08:12:28 2005
@@ -1,21 +1,21 @@
-package org.apache.beehive.test.tools.tch.internal.test.ant;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.apache.tools.ant.Task;
-
-public class DataDriverTask extends Task
-{
-  private Collection data = new ArrayList();
-  
-  public void addConfiguredParameter(ParameterContainer in)
-  {
-    data.add(in.getName());
-  }
-  
-  public void execute()
-  {
-  	log(data.toString());
-  }
-}
+package org.apache.beehive.test.tools.tch.internal.test.ant;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.tools.ant.Task;
+
+public class DataDriverTask extends Task
+{
+  private Collection data = new ArrayList();
+  
+  public void addConfiguredParameter(ParameterContainer in)
+  {
+    data.add(in.getName());
+  }
+  
+  public void execute()
+  {
+  	log(data.toString());
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ant/DataDriverTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ant/ParameterContainer.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ant/ParameterContainer.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ant/ParameterContainer.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ant/ParameterContainer.java Fri Aug 12 08:12:28 2005
@@ -1,21 +1,21 @@
-package org.apache.beehive.test.tools.tch.internal.test.ant;
-
-public class ParameterContainer
-{
-  private String name = null;
-
-  public void setName(String in)
-  {
-    name = in;
-  }
-
-  public void setValue(String in)
-  {
-
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-}
+package org.apache.beehive.test.tools.tch.internal.test.ant;
+
+public class ParameterContainer
+{
+  private String name = null;
+
+  public void setName(String in)
+  {
+    name = in;
+  }
+
+  public void setValue(String in)
+  {
+
+  }
+
+  public String getName()
+  {
+    return name;
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/internal/test/ant/ParameterContainer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/javatest.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/javatest.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/javatest.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/javatest.java Fri Aug 12 08:12:28 2005
@@ -1,16 +1,16 @@
-package org.apache.beehive.test.tools.tch;
-
-/**
- * Tch wrapper for Javatest
- * 
- * @version 1.0, Sept 3, 2001
- */
-public class javatest
-{
-  public static void main(String[] args) 
-    throws Exception
-  {
-    org.apache.beehive.test.tools.tch.extension.exectask.javatest.Main.main(args);
-  }
-  
-}
+package org.apache.beehive.test.tools.tch;
+
+/**
+ * Tch wrapper for Javatest
+ * 
+ * @version 1.0, Sept 3, 2001
+ */
+public class javatest
+{
+  public static void main(String[] args) 
+    throws Exception
+  {
+    org.apache.beehive.test.tools.tch.extension.exectask.javatest.Main.main(args);
+  }
+  
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/javatest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/ComparisonLogger.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/ComparisonLogger.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/ComparisonLogger.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/ComparisonLogger.java Fri Aug 12 08:12:28 2005
@@ -1,114 +1,114 @@
-package org.apache.beehive.test.tools.tch.logger;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.beehive.test.tools.tch.core.configuration.PropValueSubstitutionRegistry;
-import org.apache.beehive.test.tools.tch.core.remote.ProcessSummary;
-import org.apache.beehive.test.tools.tch.util.TchUtils;
-import org.apache.beehive.test.tools.tch.util.TestResult;
-
-/**
- * Writes to a special log file to use for comparison with another, for testing of framework
- * So, no dates/times, and no internal stacktraces, but everything else possible.
- */
-public class ComparisonLogger extends PrintWriterLoggerAdapter
-{
-  private TestStats stats = new TestStats();
-
-  public void logInit(Map m)
-  {
-    writer.print("Map passed into logInit():  " + m);
-  }
-
-  protected void logIndividualRes(TestResult res)
-  {
-    StringBuffer buf = new StringBuffer();
-
-    write(
-      "Log level as string:  ",
-      LoggerUtils.asLogLevelString(res.getType()),
-      buf);
-    write("Name", res.getName(), buf);
-    write("Custom path", res.getCustomPath(), buf);
-
-    write("Source path", filter(res.getSourcePath()), buf);
-    write("Calling chain: ", filter(res.getCallingChain()), buf);
-    write("Output message", filter(res.getOutputMessage()), buf);
-    if (res.getThrowable() != null)
-      write("Throwable",
-      //        TchUtils.getFilteredStackTrace(res.getThrowable()),
-      filter(TchUtils.getFilteredStackTrace(res.getStackTrace())), buf);
-    write("Command line", res.getCommandLine(), buf);
-    write("Verbose command line", res.getVerboseCommandLine(), buf);
-
-    Map used_params = res.getParameters();
-    if ((used_params != null) && !used_params.keySet().isEmpty())
-    {
-      StringBuffer sb = new StringBuffer();
-      Set entry_set = used_params.entrySet();
-      Iterator iter = entry_set.iterator();
-      while (iter.hasNext())
-      {
-        Map.Entry entry = (Map.Entry)iter.next();
-        sb.append((String)entry.getKey());
-        sb.append("=");
-        sb.append(filter((String)entry.getValue()));
-        sb.append("\n");
-      }
-      write("Used Parameters: ", sb.toString(), buf);
-    }
-
-    // Map processInfo = res.getProcessOutput();
-    Map processInfo = res.getProcessSummaryMap();
-    if (processInfo != null && !processInfo.keySet().isEmpty())
-    {
-      write(
-        "Mapped processes for this test are: ",
-        processInfo.keySet().toString(),
-        buf);
-      for (Iterator iter = processInfo.entrySet().iterator(); iter.hasNext();)
-      {
-        Map.Entry entry = (Map.Entry)iter.next();
-        String processName = (String)entry.getKey();
-        //String processOutput = (String)entry.getValue();
-        ProcessSummary processSummary = (ProcessSummary)entry.getValue();
-        if (processSummary == null)
-        {
-          write(
-            "Process output for " + processName,
-            NO_PROCESS_SUMMARY_MESSAGE,
-            buf);
-        }
-        else
-        {
-          String processOutput = processSummary.getSomeProcessOutput(-1);
-          write("Process output for " + processName, processOutput, buf);
-        }
-      }
-    }
-
-    writer.write(buf.toString());
-
-    stats.addStats(res);
-  }
-
-  private void write(String type, String value, StringBuffer sb)
-  {
-    if (value != null)
-      sb.append(type).append(":  ").append(value.trim()).append("\n\n");
-  }
-
-  private String filter(String in)
-  {
-    return PropValueSubstitutionRegistry.getInstance().filterString(in);
-  }
-
-  public void close()
-  {
-    writer.println();
-    writer.println(stats.details());
-    super.close();
-  }
-}
+package org.apache.beehive.test.tools.tch.logger;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.beehive.test.tools.tch.core.configuration.PropValueSubstitutionRegistry;
+import org.apache.beehive.test.tools.tch.core.remote.ProcessSummary;
+import org.apache.beehive.test.tools.tch.util.TchUtils;
+import org.apache.beehive.test.tools.tch.util.TestResult;
+
+/**
+ * Writes to a special log file to use for comparison with another, for testing of framework
+ * So, no dates/times, and no internal stacktraces, but everything else possible.
+ */
+public class ComparisonLogger extends PrintWriterLoggerAdapter
+{
+  private TestStats stats = new TestStats();
+
+  public void logInit(Map m)
+  {
+    writer.print("Map passed into logInit():  " + m);
+  }
+
+  protected void logIndividualRes(TestResult res)
+  {
+    StringBuffer buf = new StringBuffer();
+
+    write(
+      "Log level as string:  ",
+      LoggerUtils.asLogLevelString(res.getType()),
+      buf);
+    write("Name", res.getName(), buf);
+    write("Custom path", res.getCustomPath(), buf);
+
+    write("Source path", filter(res.getSourcePath()), buf);
+    write("Calling chain: ", filter(res.getCallingChain()), buf);
+    write("Output message", filter(res.getOutputMessage()), buf);
+    if (res.getThrowable() != null)
+      write("Throwable",
+      //        TchUtils.getFilteredStackTrace(res.getThrowable()),
+      filter(TchUtils.getFilteredStackTrace(res.getStackTrace())), buf);
+    write("Command line", res.getCommandLine(), buf);
+    write("Verbose command line", res.getVerboseCommandLine(), buf);
+
+    Map used_params = res.getParameters();
+    if ((used_params != null) && !used_params.keySet().isEmpty())
+    {
+      StringBuffer sb = new StringBuffer();
+      Set entry_set = used_params.entrySet();
+      Iterator iter = entry_set.iterator();
+      while (iter.hasNext())
+      {
+        Map.Entry entry = (Map.Entry)iter.next();
+        sb.append((String)entry.getKey());
+        sb.append("=");
+        sb.append(filter((String)entry.getValue()));
+        sb.append("\n");
+      }
+      write("Used Parameters: ", sb.toString(), buf);
+    }
+
+    // Map processInfo = res.getProcessOutput();
+    Map processInfo = res.getProcessSummaryMap();
+    if (processInfo != null && !processInfo.keySet().isEmpty())
+    {
+      write(
+        "Mapped processes for this test are: ",
+        processInfo.keySet().toString(),
+        buf);
+      for (Iterator iter = processInfo.entrySet().iterator(); iter.hasNext();)
+      {
+        Map.Entry entry = (Map.Entry)iter.next();
+        String processName = (String)entry.getKey();
+        //String processOutput = (String)entry.getValue();
+        ProcessSummary processSummary = (ProcessSummary)entry.getValue();
+        if (processSummary == null)
+        {
+          write(
+            "Process output for " + processName,
+            NO_PROCESS_SUMMARY_MESSAGE,
+            buf);
+        }
+        else
+        {
+          String processOutput = processSummary.getSomeProcessOutput(-1);
+          write("Process output for " + processName, processOutput, buf);
+        }
+      }
+    }
+
+    writer.write(buf.toString());
+
+    stats.addStats(res);
+  }
+
+  private void write(String type, String value, StringBuffer sb)
+  {
+    if (value != null)
+      sb.append(type).append(":  ").append(value.trim()).append("\n\n");
+  }
+
+  private String filter(String in)
+  {
+    return PropValueSubstitutionRegistry.getInstance().filterString(in);
+  }
+
+  public void close()
+  {
+    writer.println();
+    writer.println(stats.details());
+    super.close();
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/ComparisonLogger.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/CompositeLogger.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/CompositeLogger.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/CompositeLogger.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/CompositeLogger.java Fri Aug 12 08:12:28 2005
@@ -1,147 +1,147 @@
-package org.apache.beehive.test.tools.tch.logger;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.beehive.test.tools.tch.util.TchUtils;
-import org.apache.beehive.test.tools.tch.util.TestResult;
-
-/**
- * 
- * CompositeLogger. It holds multiple other loggers.
- * Each call to any of its methods marshalls the call to all
- * the loggers it holds.
- * <p>
- * 
- * Thus, all loggers added to it must be inited
- * @version 1.0, Mar 3, 2001
- */
-public class CompositeLogger implements Logger
-{
-  protected int minLogLevel;
-  private List loggers = new ArrayList();
-
-  public void setMinLogLevel(int logLevel)
-  {
-    this.minLogLevel = logLevel;
-    int sz = loggers.size();
-    for (int i = 0; i < sz; i++)
-    {
-      Logger lg = (Logger)loggers.get(i);
-      lg.setMinLogLevel(logLevel);
-    }
-  }
-
-  public void setDateFormat(SimpleDateFormat in)
-  {
-    int sz = loggers.size();
-    for (int i = 0; i < sz; i++)
-    {
-      Logger lg = (Logger)loggers.get(i);
-      lg.setDateFormat(in);
-    }
-  }
-
-  public void init(Map m)
-  {
-    int sz = loggers.size();
-    for (int i = 0; i < sz; i++)
-    {
-      Logger lg = (Logger)loggers.get(i);
-      lg.init(m);
-    }
-  }
-
-  /**
-   * If a logger has a problem while opening, we write a message
-   * to StdOut and remove the logger from the CompositeLogger
-   */
-  public void open() throws LoggerRuntimeException
-  {
-    for (Iterator itr = loggers.iterator(); itr.hasNext();)
-    {
-      Logger lg = (Logger)itr.next();
-      try
-      {
-        lg.open();
-      }
-      catch (Exception e)
-      {
-        TchUtils.log(
-          "Logger of class: '"
-            + lg.getClass().getName()
-            + "' not opened, and thus removed from CompositeLogger");
-        TchUtils.log(e);
-        itr.remove();
-      }
-    }
-  }
-
-  public void logInit(Map m)
-  {
-    int sz = loggers.size();
-    for (int i = 0; i < sz; i++)
-    {
-      Logger lg = (Logger)loggers.get(i);
-      lg.logInit(m);
-    }
-  }
-
-  /**
-   * If a logger has a problem while logging, we write a message
-   * to StdOut and remove the logger from the CompositeLogger
-   */
-  public void log(TestResult res)
-  {
-    for (Iterator itr = loggers.iterator(); itr.hasNext();)
-    {
-      Logger lg = (Logger)itr.next();
-      try
-      {
-        lg.log(res);
-      }
-      catch (Exception e)
-      {
-        TchUtils.log(
-          "Logger of class: '"
-            + lg.getClass().getName()
-            + "' threw exception during log, and thus removed from CompositeLogger");
-        TchUtils.log(e);
-        itr.remove();
-      }
-    }
-  }
-
-  public void close() throws LoggerRuntimeException
-  {
-    for (Iterator itr = loggers.iterator(); itr.hasNext();)
-    {
-      Logger lg = (Logger)itr.next();
-      try
-      {
-        lg.close();
-      }
-      catch (Exception e)
-      {
-        TchUtils.log(
-          "Logger of class: '" + lg.getClass().getName() + "' not closed");
-        TchUtils.log(e);
-        itr.remove();
-      }
-    }
-    loggers.clear();
-  }
-
-  public void add(Logger lg)
-  {
-    loggers.add(lg);
-  }
-
-  public void remove(Logger lg)
-  {
-    loggers.remove(lg);
-  }
-}
+package org.apache.beehive.test.tools.tch.logger;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.beehive.test.tools.tch.util.TchUtils;
+import org.apache.beehive.test.tools.tch.util.TestResult;
+
+/**
+ * 
+ * CompositeLogger. It holds multiple other loggers.
+ * Each call to any of its methods marshalls the call to all
+ * the loggers it holds.
+ * <p>
+ * 
+ * Thus, all loggers added to it must be inited
+ * @version 1.0, Mar 3, 2001
+ */
+public class CompositeLogger implements Logger
+{
+  protected int minLogLevel;
+  private List loggers = new ArrayList();
+
+  public void setMinLogLevel(int logLevel)
+  {
+    this.minLogLevel = logLevel;
+    int sz = loggers.size();
+    for (int i = 0; i < sz; i++)
+    {
+      Logger lg = (Logger)loggers.get(i);
+      lg.setMinLogLevel(logLevel);
+    }
+  }
+
+  public void setDateFormat(SimpleDateFormat in)
+  {
+    int sz = loggers.size();
+    for (int i = 0; i < sz; i++)
+    {
+      Logger lg = (Logger)loggers.get(i);
+      lg.setDateFormat(in);
+    }
+  }
+
+  public void init(Map m)
+  {
+    int sz = loggers.size();
+    for (int i = 0; i < sz; i++)
+    {
+      Logger lg = (Logger)loggers.get(i);
+      lg.init(m);
+    }
+  }
+
+  /**
+   * If a logger has a problem while opening, we write a message
+   * to StdOut and remove the logger from the CompositeLogger
+   */
+  public void open() throws LoggerRuntimeException
+  {
+    for (Iterator itr = loggers.iterator(); itr.hasNext();)
+    {
+      Logger lg = (Logger)itr.next();
+      try
+      {
+        lg.open();
+      }
+      catch (Exception e)
+      {
+        TchUtils.log(
+          "Logger of class: '"
+            + lg.getClass().getName()
+            + "' not opened, and thus removed from CompositeLogger");
+        TchUtils.log(e);
+        itr.remove();
+      }
+    }
+  }
+
+  public void logInit(Map m)
+  {
+    int sz = loggers.size();
+    for (int i = 0; i < sz; i++)
+    {
+      Logger lg = (Logger)loggers.get(i);
+      lg.logInit(m);
+    }
+  }
+
+  /**
+   * If a logger has a problem while logging, we write a message
+   * to StdOut and remove the logger from the CompositeLogger
+   */
+  public void log(TestResult res)
+  {
+    for (Iterator itr = loggers.iterator(); itr.hasNext();)
+    {
+      Logger lg = (Logger)itr.next();
+      try
+      {
+        lg.log(res);
+      }
+      catch (Exception e)
+      {
+        TchUtils.log(
+          "Logger of class: '"
+            + lg.getClass().getName()
+            + "' threw exception during log, and thus removed from CompositeLogger");
+        TchUtils.log(e);
+        itr.remove();
+      }
+    }
+  }
+
+  public void close() throws LoggerRuntimeException
+  {
+    for (Iterator itr = loggers.iterator(); itr.hasNext();)
+    {
+      Logger lg = (Logger)itr.next();
+      try
+      {
+        lg.close();
+      }
+      catch (Exception e)
+      {
+        TchUtils.log(
+          "Logger of class: '" + lg.getClass().getName() + "' not closed");
+        TchUtils.log(e);
+        itr.remove();
+      }
+    }
+    loggers.clear();
+  }
+
+  public void add(Logger lg)
+  {
+    loggers.add(lg);
+  }
+
+  public void remove(Logger lg)
+  {
+    loggers.remove(lg);
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/CompositeLogger.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/DebugLogger.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/DebugLogger.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/DebugLogger.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/DebugLogger.java Fri Aug 12 08:12:28 2005
@@ -1,125 +1,125 @@
-package org.apache.beehive.test.tools.tch.logger;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.apache.beehive.test.tools.tch.util.GeneralUtil;
-import org.apache.beehive.test.tools.tch.util.TestResult;
-
-/**
- * Writes to the debug file.
- */
-public class DebugLogger extends PrintWriterLoggerAdapter
-{
-  private static String RESULT_SEP =
-    "-====================================================================="
-      + sep
-      + sep;
-
-  private static String RESULT_ELEMENT_SEP =
-    sep + sep + "-------------------------------------------------" + sep + sep;
-
-  protected void logIndividualRes(TestResult res)
-  {
-    if (!res.isProblem())
-      return;
-
-    writer.println(RESULT_SEP);
-
-    String callingChain = res.getCallingChain();
-    String msg = GeneralUtil.StringOrNullToEmptyString(res.getOutputMessage());
-    String detailedMessage =
-      GeneralUtil.StringOrNullToEmptyString(res.getDetails());
-    String replicationInfo =
-      GeneralUtil.StringOrNullToEmptyString(res.getReplicationInfo());
-
-    StringBuffer buf = new StringBuffer();
-    buf
-      .append(logDateFormat.format(res.getTimeStamp()))
-      .append(" ")
-      .append(LoggerUtils.asLogLevelString(res.getType()).trim())
-      .append(" ")
-      .append(res.getName())
-      .append(" ");
-
-    if (res.getCustomPath() != null && res.getCustomPath().trim().length() > 0)
-    {
-      buf.append(res.getCustomPath()).append(" ");
-    }
-
-    if (res.getSourcePath() != null)
-    {
-      buf.append(res.getSourcePath()).append(" ");
-    }
-
-    if (callingChain != null)
-    {
-      buf.append(sep).append("Calling chain: ").append(callingChain).append(
-        " ");
-    }
-
-    if (msg.length() > 0)
-    {
-      buf
-        .append(sep)
-        .append(RESULT_ELEMENT_SEP)
-        .append("Output Message:")
-        .append(sep)
-        .append(msg)
-        .append(sep);
-    }
-
-    if (detailedMessage.length() > 0)
-    {
-      buf
-        .append(sep)
-        .append(RESULT_ELEMENT_SEP)
-        .append("Details:")
-        .append(sep)
-        .append(detailedMessage)
-        .append(sep);
-    }
-
-    writer.println(buf.toString());
-
-    if (res.hasThrowable())
-    {
-      writer.println(RESULT_ELEMENT_SEP);
-      writer.println("Throwable(s) reported:");
-      writer.println(res.getStackTraces());
-      writer.println(sep);
-    }
-
-    Map params = res.getParameters();
-    if (params != null && params.size() > 0)
-    {
-      writer.println(RESULT_ELEMENT_SEP);
-      writer.println(sep + "Used Parameters:");
-      for (Iterator itr = params.keySet().iterator(); itr.hasNext();)
-      {
-        Object key1 = itr.next();
-        Object value1 = params.get(key1);
-        writer.println(key1.toString() + " = " + value1.toString());
-      }
-    }
-
-    writer.println(RESULT_ELEMENT_SEP);
-    buf = new StringBuffer();
-    buf.append("To re-run test: ").append(sep);
-    if (replicationInfo.length() > 0)
-    {
-      buf.append(sep).append(replicationInfo).append(sep).append(sep);
-    }
-
-    buf.append(res.getCommandLine()).append(sep);
-    String winCmd =
-      GeneralUtil.StringOrNullToEmptyString(res.getWinCommandLine());
-    if (winCmd.length() > 0)
-    {
-      buf.append(sep).append("On Win:").append(sep).append(winCmd).append(sep);
-    }
-    writer.println(buf.toString());
-
-    writer.println(sep);
-  }
-}
+package org.apache.beehive.test.tools.tch.logger;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.beehive.test.tools.tch.util.GeneralUtil;
+import org.apache.beehive.test.tools.tch.util.TestResult;
+
+/**
+ * Writes to the debug file.
+ */
+public class DebugLogger extends PrintWriterLoggerAdapter
+{
+  private static String RESULT_SEP =
+    "-====================================================================="
+      + sep
+      + sep;
+
+  private static String RESULT_ELEMENT_SEP =
+    sep + sep + "-------------------------------------------------" + sep + sep;
+
+  protected void logIndividualRes(TestResult res)
+  {
+    if (!res.isProblem())
+      return;
+
+    writer.println(RESULT_SEP);
+
+    String callingChain = res.getCallingChain();
+    String msg = GeneralUtil.StringOrNullToEmptyString(res.getOutputMessage());
+    String detailedMessage =
+      GeneralUtil.StringOrNullToEmptyString(res.getDetails());
+    String replicationInfo =
+      GeneralUtil.StringOrNullToEmptyString(res.getReplicationInfo());
+
+    StringBuffer buf = new StringBuffer();
+    buf
+      .append(logDateFormat.format(res.getTimeStamp()))
+      .append(" ")
+      .append(LoggerUtils.asLogLevelString(res.getType()).trim())
+      .append(" ")
+      .append(res.getName())
+      .append(" ");
+
+    if (res.getCustomPath() != null && res.getCustomPath().trim().length() > 0)
+    {
+      buf.append(res.getCustomPath()).append(" ");
+    }
+
+    if (res.getSourcePath() != null)
+    {
+      buf.append(res.getSourcePath()).append(" ");
+    }
+
+    if (callingChain != null)
+    {
+      buf.append(sep).append("Calling chain: ").append(callingChain).append(
+        " ");
+    }
+
+    if (msg.length() > 0)
+    {
+      buf
+        .append(sep)
+        .append(RESULT_ELEMENT_SEP)
+        .append("Output Message:")
+        .append(sep)
+        .append(msg)
+        .append(sep);
+    }
+
+    if (detailedMessage.length() > 0)
+    {
+      buf
+        .append(sep)
+        .append(RESULT_ELEMENT_SEP)
+        .append("Details:")
+        .append(sep)
+        .append(detailedMessage)
+        .append(sep);
+    }
+
+    writer.println(buf.toString());
+
+    if (res.hasThrowable())
+    {
+      writer.println(RESULT_ELEMENT_SEP);
+      writer.println("Throwable(s) reported:");
+      writer.println(res.getStackTraces());
+      writer.println(sep);
+    }
+
+    Map params = res.getParameters();
+    if (params != null && params.size() > 0)
+    {
+      writer.println(RESULT_ELEMENT_SEP);
+      writer.println(sep + "Used Parameters:");
+      for (Iterator itr = params.keySet().iterator(); itr.hasNext();)
+      {
+        Object key1 = itr.next();
+        Object value1 = params.get(key1);
+        writer.println(key1.toString() + " = " + value1.toString());
+      }
+    }
+
+    writer.println(RESULT_ELEMENT_SEP);
+    buf = new StringBuffer();
+    buf.append("To re-run test: ").append(sep);
+    if (replicationInfo.length() > 0)
+    {
+      buf.append(sep).append(replicationInfo).append(sep).append(sep);
+    }
+
+    buf.append(res.getCommandLine()).append(sep);
+    String winCmd =
+      GeneralUtil.StringOrNullToEmptyString(res.getWinCommandLine());
+    if (winCmd.length() > 0)
+    {
+      buf.append(sep).append("On Win:").append(sep).append(winCmd).append(sep);
+    }
+    writer.println(buf.toString());
+
+    writer.println(sep);
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/DebugLogger.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/ExecutionOutputLogger.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/ExecutionOutputLogger.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/ExecutionOutputLogger.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/ExecutionOutputLogger.java Fri Aug 12 08:12:28 2005
@@ -1,135 +1,135 @@
-package org.apache.beehive.test.tools.tch.logger;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.apache.beehive.test.tools.tch.core.remote.ProcessSummary;
-import org.apache.beehive.test.tools.tch.util.TchConstants;
-import org.apache.beehive.test.tools.tch.util.TchUtils;
-import org.apache.beehive.test.tools.tch.util.GeneralUtil;
-import org.apache.beehive.test.tools.tch.util.TestResult;
-
-public class ExecutionOutputLogger extends PrintWriterLoggerAdapter
-{
-  private static final String LOG_ONLY_PROPBLEMS_PROP_NAME =
-    "log-only-problems";
-
-  private boolean logOnlyProblems = true;
-
-  public void init(Map m)
-  {
-    if (m.containsKey(LOG_ONLY_PROPBLEMS_PROP_NAME))
-    {
-      logOnlyProblems =
-        Boolean
-          .valueOf((String)m.get(LOG_ONLY_PROPBLEMS_PROP_NAME))
-          .booleanValue();
-    }
-  }
-
-  public void open()
-  {
-    writer.println("<html>");
-  }
-
-  protected void logIndividualRes(TestResult res)
-  {
-    if (!res.isOutcome())
-      return;
-      
-    if (logOnlyProblems && !res.isProblem())
-      return;
-
-    StringBuffer buf = new StringBuffer();
-    addHTMLAnchor(res, buf);
-    addResultOutput(res, buf);
-    writer.print(buf.toString());
-    writer.flush();
-  }
-
-  public void close()
-  {
-    writer.println("</html>");
-    super.close();
-  }
-
-  private void addResultOutput(TestResult res, StringBuffer buf)
-  {
-    buf.append("<xmp>").append(sep).append(sep);
-    buf.append(GeneralUtil.StringOrNullToEmptyString(res.getOutputMessage()));
-    buf.append(GeneralUtil.StringOrNullToEmptyString(res.getDetails()));
-    if (res.hasThrowable())
-    {
-      buf.append(sep).append(sep).append("Throwable(s) reported:").append(
-        sep).append(
-        sep);
-      buf.append(res.getStackTraces());
-    }
-
-    maybeAddProcessOutput(res, buf);
-
-    buf.append("</xmp>").append(sep);
-
-    // add a placeholder that may be used by post-run log processing
-    // to add more information
-    // since this is a comment, it won't be visible when viewing this file 
-    // in a browser
-
-    buf.append(sep).append("<!--@").append(res.getName()).append(
-      "@-->").append(
-      sep);
-
-    buf.append("<hr>").append(sep).append(sep);
-
-  }
-
-  private void maybeAddProcessOutput(TestResult res, StringBuffer buf)
-  {
-    Map processInfo = res.getProcessSummaryMap();
-    if (processInfo == null || processInfo.keySet().isEmpty())
-    {
-      return;
-    }
-    else
-    {
-      buf.append(sep).append(sep);
-      buf
-        .append("Mapped processes for this test are: ")
-        .append(processInfo.keySet())
-        .append(sep)
-        .append(sep);
-      for (Iterator iter = processInfo.entrySet().iterator(); iter.hasNext();)
-      {
-        Map.Entry entry = (Map.Entry)iter.next();
-        String processName = (String)entry.getKey();
-        ProcessSummary processSummary = (ProcessSummary)entry.getValue();
-        if (processSummary != null)
-        {
-          String processOutput = processSummary.getSomeProcessOutput(-1);
-          if (processOutput != null
-            && !TchConstants.NO_PROCESS_OUTPUT_MESSAGE.equals(
-              processSummary.getSomeProcessOutput(-1).trim()))
-          {
-            buf.append(processName).append(":").append(sep).append(sep);
-            buf.append(processOutput);
-          }
-        }
-        if (iter.hasNext())
-          buf.append(sep).append(sep);
-      }
-    }
-  }
-
-  private void addHTMLAnchor(TestResult res, StringBuffer buf)
-  {
-    buf
-      .append("<a name=\"")
-      .append(res.getName())
-      .append("\"><b>")
-      .append(res.getName())
-      .append("</b></a>")
-      .append(sep)
-      .append(sep);
-  }
-
-}
+package org.apache.beehive.test.tools.tch.logger;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.beehive.test.tools.tch.core.remote.ProcessSummary;
+import org.apache.beehive.test.tools.tch.util.TchConstants;
+import org.apache.beehive.test.tools.tch.util.TchUtils;
+import org.apache.beehive.test.tools.tch.util.GeneralUtil;
+import org.apache.beehive.test.tools.tch.util.TestResult;
+
+public class ExecutionOutputLogger extends PrintWriterLoggerAdapter
+{
+  private static final String LOG_ONLY_PROPBLEMS_PROP_NAME =
+    "log-only-problems";
+
+  private boolean logOnlyProblems = true;
+
+  public void init(Map m)
+  {
+    if (m.containsKey(LOG_ONLY_PROPBLEMS_PROP_NAME))
+    {
+      logOnlyProblems =
+        Boolean
+          .valueOf((String)m.get(LOG_ONLY_PROPBLEMS_PROP_NAME))
+          .booleanValue();
+    }
+  }
+
+  public void open()
+  {
+    writer.println("<html>");
+  }
+
+  protected void logIndividualRes(TestResult res)
+  {
+    if (!res.isOutcome())
+      return;
+      
+    if (logOnlyProblems && !res.isProblem())
+      return;
+
+    StringBuffer buf = new StringBuffer();
+    addHTMLAnchor(res, buf);
+    addResultOutput(res, buf);
+    writer.print(buf.toString());
+    writer.flush();
+  }
+
+  public void close()
+  {
+    writer.println("</html>");
+    super.close();
+  }
+
+  private void addResultOutput(TestResult res, StringBuffer buf)
+  {
+    buf.append("<xmp>").append(sep).append(sep);
+    buf.append(GeneralUtil.StringOrNullToEmptyString(res.getOutputMessage()));
+    buf.append(GeneralUtil.StringOrNullToEmptyString(res.getDetails()));
+    if (res.hasThrowable())
+    {
+      buf.append(sep).append(sep).append("Throwable(s) reported:").append(
+        sep).append(
+        sep);
+      buf.append(res.getStackTraces());
+    }
+
+    maybeAddProcessOutput(res, buf);
+
+    buf.append("</xmp>").append(sep);
+
+    // add a placeholder that may be used by post-run log processing
+    // to add more information
+    // since this is a comment, it won't be visible when viewing this file 
+    // in a browser
+
+    buf.append(sep).append("<!--@").append(res.getName()).append(
+      "@-->").append(
+      sep);
+
+    buf.append("<hr>").append(sep).append(sep);
+
+  }
+
+  private void maybeAddProcessOutput(TestResult res, StringBuffer buf)
+  {
+    Map processInfo = res.getProcessSummaryMap();
+    if (processInfo == null || processInfo.keySet().isEmpty())
+    {
+      return;
+    }
+    else
+    {
+      buf.append(sep).append(sep);
+      buf
+        .append("Mapped processes for this test are: ")
+        .append(processInfo.keySet())
+        .append(sep)
+        .append(sep);
+      for (Iterator iter = processInfo.entrySet().iterator(); iter.hasNext();)
+      {
+        Map.Entry entry = (Map.Entry)iter.next();
+        String processName = (String)entry.getKey();
+        ProcessSummary processSummary = (ProcessSummary)entry.getValue();
+        if (processSummary != null)
+        {
+          String processOutput = processSummary.getSomeProcessOutput(-1);
+          if (processOutput != null
+            && !TchConstants.NO_PROCESS_OUTPUT_MESSAGE.equals(
+              processSummary.getSomeProcessOutput(-1).trim()))
+          {
+            buf.append(processName).append(":").append(sep).append(sep);
+            buf.append(processOutput);
+          }
+        }
+        if (iter.hasNext())
+          buf.append(sep).append(sep);
+      }
+    }
+  }
+
+  private void addHTMLAnchor(TestResult res, StringBuffer buf)
+  {
+    buf
+      .append("<a name=\"")
+      .append(res.getName())
+      .append("\"><b>")
+      .append(res.getName())
+      .append("</b></a>")
+      .append(sep)
+      .append(sep);
+  }
+
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/logger/ExecutionOutputLogger.java
------------------------------------------------------------------------------
    svn:eol-style = native