From f1756e725fb7c76ccd3799148726c15deb93cd66 Mon Sep 17 00:00:00 2001 From: Stephane Bailliez Date: Sat, 2 Feb 2002 00:04:32 +0000 Subject: [PATCH] Moving to rjunit package git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271046 13f79535-47bb-0310-9956-ffa450edef68 --- .../{junit => rjunit}/RJUnitTaskTest.java | 10 ++++-- .../{junit => rjunit}/TestRunRecorder.java | 6 ++-- .../{junit => rjunit}/ZipScannerTest.java | 2 +- .../{junit => rjunit}/data/Test1.java | 2 +- .../{junit => rjunit}/data/build-test.xml | 0 .../formatter/FilterStackFormatterTest.java | 32 ++++++++++++------- .../formatter/FormatterRecorder.java | 6 ++-- .../remote/MessageReaderTest.java | 8 ++--- .../{junit => rjunit}/remote/TestCases.java | 4 +-- .../remote/TestRunnerTest.java | 10 +++--- 10 files changed, 47 insertions(+), 33 deletions(-) rename proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/RJUnitTaskTest.java (95%) rename proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/TestRunRecorder.java (95%) rename proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/ZipScannerTest.java (98%) rename proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/data/Test1.java (98%) rename proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/data/build-test.xml (100%) rename proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/formatter/FilterStackFormatterTest.java (84%) rename proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/formatter/FormatterRecorder.java (93%) rename proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/remote/MessageReaderTest.java (95%) rename proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/remote/TestCases.java (96%) rename proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/{junit => rjunit}/remote/TestRunnerTest.java (94%) diff --git a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/RJUnitTaskTest.java b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/RJUnitTaskTest.java similarity index 95% rename from proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/RJUnitTaskTest.java rename to proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/RJUnitTaskTest.java index dcef4c0bb..f63537ed4 100644 --- a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/RJUnitTaskTest.java +++ b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/RJUnitTaskTest.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import java.io.File; import java.net.URL; @@ -83,7 +83,11 @@ public class RJUnitTaskTest extends BuildFileTest { executeTarget("server-and-client"); System.out.println(getFullLog()); } - + public void testServerAndClient2(){ + executeTarget("server-and-client"); + System.out.println(getFullLog()); + } + /* public void testStandalone() throws Exception { // run server first.. Thread thread = new Thread(){ @@ -97,4 +101,6 @@ public class RJUnitTaskTest extends BuildFileTest { System.out.println(getFullLog()); thread.join(); } +*/ + } diff --git a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/TestRunRecorder.java b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/TestRunRecorder.java similarity index 95% rename from proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/TestRunRecorder.java rename to proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/TestRunRecorder.java index 6bb081898..577e2269b 100644 --- a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/TestRunRecorder.java +++ b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/TestRunRecorder.java @@ -51,13 +51,13 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import java.util.Properties; import java.util.Vector; -import org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunEvent; -import org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunListener; +import org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunEvent; +import org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunListener; /** * A TestRunListener that stores all events for later check. diff --git a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/ZipScannerTest.java b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/ZipScannerTest.java similarity index 98% rename from proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/ZipScannerTest.java rename to proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/ZipScannerTest.java index 3631f7b22..7f585dec1 100644 --- a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/ZipScannerTest.java +++ b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/ZipScannerTest.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit; +package org.apache.tools.ant.taskdefs.optional.rjunit; import java.io.File; diff --git a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/data/Test1.java b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/data/Test1.java similarity index 98% rename from proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/data/Test1.java rename to proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/data/Test1.java index 826c12477..75039f6ee 100644 --- a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/data/Test1.java +++ b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/data/Test1.java @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.data; +package org.apache.tools.ant.taskdefs.optional.rjunit.data; import junit.framework.TestCase; diff --git a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/data/build-test.xml b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/data/build-test.xml similarity index 100% rename from proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/data/build-test.xml rename to proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/data/build-test.xml diff --git a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/formatter/FilterStackFormatterTest.java b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/FilterStackFormatterTest.java similarity index 84% rename from proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/formatter/FilterStackFormatterTest.java rename to proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/FilterStackFormatterTest.java index 848779266..1affed39c 100644 --- a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/formatter/FilterStackFormatterTest.java +++ b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/FilterStackFormatterTest.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.formatter; +package org.apache.tools.ant.taskdefs.optional.rjunit.formatter; import java.io.OutputStream; import java.io.PrintWriter; @@ -61,6 +61,8 @@ import java.util.Properties; import junit.framework.TestCase; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.util.StringUtils; +import org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunEvent; /** * Not exactly rocket science test.. dooh ! @@ -110,43 +112,49 @@ public class FilterStackFormatterTest extends TestCase } public void testFiltering() { + /* FilterStackFormatter wrapper = new FilterStackFormatter(this); - wrapper.onTestFailed(0, "", trace); + Exception e = new Exception("xx"); + e.fillInStackTrace(); + TestRunEvent evt = new TestRunEvent(new Integer(1), TestRunEvent.TEST_ERROR, "xx"); + wrapper.onTestFailure(evt); + StringUtils.getStackTrace() assertEquals(expected, filteredTrace); + */ } // --- formatter implementation protected String filteredTrace; - public void onTestStarted(String testname) { + public void onTestStarted(TestRunEvent evt) { } - public void onTestEnded(String testname) { + public void onTestEnded(TestRunEvent evt) { } public void init(Properties props) throws BuildException { } - public void onTestFailed(int status, String testname, String trace) { + public void onTestFailure(TestRunEvent evt) { filteredTrace = trace; } - public void onTestStdOutLine(String testname, String line) { + public void onSuiteStarted(TestRunEvent evt) { } - public void onTestStdErrLine(String testname, String line) { + public void onSuiteEnded(TestRunEvent evt) { } - public void onTestRunSystemProperties(Properties props) { + public void onTestError(TestRunEvent evt) { } - public void onTestRunStarted(int testcount) { + public void onRunStarted(TestRunEvent evt) { } - public void onTestRunEnded(long elapsedtime) { + public void onRunEnded(TestRunEvent evt) { } - public void onTestRunStopped(long elapsedtime) { + public void onRunStopped(TestRunEvent evt) { } } diff --git a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/formatter/FormatterRecorder.java b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/FormatterRecorder.java similarity index 93% rename from proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/formatter/FormatterRecorder.java rename to proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/FormatterRecorder.java index 9d3302e30..a8b216a20 100644 --- a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/formatter/FormatterRecorder.java +++ b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/formatter/FormatterRecorder.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -51,12 +51,12 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.formatter; +package org.apache.tools.ant.taskdefs.optional.rjunit.formatter; import java.io.OutputStream; import java.util.Properties; -import org.apache.tools.ant.taskdefs.optional.junit.TestRunRecorder; +import org.apache.tools.ant.taskdefs.optional.rjunit.TestRunRecorder; import org.apache.tools.ant.BuildException; /** diff --git a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/remote/MessageReaderTest.java b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/remote/MessageReaderTest.java similarity index 95% rename from proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/remote/MessageReaderTest.java rename to proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/remote/MessageReaderTest.java index 3fe8eb538..dcf646c8c 100644 --- a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/remote/MessageReaderTest.java +++ b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/remote/MessageReaderTest.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.remote; +package org.apache.tools.ant.taskdefs.optional.rjunit.remote; import java.io.PrintWriter; import java.io.PipedOutputStream; @@ -62,8 +62,8 @@ import java.util.Properties; import junit.framework.TestCase; -import org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunListener; -import org.apache.tools.ant.taskdefs.optional.junit.TestRunRecorder; +import org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunListener; +import org.apache.tools.ant.taskdefs.optional.rjunit.TestRunRecorder; /** * Ensure that the Reader/Writer works fine. diff --git a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/remote/TestCases.java b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/remote/TestCases.java similarity index 96% rename from proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/remote/TestCases.java rename to proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/remote/TestCases.java index 450d251ba..8113677ce 100644 --- a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/remote/TestCases.java +++ b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/remote/TestCases.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.remote; +package org.apache.tools.ant.taskdefs.optional.rjunit.remote; import junit.framework.TestCase; import junit.framework.TestSuite; diff --git a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunnerTest.java b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/remote/TestRunnerTest.java similarity index 94% rename from proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunnerTest.java rename to proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/remote/TestRunnerTest.java index ee4d83460..3a6385b80 100644 --- a/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/remote/TestRunnerTest.java +++ b/proposal/sandbox/junit/src/testcases/org/apache/tools/ant/taskdefs/optional/rjunit/remote/TestRunnerTest.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2001 The Apache Software Foundation. All rights + * Copyright (c) 2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -51,7 +51,7 @@ * information on the Apache Software Foundation, please see * . */ -package org.apache.tools.ant.taskdefs.optional.junit.remote; +package org.apache.tools.ant.taskdefs.optional.rjunit.remote; import java.util.Vector; import java.util.Properties; @@ -60,9 +60,9 @@ import junit.framework.TestCase; import junit.framework.TestSuite; import junit.framework.TestListener; -import org.apache.tools.ant.taskdefs.optional.junit.formatter.PlainFormatter; -import org.apache.tools.ant.taskdefs.optional.junit.remote.TestRunListener; -import org.apache.tools.ant.taskdefs.optional.junit.TestRunRecorder; +import org.apache.tools.ant.taskdefs.optional.rjunit.formatter.PlainFormatter; +import org.apache.tools.ant.taskdefs.optional.rjunit.remote.TestRunListener; +import org.apache.tools.ant.taskdefs.optional.rjunit.TestRunRecorder; /** * TestCase for the test runner.