svn commit: r775371 - in /tuscany/java/sca/itest/callback-complex-type/src: main/java/org/apache/tuscany/sca/test/ test/java/org/apache/tuscany/sca/test/

[rfeng]

Author: rfeng
Date: Fri May 15 22:39:01 2009
New Revision: 775371

URL: http://svn.apache.org/viewvc?rev=775371&view=rev
Log:
Fix the test case

Added:
    
tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
      - copied, changed from r775259, 
tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
Removed:
    
tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
Modified:
    
tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java

Modified: 
tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java?rev=775371&r1=775370&r2=775371&view=diff
==============================================================================
--- 
tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
 (original)
+++ 
tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
 Fri May 15 22:39:01 2009
@@ -6,24 +6,25 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 package org.apache.tuscany.sca.test;
 
+import org.oasisopen.sca.annotation.Callback;
 import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
-// @Callback(CallBackCTypeCallBack.class)
+...@callback(CallBackCTypeCallBack.class)
 /**
- * 
+ *
  */
 public interface CallBackCTypeService {
 

Copied: 
tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
 (from r775259, 
tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java)
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java?p2=tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java&p1=tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java&r1=775259&r2=775371&rev=775371&view=diff
==============================================================================
--- 
tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
 (original)
+++ 
tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java
 Fri May 15 22:39:01 2009
@@ -6,20 +6,21 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 package org.apache.tuscany.sca.test;
 
 import junit.framework.TestCase;
 
+import org.apache.tuscany.sca.node.Contribution;
 import org.apache.tuscany.sca.node.ContributionLocationHelper;
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.NodeFactory;
@@ -27,7 +28,7 @@
 import org.junit.Before;
 
 //FIXME Fix this test case
-public class CallBackCTypeTestCaseFIXME extends TestCase {
+public class CallBackCTypeTestCase extends TestCase {
 
     private Node node;
     private CallBackCTypeClient aCallBackClient;
@@ -38,8 +39,10 @@
 
     @Before
     public void setUp() throws Exception {
-        String location = 
ContributionLocationHelper.getContributionLocation(".composite");
-        node = 
NodeFactory.newInstance().createNode("CallBackCTypeClient.composite");
+        String location = 
ContributionLocationHelper.getContributionLocation("CallBackCTypeClient.composite");
+        node =
+            
NodeFactory.newInstance().createNode("CallBackCTypeClient.composite", new 
Contribution("c1", location))
+                .start();
 
         aCallBackClient = node.getService(CallBackCTypeClient.class, 
"CallBackCTypeClient");
     }