Author: chamikara
Date: Mon May 7 00:04:00 2007
New Revision: 535765
URL: http://svn.apache.org/viewvc?view=rev&rev=535765
Log:
Updates to TestCases
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/PropertyLoaderTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaClientTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaReportsTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/CreateSequenceRefusedInboundFaultTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTimedOutTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/RMScenariosTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/SerializableScenariosTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/versions/AddressingVersionTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/versions/RMVersionTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/versions/SOAPVersionTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/workers/ForceInboundDispatchTest.java
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/PropertyLoaderTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/PropertyLoaderTest.java?view=diff&rev=535765&r1=535764&r2=535765
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/PropertyLoaderTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/PropertyLoaderTest.java
Mon May 7 00:04:00 2007
@@ -30,10 +30,10 @@
SandeshaPolicyBean propertyBean = null;
public void setUp () {
- String fileName = "modules" + File.separator + "tests" +
File.separator + "test-resources" + File.separator + "sandesha2.properties";
+ String fileName = "target" + File.separator + "test-classes" +
File.separator + "sandesha2.properties";
File file= new File (fileName);
if (!file.exists()) {
- fail("'target/test-classes/sandesha2.properties' not
found");
+ fail("sandesha2.properties file was not found");
}
try {
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaClientTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaClientTest.java?view=diff&rev=535765&r1=535764&r2=535765
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaClientTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaClientTest.java
Mon May 7 00:04:00 2007
@@ -39,7 +39,7 @@
String server_repoPath = "target" + File.separator + "repos" +
File.separator + "server";
String server_axis2_xml = "target" + File.separator + "repos" +
File.separator + "server" + File.separator + "server_axis2.xml";
- private static boolean startedServer = false;
+ private boolean startedServer = false;
public SandeshaClientTest () {
super ("SandeshaClientTest");
@@ -57,8 +57,8 @@
/**
* Override the teardown processing
*/
- public void tearDown () {
-
+ public void tearDown () throws Exception {
+ super.tearDown();
}
public void testCreateSequenceWithOffer () throws Exception {
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaReportsTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaReportsTest.java?view=diff&rev=535765&r1=535764&r2=535765
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaReportsTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaReportsTest.java
Mon May 7 00:04:00 2007
@@ -35,7 +35,7 @@
public class SandeshaReportsTest extends SandeshaTestCase {
- private static boolean startedServer = false;
+ private boolean startedServer = false;
public SandeshaReportsTest () {
super ("SandeshaReportsTest");
@@ -55,8 +55,8 @@
/**
* Override the teardown processing
*/
- public void tearDown () {
-
+ public void tearDown () throws Exception {
+ super.tearDown();
}
public void testSequenceReports () throws Exception {
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java?view=diff&rev=535765&r1=535764&r2=535765
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/SandeshaTestCase.java
Mon May 7 00:04:00 2007
@@ -121,8 +121,9 @@
}
public void tearDown () throws Exception {
- if (httpServer!=null)
+ if (httpServer!=null) {
httpServer.stop();
+ }
Thread.sleep(300);
}
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/CreateSequenceRefusedInboundFaultTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/CreateSequenceRefusedInboundFaultTest.java?view=diff&rev=535765&r1=535764&r2=535765
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/CreateSequenceRefusedInboundFaultTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/CreateSequenceRefusedInboundFaultTest.java
Mon May 7 00:04:00 2007
@@ -34,7 +34,7 @@
public class CreateSequenceRefusedInboundFaultTest extends SandeshaTestCase {
- private static boolean startedServer = false;
+ private boolean startedServer = false;
public CreateSequenceRefusedInboundFaultTest() {
super("CreateSequenceRefusedInboundFaultTest");
@@ -51,8 +51,8 @@
}
}
- public void tearDown() {
-
+ public void tearDown()throws Exception {
+ super.tearDown();
}
/** Test removed for the moment as RM 1.0 faults are not processed by
the chain.
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java?view=diff&rev=535765&r1=535764&r2=535765
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTerminatedFaultTest.java
Mon May 7 00:04:00 2007
@@ -66,7 +66,7 @@
private static ConfigurationContext serverConfigContext;
- private static boolean serverStarted = false;
+ private boolean serverStarted = false;
public SequenceTerminatedFaultTest() {
super("SequenceTerminatedFaultTest");
@@ -80,7 +80,8 @@
serverStarted = true;
}
- public void tearDown () {
+ public void tearDown () throws Exception {
+ super.tearDown();
}
/**
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTimedOutTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTimedOutTest.java?view=diff&rev=535765&r1=535764&r2=535765
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTimedOutTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/faulttests/SequenceTimedOutTest.java
Mon May 7 00:04:00 2007
@@ -51,8 +51,8 @@
super.setUp();
}
- public void tearDown() {
-
+ public void tearDown() throws Exception {
+ super.tearDown();
}
/**
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/RMScenariosTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/RMScenariosTest.java?view=diff&rev=535765&r1=535764&r2=535765
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/RMScenariosTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/RMScenariosTest.java
Mon May 7 00:04:00 2007
@@ -40,8 +40,8 @@
public class RMScenariosTest extends SandeshaTestCase {
- private static boolean serverStarted = false;
- private static ConfigurationContext configContext = null;
+ private boolean serverStarted = false;
+ private ConfigurationContext configContext = null;
protected String to = "http://127.0.0.1:"; + serverPort +
"/axis2/services/RMSampleService";
@@ -72,31 +72,31 @@
/**
* Override the teardown processing
*/
- public void tearDown () {
-
+ public void tearDown () throws Exception {
+ super.tearDown();
}
public void testPing() throws Exception {
// Run a ping test with sync acks
- runPing(false);
+ runPing(false, false);
// Run a ping test with async acks
- runPing(true);
+ runPing(true, true);
}
public void testAsyncEcho() throws Exception {
// Test async echo with sync acks
Options clientOptions = new Options();
- runEcho(clientOptions, true, false, false,true);
+ runEcho(clientOptions, true, false, false,true,false);
// Test async echo with async acks
clientOptions = new Options();
- runEcho(clientOptions, true, true, false,true);
+ runEcho(clientOptions, true, true, false,true,false);
// Test async echo with async acks and offer
clientOptions = new Options();
clientOptions.setProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID,SandeshaUtil.getUUID());
- runEcho(clientOptions, true, true, false,true);
+ runEcho(clientOptions, true, true, false,true,true);
}
public void testSyncEcho() throws Exception {
@@ -104,20 +104,20 @@
Options clientOptions = new Options();
clientOptions.setProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID,SandeshaUtil.getUUID());
clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.v1_1);
- runEcho(clientOptions, false, false, true,true);
+ runEcho(clientOptions, false, false, true,true,false);
-// // Test sync echo with an offer, and the 1.0 spec. In this case
the offer is automatic
+ // Test sync echo with an offer, and the 1.0 spec. In this case
the offer is automatic
clientOptions = new Options();
clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.v1_0);
- runEcho(clientOptions, false, false, true,false);
-//
-// // Test sync echo with no offer, and the 1.1 spec
+ runEcho(clientOptions, false, false, true,false,false);
+
+ // Test sync echo with no offer, and the 1.1 spec
clientOptions = new Options();
clientOptions.setProperty(SandeshaClientConstants.RM_SPEC_VERSION,Sandesha2Constants.SPEC_VERSIONS.v1_1);
- runEcho(clientOptions, false, false, true,true);
+ runEcho(clientOptions, false, false, true,true,true);
}
- public void runPing(boolean asyncAcks) throws Exception {
+ public void runPing(boolean asyncAcks, boolean stopListener) throws
Exception {
Options clientOptions = new Options();
@@ -162,10 +162,14 @@
if(lastError != null) throw lastError;
+ if (stopListener)
+ configContext.getListenerManager().stop();
+
serviceClient.cleanup();
+
}
- public void runEcho(Options clientOptions, boolean asyncReply, boolean
asyncAcks, boolean explicitTermination, boolean checkInboundTermination) throws
Exception {
+ public void runEcho(Options clientOptions, boolean asyncReply, boolean
asyncAcks, boolean explicitTermination, boolean checkInboundTermination,
boolean stopListener) throws Exception {
String sequenceKey = SandeshaUtil.getUUID();
@@ -271,6 +275,9 @@
}
}
if(lastError != null) throw lastError;
+
+ if (stopListener)
+ configContext.getListenerManager().stop();
serviceClient.cleanup();
}
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/SerializableScenariosTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/SerializableScenariosTest.java?view=diff&rev=535765&r1=535764&r2=535765
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/SerializableScenariosTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/scenarios/SerializableScenariosTest.java
Mon May 7 00:04:00 2007
@@ -40,6 +40,6 @@
Boolean.TRUE.toString());
// Run the echo test
- runEcho(clientOptions, true, true, false, true);
+ runEcho(clientOptions, true, true, false, true,true);
}
}
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/versions/AddressingVersionTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/versions/AddressingVersionTest.java?view=diff&rev=535765&r1=535764&r2=535765
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/versions/AddressingVersionTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/versions/AddressingVersionTest.java
Mon May 7 00:04:00 2007
@@ -32,7 +32,7 @@
public class AddressingVersionTest extends SandeshaTestCase {
- private static boolean serverStarted = false;
+ private boolean serverStarted = false;
public AddressingVersionTest () {
super ("AddressingVersionTest");
@@ -50,8 +50,8 @@
/**
* Override the teardown processing
*/
- public void tearDown () {
-
+ public void tearDown () throws Exception {
+ super.tearDown();
}
public void testAddressingFinal() throws Exception {
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/versions/RMVersionTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/versions/RMVersionTest.java?view=diff&rev=535765&r1=535764&r2=535765
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/versions/RMVersionTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/versions/RMVersionTest.java
Mon May 7 00:04:00 2007
@@ -32,7 +32,7 @@
public class RMVersionTest extends SandeshaTestCase {
- private static boolean serverStarted = false;
+ private boolean serverStarted = false;
public RMVersionTest () {
super ("RMVersionTest");
@@ -50,8 +50,8 @@
/**
* Override the teardown processing
*/
- public void tearDown () {
-
+ public void tearDown () throws Exception {
+ super.tearDown();
}
public void testRMSubmission () throws Exception {
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/versions/SOAPVersionTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/versions/SOAPVersionTest.java?view=diff&rev=535765&r1=535764&r2=535765
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/versions/SOAPVersionTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/versions/SOAPVersionTest.java
Mon May 7 00:04:00 2007
@@ -33,7 +33,7 @@
public class SOAPVersionTest extends SandeshaTestCase {
- private static boolean serverStarted = false;
+ private boolean serverStarted = false;
public SOAPVersionTest () {
super ("SOAPVersionTest");
@@ -51,8 +51,8 @@
/**
* Override the teardown processing
*/
- public void tearDown () {
-
+ public void tearDown () throws Exception {
+ super.tearDown();
}
public void testSOAP11 () throws Exception {
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/workers/ForceInboundDispatchTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/workers/ForceInboundDispatchTest.java?view=diff&rev=535765&r1=535764&r2=535765
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/workers/ForceInboundDispatchTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/workers/ForceInboundDispatchTest.java
Mon May 7 00:04:00 2007
@@ -24,7 +24,7 @@
public class ForceInboundDispatchTest extends SandeshaTestCase {
private static ConfigurationContext serverConfigCtx = null;
- private static boolean startedServer = false;
+ private boolean startedServer = false;
public ForceInboundDispatchTest () {
super ("ForceDispatchTest");
@@ -42,8 +42,8 @@
/**
* Override the teardown processing
*/
- public void tearDown () {
-
+ public void tearDown () throws Exception {
+ super.tearDown();
}
public void testForceInvoke () throws AxisFault,InterruptedException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
