svn commit: r654936 - in /incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src: main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/ test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/

[kwilliams]

Author: kwilliams
Date: Fri May  9 14:04:10 2008
New Revision: 654936

URL: http://svn.apache.org/viewvc?rev=654936&view=rev
Log:
More tests for conversation callback-mutiple callback fields, TUSCANY-2247

Modified:
    
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
    
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java

Modified: 
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java?rev=654936&r1=654935&r2=654936&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
 (original)
+++ 
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/main/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/multi/impl/BServiceImpl.java
 Fri May  9 14:04:10 2008
@@ -23,6 +23,7 @@
 import 
org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.AServiceCallback2;
 import 
org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.BService;
 import 
org.apache.tuscany.sca.vtest.javaapi.conversation.callback.multi.BService2;
+import org.junit.Assert;
 import org.osoa.sca.annotations.Callback;
 import org.osoa.sca.annotations.Scope;
 import org.osoa.sca.annotations.Service;
@@ -38,6 +39,10 @@
 
     @Callback
     protected AServiceCallback2 callback2;
+    
+    @Callback
+    protected AServiceCallback2 callback3;
+
 
     public void setState(String someState) {
         this.someState = someState;
@@ -52,6 +57,7 @@
     }
 
     public void testCallBack2(String someState) {
+        Assert.assertNotNull(callback3); //Spec lines 670,671
         callback2.callBack2(someState);
     }
 

Modified: 
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java?rev=654936&r1=654935&r2=654936&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
 Fri May  9 14:04:10 2008
@@ -272,14 +272,19 @@
      * callback. The following shows the declaration of two fields, each of
      * which corresponds to a particular service offered by the implementation.
      * <p>
+     * Lines 670,671
+     * <p>
+     * If a single callback has a type that is compatible with multiple 
declared
+     * callback fields, then all of them will be set.
      */
     @Test
+    @Ignore("TUSCANY-2311")
     public void statefulMultiBidirectional() throws Exception {
         System.out.println("Setting up for multi-bidirectional interfaces 
tests");
         domain = SCADomain.newInstance("callback-multi.composite");
         aService = domain.getService(AService.class, "AComponent");
         aService.testCallback();
-        aService.testCallback2();
+        aService.testCallback2(); //Includes test for 670,671
 
     }
 }