From 80fda303e635f8f72f4858daff9a3be7bae00350 Mon Sep 17 00:00:00 2001 From: rfeng Date: Thu, 5 Mar 2009 06:03:09 +0000 Subject: Organize imports and format code git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@750325 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/test/ASM_0001_Client.java | 74 +++++----- .../src/main/java/test/ASM_0002_Client.java | 98 ++++++------- .../src/main/java/test/ASM_0003_Client.java | 98 ++++++------- .../sampleTest/src/main/java/test/Service1.java | 14 +- .../src/main/java/test/Service1Superset.java | 28 ++-- .../sampleTest/src/main/java/test/Service2.java | 14 +- .../src/main/java/test/TestException.java | 32 ++-- .../src/main/java/test/TestInvocation.java | 20 +-- .../src/main/java/test/service1Impl.java | 15 +- .../src/main/java/test/service1Impl2.java | 24 +-- .../src/main/java/test/service1Impl3.java | 32 ++-- .../src/main/java/test/service1Impl4.java | 34 +++-- .../src/main/java/test/service1Impl5.java | 23 +-- .../src/main/java/test/service1Impl6.java | 29 ++-- .../src/main/java/test/service1SupersetImpl.java | 21 +-- .../src/main/java/test/service2Impl.java | 15 +- .../src/test/java/client/ASM_0002_TestCase.java | 22 ++- .../src/test/java/client/ASM_0003_TestCase.java | 28 ++-- .../src/test/java/client/ASM_0004_TestCase.java | 22 ++- .../src/test/java/client/ASM_0005_TestCase.java | 22 ++- .../src/test/java/client/ASM_0006_TestCase.java | 22 ++- .../src/test/java/client/ASM_0007_TestCase.java | 22 ++- .../src/test/java/client/ASM_0008_TestCase.java | 22 ++- .../src/test/java/client/ASM_0009_TestCase.java | 22 ++- .../src/test/java/client/ASM_0010_TestCase.java | 22 ++- .../src/test/java/client/ASM_0011_TestCase.java | 22 ++- .../src/test/java/client/ASM_0012_TestCase.java | 24 ++- .../src/test/java/client/ASM_0013_TestCase.java | 22 ++- .../src/test/java/client/ASM_0014_TestCase.java | 22 ++- .../src/test/java/client/ASM_0015_TestCase.java | 22 ++- .../src/test/java/client/ASM_0016_TestCase.java | 22 ++- .../src/test/java/client/ASM_0017_TestCase.java | 22 ++- .../src/test/java/client/ASM_0018_TestCase.java | 22 ++- .../src/test/java/client/ASM_0019_TestCase.java | 22 ++- .../src/test/java/client/ASM_0020_TestCase.java | 22 ++- .../src/test/java/client/ASM_0021_TestCase.java | 22 ++- .../src/test/java/client/ASM_0022_TestCase.java | 22 ++- .../src/test/java/client/ASM_0023_TestCase.java | 22 ++- .../src/test/java/client/ASM_0024_TestCase.java | 22 ++- .../src/test/java/client/ASM_0025_TestCase.java | 22 ++- .../src/test/java/client/ASM_0026_TestCase.java | 22 ++- .../src/test/java/client/ASM_0027_TestCase.java | 22 ++- .../src/test/java/client/ASM_0028_TestCase.java | 22 ++- .../src/test/java/client/ASM_0029_TestCase.java | 22 ++- .../src/test/java/client/ASM_0030_TestCase.java | 22 ++- .../src/test/java/client/ASM_0031_TestCase.java | 22 ++- .../src/test/java/client/ASM_0032_TestCase.java | 23 ++- .../src/test/java/client/ASM_0033_TestCase.java | 23 ++- .../src/test/java/client/ASM_0034_TestCase.java | 23 ++- .../src/test/java/client/ASM_6001_TestCase.java | 22 ++- .../src/test/java/client/ASM_6002_TestCase.java | 22 ++- .../src/test/java/client/ASM_6003_TestCase.java | 22 ++- .../src/test/java/client/ASM_6004_TestCase.java | 22 ++- .../src/test/java/client/ASM_6005_TestCase.java | 22 ++- .../src/test/java/client/ASM_6006_TestCase.java | 22 ++- .../src/test/java/client/ASM_6007_TestCase.java | 22 ++- .../src/test/java/client/ASM_6008_TestCase.java | 22 ++- .../src/test/java/client/ASM_6009_TestCase.java | 22 ++- .../src/test/java/client/ASM_6010_TestCase.java | 22 ++- .../src/test/java/client/ASM_6011_TestCase.java | 22 ++- .../src/test/java/client/ASM_6012_TestCase.java | 22 ++- .../src/test/java/client/ASM_6013_TestCase.java | 22 ++- .../src/test/java/client/BaseJAXWSTestCase.java | 161 +++++++++++---------- .../src/test/java/client/BaseTestCase.java | 95 ++++++------ .../src/test/java/client/TestConfiguration.java | 63 +++++--- .../src/test/java/testClient/InvokeTest.java | 7 +- .../test/java/testClient/InvokeTestResponse.java | 7 +- .../src/test/java/testClient/ObjectFactory.java | 1 - .../src/test/java/testClient/TestException.java | 5 +- .../java/testClient/TestException_Exception.java | 5 +- .../src/test/java/testClient/TestInvocation.java | 12 +- .../java/testClient/TestInvocationService.java | 10 +- .../src/test/java/testClient/package-info.java | 1 + 73 files changed, 948 insertions(+), 1013 deletions(-) (limited to 'java/sca/stest/sampleTest/src') diff --git a/java/sca/stest/sampleTest/src/main/java/test/ASM_0001_Client.java b/java/sca/stest/sampleTest/src/main/java/test/ASM_0001_Client.java index bbe76aef62..dff88ce8ca 100644 --- a/java/sca/stest/sampleTest/src/main/java/test/ASM_0001_Client.java +++ b/java/sca/stest/sampleTest/src/main/java/test/ASM_0001_Client.java @@ -20,8 +20,6 @@ package test; import org.oasisopen.sca.annotation.Service; -import test.TestInvocation; - /** * Basic test initiation class * @author MikeEdwards @@ -29,41 +27,41 @@ import test.TestInvocation; */ @Service(TestInvocation.class) public class ASM_0001_Client implements TestInvocation { - - private String testName = "ASM_0001"; - - /** - * This method is offered as a service and is - * invoked by the test client to run the test - */ - public String invokeTest( String input ) throws TestException { - String response = null; - - response = runTest( input ); - - return response; - } // end method invokeTest - - /** - * This method actually runs the test - and is subclassed by classes that run other tests. - * @param input - an input string - * @return - a response string = "ASM_0001 inputString invoked ok"; - * - */ - public String runTest( String input ){ - String response = null; - - response = testName + " " + input + " invoked ok"; - - return response; - } // end method runTest - - /** - * Sets the name of the test - * @param name - the test name - */ - protected void setTestName( String name ) { - testName = name; - } + + private String testName = "ASM_0001"; + + /** + * This method is offered as a service and is + * invoked by the test client to run the test + */ + public String invokeTest(String input) throws TestException { + String response = null; + + response = runTest(input); + + return response; + } // end method invokeTest + + /** + * This method actually runs the test - and is subclassed by classes that run other tests. + * @param input - an input string + * @return - a response string = "ASM_0001 inputString invoked ok"; + * + */ + public String runTest(String input) { + String response = null; + + response = testName + " " + input + " invoked ok"; + + return response; + } // end method runTest + + /** + * Sets the name of the test + * @param name - the test name + */ + protected void setTestName(String name) { + testName = name; + } } // diff --git a/java/sca/stest/sampleTest/src/main/java/test/ASM_0002_Client.java b/java/sca/stest/sampleTest/src/main/java/test/ASM_0002_Client.java index 156f93bb1e..673dde9590 100644 --- a/java/sca/stest/sampleTest/src/main/java/test/ASM_0002_Client.java +++ b/java/sca/stest/sampleTest/src/main/java/test/ASM_0002_Client.java @@ -18,11 +18,9 @@ */ package test; -import org.oasisopen.sca.annotation.Service; -import org.oasisopen.sca.annotation.Reference; import org.oasisopen.sca.annotation.Property; - -import test.TestInvocation; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * Test initiation class with a single reference of multiplicity 1..1 @@ -31,50 +29,52 @@ import test.TestInvocation; */ @Service(TestInvocation.class) public class ASM_0002_Client implements TestInvocation { - - @Property - public String testName = "ASM_xxxx"; - - @Reference - public Service1 reference1; - - /** - * This method is offered as a service and is - * invoked by the test client to run the test - */ - public String invokeTest( String input ) throws TestException { - String response = null; - - try { - response = runTest( input ); - } catch( Exception e ) { - throw new TestException("Test service got an exception during execution: " + e.getClass().getName()+ " " + e.getMessage() ); - } // end try - return response; - } // end method invokeTest - - /** - * This method actually runs the test - and is subclassed by classes that run other tests. - * @param input - an input string - * @return - a response string = "ASM_0001 inputString invoked ok"; - * - */ - public String runTest( String input ){ - String response = null; - - String response1 = reference1.operation1(input); - - response = testName + " " + input + " " + response1; - - return response; - } // end method runTest - - /** - * Sets the name of the test - * @param name - the test name - */ - protected void setTestName( String name ) { - testName = name; - } + + @Property + public String testName = "ASM_xxxx"; + + @Reference + public Service1 reference1; + + /** + * This method is offered as a service and is + * invoked by the test client to run the test + */ + public String invokeTest(String input) throws TestException { + String response = null; + + try { + response = runTest(input); + } catch (Exception e) { + throw new TestException("Test service got an exception during execution: " + e.getClass().getName() + + " " + + e.getMessage()); + } // end try + return response; + } // end method invokeTest + + /** + * This method actually runs the test - and is subclassed by classes that run other tests. + * @param input - an input string + * @return - a response string = "ASM_0001 inputString invoked ok"; + * + */ + public String runTest(String input) { + String response = null; + + String response1 = reference1.operation1(input); + + response = testName + " " + input + " " + response1; + + return response; + } // end method runTest + + /** + * Sets the name of the test + * @param name - the test name + */ + protected void setTestName(String name) { + testName = name; + } } // diff --git a/java/sca/stest/sampleTest/src/main/java/test/ASM_0003_Client.java b/java/sca/stest/sampleTest/src/main/java/test/ASM_0003_Client.java index 7a8369644f..f6f4f1ccb8 100644 --- a/java/sca/stest/sampleTest/src/main/java/test/ASM_0003_Client.java +++ b/java/sca/stest/sampleTest/src/main/java/test/ASM_0003_Client.java @@ -18,14 +18,12 @@ */ package test; -import org.oasisopen.sca.annotation.Service; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Property; - -import test.TestInvocation; - import java.util.List; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; + /** * Basic test initiation class * @author MikeEdwards @@ -33,49 +31,49 @@ import java.util.List; */ @Service(TestInvocation.class) public class ASM_0003_Client implements TestInvocation { - - @Property - public String testName = "ASM_xxxx"; - - @Reference - public List reference1; - - /** - * This method is offered as a service and is - * invoked by the test client to run the test - */ - public String invokeTest( String input ) throws TestException { - String response = null; - - response = runTest( input ); - - return response; - } // end method invokeTest - - /** - * This method actually runs the test - and is subclassed by classes that run other tests. - * @param input - an input string - * @return - a response string = "ASM_0001 inputString invoked ok"; - * - */ - public String runTest( String input ){ - String response = ""; - - for( Service1 reference : reference1 ) { - response += reference.operation1(input); - } // end for - - response = testName + " " + input + " " + response; - - return response; - } // end method runTest - - /** - * Sets the name of the test - * @param name - the test name - */ - protected void setTestName( String name ) { - testName = name; - } + + @Property + public String testName = "ASM_xxxx"; + + @Reference + public List reference1; + + /** + * This method is offered as a service and is + * invoked by the test client to run the test + */ + public String invokeTest(String input) throws TestException { + String response = null; + + response = runTest(input); + + return response; + } // end method invokeTest + + /** + * This method actually runs the test - and is subclassed by classes that run other tests. + * @param input - an input string + * @return - a response string = "ASM_0001 inputString invoked ok"; + * + */ + public String runTest(String input) { + String response = ""; + + for (Service1 reference : reference1) { + response += reference.operation1(input); + } // end for + + response = testName + " " + input + " " + response; + + return response; + } // end method runTest + + /** + * Sets the name of the test + * @param name - the test name + */ + protected void setTestName(String name) { + testName = name; + } } // diff --git a/java/sca/stest/sampleTest/src/main/java/test/Service1.java b/java/sca/stest/sampleTest/src/main/java/test/Service1.java index ad654e4a3f..713fa40563 100644 --- a/java/sca/stest/sampleTest/src/main/java/test/Service1.java +++ b/java/sca/stest/sampleTest/src/main/java/test/Service1.java @@ -28,12 +28,12 @@ import org.oasisopen.sca.annotation.Remotable; */ @Remotable public interface Service1 { - - /** - * Method for invoking testcase service - * @param input - input parameter(s) as a String - * @return - output data as a String - */ - public String operation1( String input ); + + /** + * Method for invoking testcase service + * @param input - input parameter(s) as a String + * @return - output data as a String + */ + public String operation1(String input); } diff --git a/java/sca/stest/sampleTest/src/main/java/test/Service1Superset.java b/java/sca/stest/sampleTest/src/main/java/test/Service1Superset.java index 54a283a1a7..7d3a2f2e9f 100644 --- a/java/sca/stest/sampleTest/src/main/java/test/Service1Superset.java +++ b/java/sca/stest/sampleTest/src/main/java/test/Service1Superset.java @@ -27,19 +27,19 @@ import org.oasisopen.sca.annotation.Remotable; @Remotable public interface Service1Superset { - - /** - * Method for invoking testcase service - * @param input - input parameter(s) as a String - * @return - output data as a String - */ - public String operation1( String input ); - - /** - * A second method for invoking a testcase service - * @param input - input parameter(s) as a String - * @return - output data as a String - */ - public String operation2( String input ); + + /** + * Method for invoking testcase service + * @param input - input parameter(s) as a String + * @return - output data as a String + */ + public String operation1(String input); + + /** + * A second method for invoking a testcase service + * @param input - input parameter(s) as a String + * @return - output data as a String + */ + public String operation2(String input); } diff --git a/java/sca/stest/sampleTest/src/main/java/test/Service2.java b/java/sca/stest/sampleTest/src/main/java/test/Service2.java index 15bcb9481c..f834a4fbf1 100644 --- a/java/sca/stest/sampleTest/src/main/java/test/Service2.java +++ b/java/sca/stest/sampleTest/src/main/java/test/Service2.java @@ -24,12 +24,12 @@ package test; * */ public interface Service2 { - - /** - * Method for invoking testcase service - * @param input - input parameter(s) as a String - * @return - output data as a String - */ - public int operation2( int input ); + + /** + * Method for invoking testcase service + * @param input - input parameter(s) as a String + * @return - output data as a String + */ + public int operation2(int input); } diff --git a/java/sca/stest/sampleTest/src/main/java/test/TestException.java b/java/sca/stest/sampleTest/src/main/java/test/TestException.java index 6238a5c24b..158c5f4522 100644 --- a/java/sca/stest/sampleTest/src/main/java/test/TestException.java +++ b/java/sca/stest/sampleTest/src/main/java/test/TestException.java @@ -23,17 +23,25 @@ package test; */ public class TestException extends Exception { - /** - * Required serialVersionUID field - */ - private static final long serialVersionUID = -6978058912756564824L; - - public TestException() { super(); }; - - public TestException( String msg ) { super( msg ); }; - - public TestException( String msg, Throwable cause ) { super( msg, cause); }; - - public TestException( Throwable cause ) { super( cause ); }; + /** + * Required serialVersionUID field + */ + private static final long serialVersionUID = -6978058912756564824L; + + public TestException() { + super(); + }; + + public TestException(String msg) { + super(msg); + }; + + public TestException(String msg, Throwable cause) { + super(msg, cause); + }; + + public TestException(Throwable cause) { + super(cause); + }; } diff --git a/java/sca/stest/sampleTest/src/main/java/test/TestInvocation.java b/java/sca/stest/sampleTest/src/main/java/test/TestInvocation.java index ee42e0fe4e..e5d781095f 100644 --- a/java/sca/stest/sampleTest/src/main/java/test/TestInvocation.java +++ b/java/sca/stest/sampleTest/src/main/java/test/TestInvocation.java @@ -18,8 +18,8 @@ */ package test; -import javax.jws.WebService; import javax.jws.WebMethod; + import org.oasisopen.sca.annotation.Remotable; /** @@ -29,14 +29,14 @@ import org.oasisopen.sca.annotation.Remotable; */ @Remotable public interface TestInvocation { - - /** - * Method for invoking testcase - * @param input - input parameter(s) as a String - * @return - output data as a String - * @throws - a TestException is thrown in cases where the test service fails internally - */ - @WebMethod - public String invokeTest( String input ) throws TestException ; + + /** + * Method for invoking testcase + * @param input - input parameter(s) as a String + * @return - output data as a String + * @throws - a TestException is thrown in cases where the test service fails internally + */ + @WebMethod + public String invokeTest(String input) throws TestException; } diff --git a/java/sca/stest/sampleTest/src/main/java/test/service1Impl.java b/java/sca/stest/sampleTest/src/main/java/test/service1Impl.java index ff81bd5d54..a505f895a2 100644 --- a/java/sca/stest/sampleTest/src/main/java/test/service1Impl.java +++ b/java/sca/stest/sampleTest/src/main/java/test/service1Impl.java @@ -18,7 +18,8 @@ */ package test; -import org.oasisopen.sca.annotation.*; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; /** * Simple Java component implementation for business interface Service1 @@ -27,12 +28,12 @@ import org.oasisopen.sca.annotation.*; */ @Service(Service1.class) public class service1Impl implements Service1 { - - @Property - public String serviceName = "service1"; - public String operation1(String input) { - return serviceName + " operation1 invoked"; - } + @Property + public String serviceName = "service1"; + + public String operation1(String input) { + return serviceName + " operation1 invoked"; + } } diff --git a/java/sca/stest/sampleTest/src/main/java/test/service1Impl2.java b/java/sca/stest/sampleTest/src/main/java/test/service1Impl2.java index 367a92efac..0f639fbbf3 100644 --- a/java/sca/stest/sampleTest/src/main/java/test/service1Impl2.java +++ b/java/sca/stest/sampleTest/src/main/java/test/service1Impl2.java @@ -18,7 +18,9 @@ */ package test; -import org.oasisopen.sca.annotation.*; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * Enhanced Java component implementation for business interface Service1, @@ -29,16 +31,16 @@ import org.oasisopen.sca.annotation.*; */ @Service(Service1.class) public class service1Impl2 implements Service1 { - - @Property - public String serviceName = "service1"; - // Reference with an implied multiplicity of (1..1) since required=true is the default - @Reference - public Service1 reference1 = null; - public String operation1(String input) { - String result = reference1.operation1(input); - return serviceName + " operation1 invoked" + " " + result; - } + @Property + public String serviceName = "service1"; + // Reference with an implied multiplicity of (1..1) since required=true is the default + @Reference + public Service1 reference1 = null; + + public String operation1(String input) { + String result = reference1.operation1(input); + return serviceName + " operation1 invoked" + " " + result; + } } diff --git a/java/sca/stest/sampleTest/src/main/java/test/service1Impl3.java b/java/sca/stest/sampleTest/src/main/java/test/service1Impl3.java index 49021867c4..834dc3ddf7 100644 --- a/java/sca/stest/sampleTest/src/main/java/test/service1Impl3.java +++ b/java/sca/stest/sampleTest/src/main/java/test/service1Impl3.java @@ -18,7 +18,9 @@ */ package test; -import org.oasisopen.sca.annotation.*; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * Enhanced Java component implementation for business interface Service1, @@ -30,20 +32,20 @@ import org.oasisopen.sca.annotation.*; */ @Service(Service1.class) public class service1Impl3 implements Service1 { - - @Property - public String serviceName = "service1"; - // Required = true + an array -> multiplicity 1..n - @Reference(required=true) - public Service1[] reference1 = null; - public String operation1(String input) { - String result = ""; - // Call each of the references in the array, concatenating the results - for( int i=0 ; i < reference1.length; i++ ) { - result = result.concat( reference1[i].operation1(input) ); - } // end for - return serviceName + " operation1 invoked" + " " + result; - } + @Property + public String serviceName = "service1"; + // Required = true + an array -> multiplicity 1..n + @Reference(required = true) + public Service1[] reference1 = null; + + public String operation1(String input) { + String result = ""; + // Call each of the references in the array, concatenating the results + for (int i = 0; i < reference1.length; i++) { + result = result.concat(reference1[i].operation1(input)); + } // end for + return serviceName + " operation1 invoked" + " " + result; + } } diff --git a/java/sca/stest/sampleTest/src/main/java/test/service1Impl4.java b/java/sca/stest/sampleTest/src/main/java/test/service1Impl4.java index bb0226ca79..4799d777c7 100644 --- a/java/sca/stest/sampleTest/src/main/java/test/service1Impl4.java +++ b/java/sca/stest/sampleTest/src/main/java/test/service1Impl4.java @@ -18,7 +18,9 @@ */ package test; -import org.oasisopen.sca.annotation.*; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * Enhanced Java component implementation for business interface Service1, @@ -30,21 +32,21 @@ import org.oasisopen.sca.annotation.*; */ @Service(Service1.class) public class service1Impl4 implements Service1 { - - @Property - public String serviceName = "service1"; - // Required = false + an array -> multiplicity 0..n - @Reference(required=false) - public Service1[] reference1 = null; - public String operation1(String input) { - String result = serviceName + " operation1 invoked"; - // Call each of the references in the array, concatenating the results - for( int i=0 ; i < reference1.length; i++ ) { - result = result.concat(" "); - result = result.concat( reference1[i].operation1(input) ); - } // end for - return result; - } + @Property + public String serviceName = "service1"; + // Required = false + an array -> multiplicity 0..n + @Reference(required = false) + public Service1[] reference1 = null; + + public String operation1(String input) { + String result = serviceName + " operation1 invoked"; + // Call each of the references in the array, concatenating the results + for (int i = 0; i < reference1.length; i++) { + result = result.concat(" "); + result = result.concat(reference1[i].operation1(input)); + } // end for + return result; + } } diff --git a/java/sca/stest/sampleTest/src/main/java/test/service1Impl5.java b/java/sca/stest/sampleTest/src/main/java/test/service1Impl5.java index a7f2145643..dd69308c95 100644 --- a/java/sca/stest/sampleTest/src/main/java/test/service1Impl5.java +++ b/java/sca/stest/sampleTest/src/main/java/test/service1Impl5.java @@ -18,7 +18,8 @@ */ package test; -import org.oasisopen.sca.annotation.*; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; /** * Java component implementation for business interface Service1 @@ -29,16 +30,16 @@ import org.oasisopen.sca.annotation.*; */ @Service(Service1.class) public class service1Impl5 implements Service1 { - - @Property - public String serviceName = "service1"; - @Property - public String serviceData1; - @Property - public String serviceData2; - public String operation1(String input) { - return serviceName + " operation1 invoked" + serviceData1 + serviceData2; - } + @Property + public String serviceName = "service1"; + @Property + public String serviceData1; + @Property + public String serviceData2; + + public String operation1(String input) { + return serviceName + " operation1 invoked" + serviceData1 + serviceData2; + } } diff --git a/java/sca/stest/sampleTest/src/main/java/test/service1Impl6.java b/java/sca/stest/sampleTest/src/main/java/test/service1Impl6.java index 66fe13b279..1810686194 100644 --- a/java/sca/stest/sampleTest/src/main/java/test/service1Impl6.java +++ b/java/sca/stest/sampleTest/src/main/java/test/service1Impl6.java @@ -18,7 +18,9 @@ */ package test; -import org.oasisopen.sca.annotation.*; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; /** * Enhanced Java component implementation for business interface Service1, @@ -30,18 +32,19 @@ import org.oasisopen.sca.annotation.*; */ @Service(Service1.class) public class service1Impl6 implements Service1 { - - @Property - public String serviceName = "service1"; - // Required = false -> multiplicity 0..1 - @Reference(required=false) - public Service1 reference1 = null; - public String operation1(String input) { - String result = serviceName + " operation1 invoked"; - // Call the reference if present - if( reference1 != null ) result = result.concat(reference1.operation1( input )); - return result; - } + @Property + public String serviceName = "service1"; + // Required = false -> multiplicity 0..1 + @Reference(required = false) + public Service1 reference1 = null; + + public String operation1(String input) { + String result = serviceName + " operation1 invoked"; + // Call the reference if present + if (reference1 != null) + result = result.concat(reference1.operation1(input)); + return result; + } } diff --git a/java/sca/stest/sampleTest/src/main/java/test/service1SupersetImpl.java b/java/sca/stest/sampleTest/src/main/java/test/service1SupersetImpl.java index e0bc3464f6..f137b7f1b4 100644 --- a/java/sca/stest/sampleTest/src/main/java/test/service1SupersetImpl.java +++ b/java/sca/stest/sampleTest/src/main/java/test/service1SupersetImpl.java @@ -18,7 +18,8 @@ */ package test; -import org.oasisopen.sca.annotation.*; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; /** * Simple Java component implementation for business interface Service1Superset @@ -27,16 +28,16 @@ import org.oasisopen.sca.annotation.*; */ @Service(Service1Superset.class) public class service1SupersetImpl implements Service1Superset { - - @Property - public String serviceName = "service1"; - public String operation1(String input) { - return serviceName + " operation1 invoked"; - } + @Property + public String serviceName = "service1"; - public String operation2(String input) { - return serviceName + " operation2 invoked"; - } + public String operation1(String input) { + return serviceName + " operation1 invoked"; + } + + public String operation2(String input) { + return serviceName + " operation2 invoked"; + } } diff --git a/java/sca/stest/sampleTest/src/main/java/test/service2Impl.java b/java/sca/stest/sampleTest/src/main/java/test/service2Impl.java index a05a74dc35..919b33014c 100644 --- a/java/sca/stest/sampleTest/src/main/java/test/service2Impl.java +++ b/java/sca/stest/sampleTest/src/main/java/test/service2Impl.java @@ -18,7 +18,8 @@ */ package test; -import org.oasisopen.sca.annotation.*; +import org.oasisopen.sca.annotation.Property; +import org.oasisopen.sca.annotation.Service; /** * Simple Java component implementation for business interface Service2 @@ -27,12 +28,12 @@ import org.oasisopen.sca.annotation.*; */ @Service(Service2.class) public class service2Impl implements Service2 { - - @Property - public String serviceName = "service1"; - public int operation2(int input) { - return input+1; - } + @Property + public String serviceName = "service1"; + + public int operation2(int input) { + return input + 1; + } } diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java index 600d859e38..531a5a817b 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0002_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -27,17 +26,16 @@ import testClient.TestInvocation; */ public class ASM_0002_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0002"; - config.input = "request"; - config.output = config.testName + " " + config.input + " service1 operation1 invoked"; - config.composite = "Test_ASM_0002.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0002"; + config.input = "request"; + config.output = config.testName + " " + config.input + " service1 operation1 invoked"; + config.composite = "Test_ASM_0002.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0002 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0003_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0003_TestCase.java index 4f85967b0d..2f60ad5fca 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0003_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0003_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0003_Client; import testClient.TestInvocation; @@ -27,18 +26,21 @@ import testClient.TestInvocation; */ public class ASM_0003_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0003"; - config.input = "request"; - config.output = config.testName + " " + config.input + " service1 operation1 invoked" + - "service2 operation1 invoked" + "service3 operation1 invoked"; - config.composite = "Test_ASM_0003.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0003_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0003"; + config.input = "request"; + config.output = + config.testName + " " + + config.input + + " service1 operation1 invoked" + + "service2 operation1 invoked" + + "service3 operation1 invoked"; + config.composite = "Test_ASM_0003.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0003_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0004_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0004_TestCase.java index 4997b28859..6991447961 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0004_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0004_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -27,17 +26,16 @@ import testClient.TestInvocation; */ public class ASM_0004_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0004"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_0004.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0004"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_0004.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java index 718eb73908..a27c1cc08e 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0005_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -28,17 +27,16 @@ import testClient.TestInvocation; */ public class ASM_0005_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0005"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_0005.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0005"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_0005.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java index 7260eb949e..36e1e53d6e 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0006_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_0006_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0006"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_0006.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0006"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_0006.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0007_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0007_TestCase.java index 44781eb87a..b5528b35b3 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0007_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0007_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_0007_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0007"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_0007.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0007"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_0007.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0008_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0008_TestCase.java index 0bdc3af4a3..0c6c9201c9 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0008_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0008_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -30,17 +29,16 @@ import testClient.TestInvocation; */ public class ASM_0008_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0008"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_0008.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0008"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_0008.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0009_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0009_TestCase.java index cb1e600542..415e23a6b2 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0009_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0009_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_0009_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0009"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_0009.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0009"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_0009.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0010_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0010_TestCase.java index 7af957db99..f74589ff1a 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0010_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0010_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -31,17 +30,16 @@ import testClient.TestInvocation; */ public class ASM_0010_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0010"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_0010.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0010"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_0010.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0011_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0011_TestCase.java index ed850761f7..309c2a7ae6 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0011_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0011_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -30,17 +29,16 @@ import testClient.TestInvocation; */ public class ASM_0011_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0011"; - config.input = "request"; - config.output = "ASM_0011 request service1 operation1 invoked service2 operation1 invoked"; - config.composite = "Test_ASM_0011.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0011"; + config.input = "request"; + config.output = "ASM_0011 request service1 operation1 invoked service2 operation1 invoked"; + config.composite = "Test_ASM_0011.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0012_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0012_TestCase.java index 32a680f47f..d5c166134d 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0012_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0012_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -31,18 +30,17 @@ import testClient.TestInvocation; */ public class ASM_0012_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0012"; - config.input = "request"; - config.output = "ASM_0012 request service1 operation1 invoked service2 operation1 invoked" + - " service3 operation1 invoked service4 operation1 invoked service5 operation1 invoked"; - config.composite = "Test_ASM_0012.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0012"; + config.input = "request"; + config.output = + "ASM_0012 request service1 operation1 invoked service2 operation1 invoked" + " service3 operation1 invoked service4 operation1 invoked service5 operation1 invoked"; + config.composite = "Test_ASM_0012.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0013_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0013_TestCase.java index 96ad97cc67..11ec31907a 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0013_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0013_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -30,17 +29,16 @@ import testClient.TestInvocation; */ public class ASM_0013_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0013"; - config.input = "request"; - config.output = "ASM_0013 request service1 operation1 invoked service2 operation1 invoked"; - config.composite = "Test_ASM_0013.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0013"; + config.input = "request"; + config.output = "ASM_0013 request service1 operation1 invoked service2 operation1 invoked"; + config.composite = "Test_ASM_0013.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0014_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0014_TestCase.java index cce3b20239..35b8383c91 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0014_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0014_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -30,17 +29,16 @@ import testClient.TestInvocation; */ public class ASM_0014_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0014"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_0014.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0014"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_0014.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0015_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0015_TestCase.java index 4991d6f9c2..e0c64e8851 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0015_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0015_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -30,17 +29,16 @@ import testClient.TestInvocation; */ public class ASM_0015_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0015"; - config.input = "request"; - config.output = "ASM_0015 request service1 operation1 invoked service2 operation1 invoked"; - config.composite = "Test_ASM_0015.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0015"; + config.input = "request"; + config.output = "ASM_0015 request service1 operation1 invoked service2 operation1 invoked"; + config.composite = "Test_ASM_0015.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0016_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0016_TestCase.java index afc6e88fe1..9ad6bb27c7 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0016_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0016_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -30,17 +29,16 @@ import testClient.TestInvocation; */ public class ASM_0016_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0016"; - config.input = "request"; - config.output = "ASM_0016 request service1 operation1 invoked service2 operation1 invoked"; - config.composite = "Test_ASM_0016.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0016"; + config.input = "request"; + config.output = "ASM_0016 request service1 operation1 invoked service2 operation1 invoked"; + config.composite = "Test_ASM_0016.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0017_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0017_TestCase.java index e977c1a252..d1638fd809 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0017_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0017_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -31,17 +30,16 @@ import testClient.TestInvocation; */ public class ASM_0017_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0017"; - config.input = "request"; - config.output = "ASM_0017 request service1 operation1 invoked service2 operation1 invoked"; - config.composite = "Test_ASM_0017.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0017"; + config.input = "request"; + config.output = "ASM_0017 request service1 operation1 invoked service2 operation1 invoked"; + config.composite = "Test_ASM_0017.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0018_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0018_TestCase.java index 645f174df8..db49cee512 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0018_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0018_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -31,17 +30,16 @@ import testClient.TestInvocation; */ public class ASM_0018_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0018"; - config.input = "request"; - config.output = "ASM_0018 request service1 operation1 invoked service3 operation1 invoked"; - config.composite = "Test_ASM_0018.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0018"; + config.input = "request"; + config.output = "ASM_0018 request service1 operation1 invoked service3 operation1 invoked"; + config.composite = "Test_ASM_0018.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0019_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0019_TestCase.java index 1bfea7841f..f4189fcaf5 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0019_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0019_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -30,17 +29,16 @@ import testClient.TestInvocation; */ public class ASM_0019_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0019"; - config.input = "request"; - config.output = "ASM_0019 request service1 operation1 invoked service3 operation1 invoked"; - config.composite = "Test_ASM_0019.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0019"; + config.input = "request"; + config.output = "ASM_0019 request service1 operation1 invoked service3 operation1 invoked"; + config.composite = "Test_ASM_0019.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0020_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0020_TestCase.java index aeb6a92095..50fec1f0a9 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0020_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0020_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -31,17 +30,16 @@ import testClient.TestInvocation; */ public class ASM_0020_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0020"; - config.input = "request"; - config.output = "ASM_0020 request service1 operation1 invoked service3 operation1 invoked"; - config.composite = "Test_ASM_0020.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0020"; + config.input = "request"; + config.output = "ASM_0020 request service1 operation1 invoked service3 operation1 invoked"; + config.composite = "Test_ASM_0020.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0021_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0021_TestCase.java index 4397a564c8..286533a9ee 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0021_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0021_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -31,17 +30,16 @@ import testClient.TestInvocation; */ public class ASM_0021_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0021"; - config.input = "request"; - config.output = "ASM_0021 request service1 operation1 invoked service3 operation1 invoked"; - config.composite = "Test_ASM_0021.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0021"; + config.input = "request"; + config.output = "ASM_0021 request service1 operation1 invoked service3 operation1 invoked"; + config.composite = "Test_ASM_0021.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0022_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0022_TestCase.java index f845f0eaf5..6b64407545 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0022_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0022_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_0022_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0022"; - config.input = "request"; - config.output = "ASM_0022 request service1 operation1 invoked"; - config.composite = "Test_ASM_0022.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0022"; + config.input = "request"; + config.output = "ASM_0022 request service1 operation1 invoked"; + config.composite = "Test_ASM_0022.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0023_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0023_TestCase.java index c0be74ee02..f3814b6b0a 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0023_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0023_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -31,17 +30,16 @@ import testClient.TestInvocation; */ public class ASM_0023_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0023"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_0023.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0023"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_0023.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java index efae40f0eb..7f0ce03ae2 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0024_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_0024_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0024"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_0024.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0024"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_0024.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java index e05554fa14..6f022457cc 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0025_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -30,17 +29,16 @@ import testClient.TestInvocation; */ public class ASM_0025_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0025"; - config.input = "request"; - config.output = "ASM_0025 request service1 operation1 invokedcomplex1complex2"; - config.composite = "Test_ASM_0025.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0025"; + config.input = "request"; + config.output = "ASM_0025 request service1 operation1 invokedcomplex1complex2"; + config.composite = "Test_ASM_0025.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0026_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0026_TestCase.java index 2a56abcd7e..56be980561 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0026_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0026_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -31,17 +30,16 @@ import testClient.TestInvocation; */ public class ASM_0026_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0026"; - config.input = "request"; - config.output = "ASM_0026 request service1 operation1 invokedcomplex1complex2"; - config.composite = "Test_ASM_0026.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0026"; + config.input = "request"; + config.output = "ASM_0026 request service1 operation1 invokedcomplex1complex2"; + config.composite = "Test_ASM_0026.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0027_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0027_TestCase.java index 389d971f82..cbe3841832 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0027_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0027_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_0027_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0027"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_0027.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0027"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_0027.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0027 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0028_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0028_TestCase.java index b5eb110aaa..86f73c02cf 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0028_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0028_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_0028_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0028"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_0028.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0028"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_0028.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0028 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0029_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0029_TestCase.java index 13a3986135..aa4cbd44d4 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0029_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0029_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -28,17 +27,16 @@ import testClient.TestInvocation; */ public class ASM_0029_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0029"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_0029.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0029"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_0029.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0029 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0030_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0030_TestCase.java index 3916cc397e..cc34a7f33b 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0030_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0030_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -28,17 +27,16 @@ import testClient.TestInvocation; */ public class ASM_0030_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0030"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_0030.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0030"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_0030.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0030 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0031_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0031_TestCase.java index 32c7afca85..d7d9904290 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0031_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0031_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -31,17 +30,16 @@ import testClient.TestInvocation; */ public class ASM_0031_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0031"; - config.input = "request"; - config.output = "ASM_0031 request service1 operation1 invoked service3 operation1 invoked"; - config.composite = "Test_ASM_0031.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0031"; + config.input = "request"; + config.output = "ASM_0031 request service1 operation1 invoked service3 operation1 invoked"; + config.composite = "Test_ASM_0031.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0031 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0032_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0032_TestCase.java index 0601cab2ee..97b952b139 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0032_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0032_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -31,17 +30,17 @@ import testClient.TestInvocation; */ public class ASM_0032_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0032"; - config.input = "request"; - config.output = "ASM_0032 request service1 operation1 invoked service2 operation1 invokedservice2 operation1 invoked"; - config.composite = "Test_ASM_0032.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0032"; + config.input = "request"; + config.output = + "ASM_0032 request service1 operation1 invoked service2 operation1 invokedservice2 operation1 invoked"; + config.composite = "Test_ASM_0032.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0032 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0033_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0033_TestCase.java index ffc1dcaa33..87fa6cdde5 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0033_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0033_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -30,17 +29,17 @@ import testClient.TestInvocation; */ public class ASM_0033_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0033"; - config.input = "request"; - config.output = "ASM_0033 request service1 operation1 invoked service2 operation1 invokedservice2 operation1 invoked"; - config.composite = "Test_ASM_0033.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0033"; + config.input = "request"; + config.output = + "ASM_0033 request service1 operation1 invoked service2 operation1 invokedservice2 operation1 invoked"; + config.composite = "Test_ASM_0033.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0032 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_0034_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_0034_TestCase.java index 9f54b0d3df..69f4e55012 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_0034_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_0034_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,17 @@ import testClient.TestInvocation; */ public class ASM_0034_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0034"; - config.input = "request"; - config.output = "ASM_0034 request service1 operation1 invoked service2 operation1 invokedservice2 operation1 invoked"; - config.composite = "Test_ASM_0034.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0034"; + config.input = "request"; + config.output = + "ASM_0034 request service1 operation1 invoked service2 operation1 invokedservice2 operation1 invoked"; + config.composite = "Test_ASM_0034.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_0034 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_6001_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_6001_TestCase.java index 0f6ca04682..ba1666f2cb 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_6001_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_6001_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -30,17 +29,16 @@ import testClient.TestInvocation; */ public class ASM_6001_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_6001"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_6001.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_6001"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_6001.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_6001 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_6002_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_6002_TestCase.java index e53a3cde1b..7827b2dbda 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_6002_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_6002_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_6002_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_6002"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_6002.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_6002"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_6002.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_6002 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_6003_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_6003_TestCase.java index 153bb3fcea..c6ebf7134f 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_6003_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_6003_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_6003_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_6003"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_6003.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_6003"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_6003.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_6003 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_6004_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_6004_TestCase.java index d5b6fb3771..41e7e5719e 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_6004_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_6004_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -30,17 +29,16 @@ import testClient.TestInvocation; */ public class ASM_6004_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_6004"; - config.input = "request"; - config.output = "ASM_6004 request service1 operation1 invoked"; - config.composite = "Test_ASM_6004.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_6004"; + config.input = "request"; + config.output = "ASM_6004 request service1 operation1 invoked"; + config.composite = "Test_ASM_6004.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_6004 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_6005_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_6005_TestCase.java index adf8bd937a..46a76d351a 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_6005_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_6005_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_6005_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_6005"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_6005.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_6005"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_6005.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_6004 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_6006_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_6006_TestCase.java index bd0ea10bea..4fef884d1a 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_6006_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_6006_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_6006_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_6006"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_6006.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_6006"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_6006.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_6004 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_6007_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_6007_TestCase.java index 751a5bd3b2..da23a732e8 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_6007_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_6007_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_6007_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_6007"; - config.input = "request"; - config.output = "ASM_6007 request service1 operation1 invoked service2 operation1 invoked"; - config.composite = "Test_ASM_6007.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_6007"; + config.input = "request"; + config.output = "ASM_6007 request service1 operation1 invoked service2 operation1 invoked"; + config.composite = "Test_ASM_6007.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_6007 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_6008_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_6008_TestCase.java index 59bf04bb14..54c85059bd 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_6008_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_6008_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -30,17 +29,16 @@ import testClient.TestInvocation; */ public class ASM_6008_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_6008"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_6008.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_6008"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_6008.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_6008 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_6009_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_6009_TestCase.java index 7aacaea8a0..eaff618911 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_6009_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_6009_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_6009_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_6009"; - config.input = "request"; - config.output = "ASM_6009 request service1 operation1 invokedservice2 operation1 invoked"; - config.composite = "Test_ASM_6009.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_6009"; + config.input = "request"; + config.output = "ASM_6009 request service1 operation1 invokedservice2 operation1 invoked"; + config.composite = "Test_ASM_6009.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_6009 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_6010_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_6010_TestCase.java index 2197cc3c29..e354e84787 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_6010_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_6010_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_6010_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_6010"; - config.input = "request"; - config.output = "ASM_6010 request service1 operation1 invoked service2 operation1 invoked"; - config.composite = "Test_ASM_6010.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_6010"; + config.input = "request"; + config.output = "ASM_6010 request service1 operation1 invoked service2 operation1 invoked"; + config.composite = "Test_ASM_6010.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_6010 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_6011_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_6011_TestCase.java index 2678c93ef2..35e0d93093 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_6011_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_6011_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_6011_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_6011"; - config.input = "request"; - config.output = "ASM_6011 request service1 operation1 invoked service2 operation1 invoked"; - config.composite = "Test_ASM_6011.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_6011"; + config.input = "request"; + config.output = "ASM_6011 request service1 operation1 invoked service2 operation1 invoked"; + config.composite = "Test_ASM_6011.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_6009 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_6012_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_6012_TestCase.java index 73d3c41e55..60f35f399c 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_6012_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_6012_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_6012_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_6012"; - config.input = "request"; - config.output = "exception"; - config.composite = "Test_ASM_6012.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_6012"; + config.input = "request"; + config.output = "exception"; + config.composite = "Test_ASM_6012.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_6012 diff --git a/java/sca/stest/sampleTest/src/test/java/client/ASM_6013_TestCase.java b/java/sca/stest/sampleTest/src/test/java/client/ASM_6013_TestCase.java index 5047f2b1b4..c3b0642019 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/ASM_6013_TestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/ASM_6013_TestCase.java @@ -18,7 +18,6 @@ */ package client; - import test.ASM_0002_Client; import testClient.TestInvocation; @@ -29,17 +28,16 @@ import testClient.TestInvocation; */ public class ASM_6013_TestCase extends BaseJAXWSTestCase { - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_6013"; - config.input = "request"; - config.output = "ASM_6013 request service1 operation1 invoked third operation1 invoked"; - config.composite = "Test_ASM_6013.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0002_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_6013"; + config.input = "request"; + config.output = "ASM_6013 request service1 operation1 invoked third operation1 invoked"; + config.composite = "Test_ASM_6013.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0002_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class Test_ASM_6013 diff --git a/java/sca/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java b/java/sca/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java index ede2658ac0..bf2142b41d 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/BaseJAXWSTestCase.java @@ -18,11 +18,13 @@ */ package client; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; -import java.net.MalformedURLException; import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.equinox.launcher.Contribution; import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper; @@ -31,13 +33,10 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import javax.xml.ws.Service; -import javax.xml.namespace.QName; - import test.ASM_0001_Client; -import testClient.TestInvocation; -import testClient.TestException_Exception; import testClient.TestException; +import testClient.TestException_Exception; +import testClient.TestInvocation; /** * A generic test client based on JAX-WS APIs @@ -48,86 +47,88 @@ public class BaseJAXWSTestCase { protected Node node; protected TestConfiguration testConfiguration = getTestConfiguration(); static boolean proceed = true; - + public static void main(String[] args) throws Exception { - BaseJAXWSTestCase test = new BaseJAXWSTestCase(); - test.setUp(); - test.tearDown(); + BaseJAXWSTestCase test = new BaseJAXWSTestCase(); + test.setUp(); + test.tearDown(); } - + @Before - public void setUp() throws Exception { - try { - startContribution(); - } catch (Exception e) { - // If the SCA runtime refuses to start an invalid contribution, then this is also - // regarded as a successful outcome - System.out.println( "Exception received - detail: " + e.getMessage() ); - assertEquals( testConfiguration.getExpectedOutput(), "exception" ); - System.out.println("Test " + testConfiguration.getTestName() + " completed successfully"); - // Mark this test as not to proceed further - proceed = false; - } // end try + public void setUp() throws Exception { + try { + startContribution(); + } catch (Exception e) { + // If the SCA runtime refuses to start an invalid contribution, then this is also + // regarded as a successful outcome + System.out.println("Exception received - detail: " + e.getMessage()); + assertEquals(testConfiguration.getExpectedOutput(), "exception"); + System.out.println("Test " + testConfiguration.getTestName() + " completed successfully"); + // Mark this test as not to proceed further + proceed = false; + } // end try } @After public void tearDown() throws Exception { - stopContribution(); + stopContribution(); } @Test public void testDummy() throws Exception { - // If an exception were thrown during initialization, let's go no further - if( proceed == false ) return; - - // System.out.println("Test " + testName + " starting"); - String output = null; - try { - output = invokeTest( testConfiguration.getInput() ); - - } catch ( TestException_Exception e ) { - TestException exceptionContent = e.getFaultInfo(); - System.out.println("Service fault received - detail: " + exceptionContent.getMessage() ); - assertEquals( testConfiguration.getExpectedOutput(), "exception" ); - System.out.println("Test " + testConfiguration.getTestName() + " completed successfully"); - return; - } catch (Throwable e) { - e.printStackTrace(); - System.out.println( "Exception received - detail: " + e.getMessage() ); - assertEquals( testConfiguration.getExpectedOutput(), "exception" ); - System.out.println("Test " + testConfiguration.getTestName() + " completed successfully"); - return; - } - assertEquals( testConfiguration.getExpectedOutput(), output ); - System.out.println("Test " + testConfiguration.getTestName() + " completed successfully"); + // If an exception were thrown during initialization, let's go no further + if (proceed == false) + return; + + // System.out.println("Test " + testName + " starting"); + String output = null; + try { + output = invokeTest(testConfiguration.getInput()); + + } catch (TestException_Exception e) { + TestException exceptionContent = e.getFaultInfo(); + System.out.println("Service fault received - detail: " + exceptionContent.getMessage()); + assertEquals(testConfiguration.getExpectedOutput(), "exception"); + System.out.println("Test " + testConfiguration.getTestName() + " completed successfully"); + return; + } catch (Throwable e) { + e.printStackTrace(); + System.out.println("Exception received - detail: " + e.getMessage()); + assertEquals(testConfiguration.getExpectedOutput(), "exception"); + System.out.println("Test " + testConfiguration.getTestName() + " completed successfully"); + return; + } + assertEquals(testConfiguration.getExpectedOutput(), output); + System.out.println("Test " + testConfiguration.getTestName() + " completed successfully"); } - - public String invokeTest( String input ) throws Exception { - //Web service invocation via JAXWS - QName serviceName = new QName("http://test/", "TestInvocationService"); - URL wsdlLocation = this.getClass().getClassLoader().getResource("TestClient.wsdl"); - javax.xml.ws.Service webService = Service.create( wsdlLocation, serviceName ); - TestInvocation wsProxy = (TestInvocation) webService.getPort(testConfiguration.getServiceInterface()); - String output = wsProxy.invokeTest(input); + public String invokeTest(String input) throws Exception { + //Web service invocation via JAXWS + QName serviceName = new QName("http://test/", "TestInvocationService"); + URL wsdlLocation = this.getClass().getClassLoader().getResource("TestClient.wsdl"); + javax.xml.ws.Service webService = Service.create(wsdlLocation, serviceName); + TestInvocation wsProxy = (TestInvocation)webService.getPort(testConfiguration.getServiceInterface()); + + String output = wsProxy.invokeTest(input); - return output; + return output; } // end method invokeTest - - protected T getService( Class interfaze, String serviceName ) { - T service = node.getService( interfaze, serviceName ); - return service; + + protected T getService(Class interfaze, String serviceName) { + T service = node.getService(interfaze, serviceName); + return service; } // end getService - + protected void startContribution() throws Exception { - // Tuscany specific code which starts the contribution holding the test + // Tuscany specific code which starts the contribution holding the test launcher = NodeLauncher.newInstance(); - node = launcher.createNode(testConfiguration.getComposite(), - new Contribution(testConfiguration.getTestName(), getContributionURI())); + node = + launcher.createNode(testConfiguration.getComposite(), new Contribution(testConfiguration.getTestName(), + getContributionURI())); System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader()); node.start(); } // end method startContribution - + protected void stopContribution() throws Exception { if (node != null) { node.stop(); @@ -137,22 +138,22 @@ public class BaseJAXWSTestCase { launcher.destroy(); } } // end method stopContribution - + protected String getContributionURI() { - String location = ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass()); - return location; + String location = ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass()); + return location; } - + protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0001"; - config.input = "request"; - config.output = config.testName + " " + config.input + " invoked ok"; - config.composite = "Test_ASM_0101.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0001_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0001"; + config.input = "request"; + config.output = config.testName + " " + config.input + " invoked ok"; + config.composite = "Test_ASM_0101.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0001_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class BaseTest diff --git a/java/sca/stest/sampleTest/src/test/java/client/BaseTestCase.java b/java/sca/stest/sampleTest/src/test/java/client/BaseTestCase.java index a728373daa..739417e0d7 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/BaseTestCase.java +++ b/java/sca/stest/sampleTest/src/test/java/client/BaseTestCase.java @@ -18,7 +18,7 @@ */ package client; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.equinox.launcher.Contribution; @@ -39,58 +39,59 @@ public class BaseTestCase { protected NodeLauncher launcher; protected Node node; protected TestConfiguration testConfiguration = getTestConfiguration(); - + public static void main(String[] args) throws Exception { - BaseTestCase test = new BaseTestCase(); - test.setUp(); - test.tearDown(); + BaseTestCase test = new BaseTestCase(); + test.setUp(); + test.tearDown(); } - + @Before - public void setUp() throws Exception { - startContribution(); + public void setUp() throws Exception { + startContribution(); } @After public void tearDown() throws Exception { - stopContribution(); + stopContribution(); } @Test public void testDummy() throws Exception { - // System.out.println("Test " + testName + " starting"); - try { - String output = invokeTest( testConfiguration.getInput() ); - assertEquals( testConfiguration.getExpectedOutput(), output ); - } catch (Exception e) { - assertEquals( testConfiguration.getExpectedOutput(), "exception" ); - System.out.println( "Expected exception - detail: " + e.getMessage() ); - } - System.out.println("Test " + testConfiguration.getTestName() + " completed successfully"); + // System.out.println("Test " + testName + " starting"); + try { + String output = invokeTest(testConfiguration.getInput()); + assertEquals(testConfiguration.getExpectedOutput(), output); + } catch (Exception e) { + assertEquals(testConfiguration.getExpectedOutput(), "exception"); + System.out.println("Expected exception - detail: " + e.getMessage()); + } + System.out.println("Test " + testConfiguration.getTestName() + " completed successfully"); } - - public String invokeTest( String input ) throws Exception { - TestInvocation service = (TestInvocation) getService( testConfiguration.getServiceInterface(), - testConfiguration.getTestServiceName() ); - - return service.invokeTest( input ); + public String invokeTest(String input) throws Exception { + + TestInvocation service = + (TestInvocation)getService(testConfiguration.getServiceInterface(), testConfiguration.getTestServiceName()); + + return service.invokeTest(input); } // end method invokeTest - - protected T getService( Class interfaze, String serviceName ) { - T service = node.getService( interfaze, serviceName ); - return service; + + protected T getService(Class interfaze, String serviceName) { + T service = node.getService(interfaze, serviceName); + return service; } // end getService - + protected void startContribution() throws Exception { - // Tuscany specific code which starts the contribution holding the test + // Tuscany specific code which starts the contribution holding the test launcher = NodeLauncher.newInstance(); - node = launcher.createNode(testConfiguration.getComposite(), - new Contribution(testConfiguration.getTestName(), getContributionURI())); + node = + launcher.createNode(testConfiguration.getComposite(), new Contribution(testConfiguration.getTestName(), + getContributionURI())); System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader()); node.start(); } // end method startContribution - + protected void stopContribution() throws Exception { if (node != null) { node.stop(); @@ -100,22 +101,22 @@ public class BaseTestCase { launcher.destroy(); } } // end method stopContribution - + protected String getContributionURI() { - String location = ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass()); - return location; + String location = ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass()); + return location; } - + protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0001"; - config.input = "request"; - config.output = config.testName + " " + config.input + " invoked ok"; - config.composite = "Test_ASM_0001.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0001_Client.class; - config.serviceInterface = TestInvocation.class; - return config; + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0001"; + config.input = "request"; + config.output = config.testName + " " + config.input + " invoked ok"; + config.composite = "Test_ASM_0001.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0001_Client.class; + config.serviceInterface = TestInvocation.class; + return config; } - + } // end class BaseTest diff --git a/java/sca/stest/sampleTest/src/test/java/client/TestConfiguration.java b/java/sca/stest/sampleTest/src/test/java/client/TestConfiguration.java index 3e3bf01718..99e9937bcb 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/TestConfiguration.java +++ b/java/sca/stest/sampleTest/src/test/java/client/TestConfiguration.java @@ -15,8 +15,8 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - */ - + */ + package client; /** @@ -25,22 +25,43 @@ package client; * */ class TestConfiguration { - - public String testName; - public String input; - public String output; - public String composite; - public String testServiceName; - public Class testClass; //TODO - does the client need this?? - public Class serviceInterface; - - public TestConfiguration() { } - - public String getTestName() { return testName; } - public String getInput() { return input; } - public String getExpectedOutput() { return output; } - public String getComposite() { return composite; } - public String getTestServiceName() { return testServiceName; } - public Class getTestClass() { return testClass; } - public Class getServiceInterface() { return serviceInterface; } -} + + public String testName; + public String input; + public String output; + public String composite; + public String testServiceName; + public Class testClass; //TODO - does the client need this?? + public Class serviceInterface; + + public TestConfiguration() { + } + + public String getTestName() { + return testName; + } + + public String getInput() { + return input; + } + + public String getExpectedOutput() { + return output; + } + + public String getComposite() { + return composite; + } + + public String getTestServiceName() { + return testServiceName; + } + + public Class getTestClass() { + return testClass; + } + + public Class getServiceInterface() { + return serviceInterface; + } +} diff --git a/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTest.java b/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTest.java index 2dcb4142f4..4b6011e2e3 100644 --- a/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTest.java +++ b/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTest.java @@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; - /** *

Java class for anonymous complex type. * @@ -46,9 +45,7 @@ import javax.xml.bind.annotation.XmlType; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "arg0" -}) +@XmlType(name = "", propOrder = {"arg0"}) @XmlRootElement(name = "invokeTest") public class InvokeTest { @@ -76,7 +73,7 @@ public class InvokeTest { * */ public void setArg0(JAXBElement value) { - this.arg0 = ((JAXBElement ) value); + this.arg0 = ((JAXBElement)value); } } diff --git a/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java b/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java index 3c7419370a..934e13b744 100644 --- a/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java +++ b/java/sca/stest/sampleTest/src/test/java/testClient/InvokeTestResponse.java @@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; - /** *

Java class for anonymous complex type. * @@ -46,9 +45,7 @@ import javax.xml.bind.annotation.XmlType; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { - "_return" -}) +@XmlType(name = "", propOrder = {"_return"}) @XmlRootElement(name = "invokeTestResponse") public class InvokeTestResponse { @@ -76,7 +73,7 @@ public class InvokeTestResponse { * */ public void setReturn(JAXBElement value) { - this._return = ((JAXBElement ) value); + this._return = ((JAXBElement)value); } } diff --git a/java/sca/stest/sampleTest/src/test/java/testClient/ObjectFactory.java b/java/sca/stest/sampleTest/src/test/java/testClient/ObjectFactory.java index e24d2f58b9..1cdc02c2d2 100644 --- a/java/sca/stest/sampleTest/src/test/java/testClient/ObjectFactory.java +++ b/java/sca/stest/sampleTest/src/test/java/testClient/ObjectFactory.java @@ -23,7 +23,6 @@ import javax.xml.bind.annotation.XmlElementDecl; import javax.xml.bind.annotation.XmlRegistry; import javax.xml.namespace.QName; - /** * This object contains factory methods for each * Java content interface and Java element interface diff --git a/java/sca/stest/sampleTest/src/test/java/testClient/TestException.java b/java/sca/stest/sampleTest/src/test/java/testClient/TestException.java index cfda989712..a400c1a362 100644 --- a/java/sca/stest/sampleTest/src/test/java/testClient/TestException.java +++ b/java/sca/stest/sampleTest/src/test/java/testClient/TestException.java @@ -22,7 +22,6 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlType; - /** *

Java class for TestException complex type. * @@ -43,9 +42,7 @@ import javax.xml.bind.annotation.XmlType; * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TestException", propOrder = { - "message" -}) +@XmlType(name = "TestException", propOrder = {"message"}) public class TestException { protected String message; diff --git a/java/sca/stest/sampleTest/src/test/java/testClient/TestException_Exception.java b/java/sca/stest/sampleTest/src/test/java/testClient/TestException_Exception.java index c710d0d6ef..7e58b83da3 100644 --- a/java/sca/stest/sampleTest/src/test/java/testClient/TestException_Exception.java +++ b/java/sca/stest/sampleTest/src/test/java/testClient/TestException_Exception.java @@ -20,7 +20,6 @@ package testClient; import javax.xml.ws.WebFault; - /** * This class was generated by the JAX-WS RI. * JAX-WS RI 2.1.1 in JDK 6 @@ -28,9 +27,7 @@ import javax.xml.ws.WebFault; * */ @WebFault(name = "TestException", targetNamespace = "http://test/") -public class TestException_Exception - extends Exception -{ +public class TestException_Exception extends Exception { /** * Java type that goes as soapenv:Fault detail element. diff --git a/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocation.java b/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocation.java index d6633dea81..e9b74e2ae4 100644 --- a/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocation.java +++ b/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocation.java @@ -26,7 +26,6 @@ import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; - /** * This class was generated by the JAX-WS RI. * JAX-WS RI 2.1.1 in JDK 6 @@ -34,12 +33,9 @@ import javax.xml.ws.ResponseWrapper; * */ @WebService(name = "TestInvocation", targetNamespace = "http://test/") -@XmlSeeAlso({ - ObjectFactory.class -}) +@XmlSeeAlso( {ObjectFactory.class}) public interface TestInvocation { - /** * * @param arg0 @@ -51,10 +47,6 @@ public interface TestInvocation { @WebResult(targetNamespace = "") @RequestWrapper(localName = "invokeTest", targetNamespace = "http://test/", className = "testClient.InvokeTest") @ResponseWrapper(localName = "invokeTestResponse", targetNamespace = "http://test/", className = "testClient.InvokeTestResponse") - public String invokeTest( - @WebParam(name = "arg0", targetNamespace = "") - String arg0) - throws TestException_Exception - ; + public String invokeTest(@WebParam(name = "arg0", targetNamespace = "") String arg0) throws TestException_Exception; } diff --git a/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocationService.java b/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocationService.java index 3ca43532ea..b13e69087c 100644 --- a/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocationService.java +++ b/java/sca/stest/sampleTest/src/test/java/testClient/TestInvocationService.java @@ -20,13 +20,13 @@ package testClient; import java.net.MalformedURLException; import java.net.URL; + import javax.xml.namespace.QName; import javax.xml.ws.Service; import javax.xml.ws.WebEndpoint; import javax.xml.ws.WebServiceClient; import javax.xml.ws.WebServiceFeature; - /** * This class was generated by the JAX-WS RI. * JAX-WS RI 2.1.1 in JDK 6 @@ -34,9 +34,7 @@ import javax.xml.ws.WebServiceFeature; * */ @WebServiceClient(name = "TestInvocationService", targetNamespace = "http://test/", wsdlLocation = "file:/C:/temp/Tuscany_2_0_Work/TestClient.wsdl") -public class TestInvocationService - extends Service -{ +public class TestInvocationService extends Service { private final static URL TESTINVOCATIONSERVICE_WSDL_LOCATION; @@ -77,7 +75,9 @@ public class TestInvocationService */ @WebEndpoint(name = "TestInvocationPort") public TestInvocation getTestInvocationPort(WebServiceFeature... features) { - return (TestInvocation)super.getPort(new QName("http://test/", "TestInvocationPort"), TestInvocation.class, features); + return (TestInvocation)super.getPort(new QName("http://test/", "TestInvocationPort"), + TestInvocation.class, + features); } } diff --git a/java/sca/stest/sampleTest/src/test/java/testClient/package-info.java b/java/sca/stest/sampleTest/src/test/java/testClient/package-info.java index 3167a4513e..847e70af9f 100644 --- a/java/sca/stest/sampleTest/src/test/java/testClient/package-info.java +++ b/java/sca/stest/sampleTest/src/test/java/testClient/package-info.java @@ -18,3 +18,4 @@ */ @javax.xml.bind.annotation.XmlSchema(namespace = "http://test/") package testClient; + -- cgit v1.2.3