You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sc...@apache.org on 2011/01/26 02:23:45 UTC
svn commit: r1063552 - in
/tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src:
main/java/org/example/orderservice/ main/resources/
test/java/org/example/orderservice/
Author: scottkurz
Date: Wed Jan 26 01:23:44 2011
New Revision: 1063552
URL: http://svn.apache.org/viewvc?rev=1063552&view=rev
Log:
Commit some more multiple output tests and un-ignore existing ones.
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderService.java
tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareForwardImpl.java
tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareImpl.java
tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceForwardImpl.java
tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceImpl.java
tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.bare.composite
tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceBareTestCase.java
tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceTestCase.java
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderService.java?rev=1063552&r1=1063551&r2=1063552&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderService.java (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderService.java Wed Jan 26 01:23:44 2011
@@ -46,11 +46,11 @@ public interface OrderService {
public String[] reviewOrderTwoOutHolders(
@WebParam(name = "myData", targetNamespace = "", mode = WebParam.Mode.OUT)
Holder<Order> myData,
- @WebParam(name = "myOutParam", targetNamespace = "", mode = WebParam.Mode.OUT)
+ @WebParam(targetNamespace = "", mode = WebParam.Mode.OUT)
Holder<Float> myOutParam);
public String[] reviewOrderTwoInOutsThenIn(
- @WebParam(name = "myData", targetNamespace = "", mode = WebParam.Mode.INOUT)
+ @WebParam(targetNamespace = "", mode = WebParam.Mode.INOUT)
Holder<Order> myData,
@WebParam(name = "myOutParam", targetNamespace = "", mode = WebParam.Mode.INOUT)
Holder<Float> myOutParam,
@@ -62,5 +62,11 @@ public interface OrderService {
@WebParam(name = "myOutParam", targetNamespace = "", mode = WebParam.Mode.INOUT)
Holder<Float> myOutParam);
+ public String[] reviewOrderOutThenInOut(
+ @WebParam(name = "myOutParam", targetNamespace = "", mode = WebParam.Mode.OUT)
+ Holder<Float> myOutParam,
+ @WebParam(name = "myData", targetNamespace = "", mode = WebParam.Mode.INOUT)
+ Holder<Order> myData);
+
}
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareForwardImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareForwardImpl.java?rev=1063552&r1=1063551&r2=1063552&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareForwardImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareForwardImpl.java Wed Jan 26 01:23:44 2011
@@ -24,6 +24,6 @@ public class OrderServiceBareForwardImpl
@Override
public void bareReviewOrderOutHolder(Holder<Order> myData) {
- ref.bareReviewOrderInOutHolder(myData);
+ ref.bareReviewOrderOutHolder(myData);
}
}
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareImpl.java?rev=1063552&r1=1063551&r2=1063552&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceBareImpl.java Wed Jan 26 01:23:44 2011
@@ -46,24 +46,30 @@ public class OrderServiceBareImpl implem
@Override
public void bareReviewOrderInOutHolder(Holder<Order> myData) {
+ String customerId = "cust1234";
double total = myData.value.getTotal();
- myData.value = new Order();
+ Order newOrder = new Order();
+
if ( total < 100.0 ) {
- myData.value.setStatus( Status.APPROVED );
+ newOrder.setStatus( Status.APPROVED );
} else if ( total > 1100.0 ) {
- myData.value.setStatus( Status.REJECTED );
- }
+ newOrder.setStatus( Status.REJECTED );
+ }
+ newOrder.setCustomerId(customerId);
+ myData.value = newOrder;
}
@Override
public void bareReviewOrderOutHolder(Holder<Order> myData) {
boolean holderEmpty = (myData.value == null ? true : false);
- myData.value = new Order();
+ Order newOrder = new Order();
+
if (holderEmpty) {
- myData.value.setStatus( Status.APPROVED );
- myData.value.setCustomerId("approved.1234");
+ newOrder.setStatus( Status.APPROVED );
+ newOrder.setCustomerId("approved.1234");
} else {
- myData.value.setStatus( Status.REJECTED );
+ newOrder.setStatus( Status.REJECTED );
}
+ myData.value = newOrder;
}
}
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceForwardImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceForwardImpl.java?rev=1063552&r1=1063551&r2=1063552&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceForwardImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceForwardImpl.java Wed Jan 26 01:23:44 2011
@@ -42,5 +42,11 @@ public class OrderServiceForwardImpl imp
ref.reviewOrderTwoInOutsVoid(myData, myOutParam);
}
+ @Override
+ public String[] reviewOrderOutThenInOut(Holder<Float> myOutParam, Holder<Order> myData) {
+ String[] retVal = ref.reviewOrderOutThenInOut(myOutParam, myData);
+ return retVal;
+ }
+
}
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceImpl.java?rev=1063552&r1=1063551&r2=1063552&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/java/org/example/orderservice/OrderServiceImpl.java Wed Jan 26 01:23:44 2011
@@ -155,4 +155,11 @@ public class OrderServiceImpl implements
}
myData.value = retOrder;
}
+
+ @Override
+ // Simply delegate to existing test method with parms reversed.
+ public String[] reviewOrderOutThenInOut(Holder<Float> myOutParam, Holder<Order> myData) {
+ String[] retVal = reviewOrder(myData, myOutParam);
+ return retVal;
+ }
}
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.bare.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.bare.composite?rev=1063552&r1=1063551&r2=1063552&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.bare.composite (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/main/resources/ordersca.bare.composite Wed Jan 26 01:23:44 2011
@@ -26,7 +26,9 @@
<implementation.java class="org.example.orderservice.OrderServiceBareImpl" />
<service name="OrderServiceBare">
<interface.java interface="org.example.orderservice.OrderServiceBare"/>
+<!-- TODO - start mailing list discussion about implications of @SOAPBinding plus binding.sca not being supported in OASIS.
<binding.sca name="sca"/>
+ -->
<binding.ws/>
</service>
</component>
@@ -36,6 +38,9 @@
<reference name="ref">
<binding.ws uri="http://localhost:8080/OrderServiceBareComponent/OrderServiceBare"/>
</reference>
+ <service name="OrderServiceBare">
+ <binding.ws/>
+ </service>
</component>
</composite>
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceBareTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceBareTestCase.java?rev=1063552&r1=1063551&r2=1063552&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceBareTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceBareTestCase.java Wed Jan 26 01:23:44 2011
@@ -38,7 +38,6 @@ import org.junit.Test;
/**
* Tests that the order server responds.
*/
-@Ignore
public class OrderServiceBareTestCase {
private static Node node;
@@ -57,6 +56,7 @@ public class OrderServiceBareTestCase {
}
@Test
+ @Ignore
public void testOrderReviewBareApprovedSCA() throws IOException {
OrderServiceBare orderServiceBare =
node.getService(OrderServiceBare.class, "OrderServiceBareComponent/OrderServiceBare");
@@ -72,6 +72,7 @@ public class OrderServiceBareTestCase {
testOrderReviewApproved(orderServiceBare);
}
+ @Ignore
@Test
public void testOrderReviewBareRejectedSCA() throws IOException {
OrderServiceBare orderServiceBare =
@@ -88,7 +89,7 @@ public class OrderServiceBareTestCase {
testOrderReviewRejected(orderServiceBare);
}
-
+ @Ignore
@Test
public void testOrderReviewInOutBareApprovedSCA() throws IOException {
OrderServiceBare orderServiceBare =
@@ -105,6 +106,7 @@ public class OrderServiceBareTestCase {
testOrderReviewApprovedInOutHolder(orderServiceBare);
}
+ @Ignore
@Test
public void testOrderReviewInOutBareRejectedSCA() throws IOException {
OrderServiceBare orderServiceBare =
@@ -121,6 +123,7 @@ public class OrderServiceBareTestCase {
testOrderReviewRejectedInOutHolder(orderServiceBare);
}
+ @Ignore
@Test
public void testOrderReviewBareOutHolderSCA() throws IOException {
OrderServiceBare orderServiceBare =
Modified: tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceTestCase.java?rev=1063552&r1=1063551&r2=1063552&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/ws/holder-ws-service-multiple-outputs/src/test/java/org/example/orderservice/OrderServiceTestCase.java Wed Jan 26 01:23:44 2011
@@ -196,7 +196,6 @@ public class OrderServiceTestCase {
testOrderReviewOrderTwoInOutsThenIn(orderService);
}
- @Ignore
@Test
public void testOrderReviewVoidApprovedSCA() throws IOException {
OrderService orderService =
@@ -205,7 +204,6 @@ public class OrderServiceTestCase {
testOrderReviewVoidApproved(orderService);
}
- @Ignore
@Test
public void testOrderReviewVoidApprovedWS() throws IOException {
OrderService orderService =
@@ -214,7 +212,6 @@ public class OrderServiceTestCase {
testOrderReviewVoidApproved(orderService);
}
- @Ignore
@Test
public void testOrderReviewVoidRejectedSCA() throws IOException {
OrderService orderService =
@@ -223,7 +220,6 @@ public class OrderServiceTestCase {
testOrderReviewVoidRejected(orderService);
}
- @Ignore
@Test
public void testOrderReviewVoidRejectedWS() throws IOException {
OrderService orderService =
@@ -232,7 +228,26 @@ public class OrderServiceTestCase {
testOrderReviewVoidRejected(orderService);
}
-
+ @Test
+ public void testOrderReviewOutThenInOutApprovedWS() throws IOException {
+ OrderService orderService =
+ node.getService(OrderService.class, "OrderServiceForwardComponent/OrderService");
+ assertNotNull(orderService);
+ Order order = new Order();
+ order.setStatus( Status.CREATED );
+ order.setCustomerId("cust1234");
+ order.setTotal( 50.0 );
+ System.out.println( ">>> Order submitted=" + order );
+ Holder<Float> outParam = new Holder<Float>(new Float(57.4));
+ Holder<Order> holder = new Holder<Order>( order );
+ String[] returnValue = null;
+ returnValue = orderService.reviewOrderOutThenInOut(outParam, holder);
+ assertTrue( holder.value.getStatus() == Status.APPROVED );
+ assertEquals("retval1", returnValue[0]);
+ assertEquals("retval2", returnValue[1]);
+ assertTrue(outParam.value.floatValue() == 97);
+ }
+
private void testOrderReviewApproved(OrderService orderService, Holder<Float> outParam) throws IOException {
Order order = new Order();