Author: veithen
Date: Mon Sep 22 13:07:20 2008
New Revision: 697966
URL: http://svn.apache.org/viewvc?rev=697966&view=rev
Log:
Transport test kit: make sure that TransportTestCase can be used without
TransportTestSuite.
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportTestSuite.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/TransportTestCase.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/util/LogManager.java
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportTestSuite.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportTestSuite.java?rev=697966&r1=697965&r2=697966&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportTestSuite.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportTestSuite.java
Mon Sep 22 13:07:20 2008
@@ -188,47 +188,42 @@
@Override
public void run(TestResult result) {
LogManager logManager = LogManager.INSTANCE;
- logManager.setTestSuite(this);
- try {
- if (!reuseResources) {
- super.run(result);
- } else {
- TestResourceSet resourceSet = null;
- for (Enumeration<?> e = tests(); e.hasMoreElements(); ) {
- Test test = (Test)e.nextElement();
- if (test instanceof TransportTestCase) {
- TransportTestCase ttest = (TransportTestCase)test;
- TestResourceSet newResourceSet =
ttest.getResourceSet();
- try {
- if (resourceSet == null) {
- logManager.setTestCase(ttest);
- newResourceSet.setUp();
- } else {
- TestResourceSetTransition transition = new
TestResourceSetTransition(resourceSet, newResourceSet);
- transition.tearDown();
- logManager.setTestCase(ttest);
- transition.setUp();
- }
- } catch (Throwable t) {
- result.addError(this, t);
- return;
- }
- resourceSet = newResourceSet;
- }
- runTest(test, result);
- }
- if (resourceSet != null) {
+ if (!reuseResources) {
+ super.run(result);
+ } else {
+ TestResourceSet resourceSet = null;
+ for (Enumeration<?> e = tests(); e.hasMoreElements(); ) {
+ Test test = (Test)e.nextElement();
+ if (test instanceof TransportTestCase) {
+ TransportTestCase ttest = (TransportTestCase)test;
+ TestResourceSet newResourceSet = ttest.getResourceSet();
try {
- resourceSet.tearDown();
- logManager.setTestCase(null);
+ if (resourceSet == null) {
+ logManager.setTestCase(ttest);
+ newResourceSet.setUp();
+ } else {
+ TestResourceSetTransition transition = new
TestResourceSetTransition(resourceSet, newResourceSet);
+ transition.tearDown();
+ logManager.setTestCase(ttest);
+ transition.setUp();
+ }
} catch (Throwable t) {
result.addError(this, t);
return;
}
+ resourceSet = newResourceSet;
+ }
+ runTest(test, result);
+ }
+ if (resourceSet != null) {
+ try {
+ resourceSet.tearDown();
+ logManager.setTestCase(null);
+ } catch (Throwable t) {
+ result.addError(this, t);
+ return;
}
}
- } finally {
- logManager.setTestSuite(null);
}
}
}
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/TransportTestCase.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/TransportTestCase.java?rev=697966&r1=697965&r2=697966&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/TransportTestCase.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/TransportTestCase.java
Mon Sep 22 13:07:20 2008
@@ -68,7 +68,11 @@
}
public String getId() {
- return id;
+ return id != null ? id : getName();
+ }
+
+ public Class<?> getTestClass() {
+ return testClass != null ? testClass : getClass();
}
@Override
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/util/LogManager.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/util/LogManager.java?rev=697966&r1=697965&r2=697966&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/util/LogManager.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/util/LogManager.java
Mon Sep 22 13:07:20 2008
@@ -28,14 +28,12 @@
import org.apache.log4j.Logger;
import org.apache.log4j.TTCCLayout;
import org.apache.log4j.WriterAppender;
-import org.apache.synapse.transport.testkit.TransportTestSuite;
import org.apache.synapse.transport.testkit.tests.TransportTestCase;
public class LogManager {
public static final LogManager INSTANCE = new LogManager();
private final File logDir;
- private File testSuiteDir;
private File testCaseDir;
private WriterAppender appender;
private int sequence;
@@ -44,29 +42,16 @@
logDir = new File("target" + File.separator + "testkit-logs");
}
- private void cleanUp() {
+ public void setTestCase(TransportTestCase testCase) throws IOException {
if (appender != null) {
Logger.getRootLogger().removeAppender(appender);
appender.close();
appender = null;
}
- }
-
- public void setTestSuite(TransportTestSuite suite) {
- cleanUp();
- if (suite == null) {
- testSuiteDir = null;
- } else {
- testSuiteDir = new File(logDir, suite.getTestClass().getName());
- }
- testCaseDir = null;
- }
-
- public void setTestCase(TransportTestCase testCase) throws IOException {
- cleanUp();
if (testCase == null) {
testCaseDir = null;
} else {
+ File testSuiteDir = new File(logDir,
testCase.getTestClass().getName());
testCaseDir = new File(testSuiteDir, testCase.getId());
sequence = 1;
appender = new WriterAppender(new TTCCLayout(),
createLog("debug"));
