Author: rfeng
Date: Sun Jun 8 00:01:28 2008
New Revision: 664458
URL: http://svn.apache.org/viewvc?rev=664458&view=rev
Log:
Get the Map and ArrayList test cases working
Modified:
incubator/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
incubator/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
Modified:
incubator/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java?rev=664458&r1=664457&r2=664458&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
(original)
+++
incubator/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
Sun Jun 8 00:01:28 2008
@@ -23,10 +23,6 @@
import java.util.List;
import java.util.Map;
-import javax.jws.WebMethod;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
/**
* The interface for HelloLocalServiceSimple.
*/
@@ -47,13 +43,13 @@
* @param names
* @return
*/
-
@RequestWrapper(className="org.apache.tuscany.sca.itest.databindings.jaxb.impl.jaxws.GetGreetingsList")
-
@ResponseWrapper(className="org.apache.tuscany.sca.itest.databindings.jaxb.impl.jaxws.GetGreetingsListResponse")
+ //
@RequestWrapper(className="org.apache.tuscany.sca.itest.databindings.jaxb.impl.jaxws.GetGreetingsList")
+ //
@ResponseWrapper(className="org.apache.tuscany.sca.itest.databindings.jaxb.impl.jaxws.GetGreetingsListResponse")
ArrayList<String> getGreetingsArrayList(ArrayList<String> names);
- @WebMethod(exclude=true)
+ // @WebMethod(exclude=true)
Map<String, String> getGreetingsMap(Map<String, String> namesMap);
- @WebMethod(exclude=true)
+ // @WebMethod(exclude=true)
HashMap<String, String> getGreetingsHashMap(HashMap<String, String>
namesMap);
}
Modified:
incubator/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java?rev=664458&r1=664457&r2=664458&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
Sun Jun 8 00:01:28 2008
@@ -29,7 +29,6 @@
import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -103,21 +102,21 @@
* Invokes the HelloServiceSimple service using SCA binding.
* Service method invoked is getGreetingsMap.
*/
-// @Test
-// public void testSCAMap() throws Exception {
-// HelloServiceSimpleClient helloServiceSimpleClient =
domain.getService(HelloServiceSimpleClient.class,
"HelloServiceSimpleClientSCAComponent");
-// performTestMap(helloServiceSimpleClient);
-// }
+ @Test
+ public void testSCAMap() throws Exception {
+ HelloServiceSimpleClient helloServiceSimpleClient =
domain.getService(HelloServiceSimpleClient.class,
"HelloServiceSimpleClientSCAComponent");
+ performTestMap(helloServiceSimpleClient);
+ }
/**
* Invokes the HelloServiceSimple service using SCA binding.
* Service method invoked is getGreetingsHashMap.
*/
-// @Test
-// public void testSCAHashMap() throws Exception {
-// HelloServiceSimpleClient helloServiceSimpleClient =
domain.getService(HelloServiceSimpleClient.class,
"HelloServiceSimpleClientSCAComponent");
-// performTestHashMap(helloServiceSimpleClient);
-// }
+ @Test
+ public void testSCAHashMap() throws Exception {
+ HelloServiceSimpleClient helloServiceSimpleClient =
domain.getService(HelloServiceSimpleClient.class,
"HelloServiceSimpleClientSCAComponent");
+ performTestHashMap(helloServiceSimpleClient);
+ }
/**
* Invokes the HelloServiceSimple service using WS binding.
@@ -153,29 +152,29 @@
* Invokes the HelloServiceSimple service using WS binding.
* Service method invoked is getGreetingsArrayList.
*/
-// @Test
-// public void testWSArrayList() throws Exception {
-// HelloServiceSimpleClient helloServiceSimpleClient =
domain.getService(HelloServiceSimpleClient.class,
"HelloServiceSimpleClientWSComponent");
-// performTestArrayList(helloServiceSimpleClient);
-// }
+ @Test
+ public void testWSArrayList() throws Exception {
+ HelloServiceSimpleClient helloServiceSimpleClient =
domain.getService(HelloServiceSimpleClient.class,
"HelloServiceSimpleClientWSComponent");
+ performTestArrayList(helloServiceSimpleClient);
+ }
/**
* Invokes the HelloServiceSimple service using WS binding.
* Service method invoked is getGreetingsMap.
*/
-// @Test
-// @Ignore
-// public void testWSMap() throws Exception {
-// HelloServiceSimpleClient helloServiceSimpleClient =
domain.getService(HelloServiceSimpleClient.class,
"HelloServiceSimpleClientWSComponent");
-// performTestMap(helloServiceSimpleClient);
-// }
+ @Test
+ // @Ignore
+ public void testWSMap() throws Exception {
+ HelloServiceSimpleClient helloServiceSimpleClient =
domain.getService(HelloServiceSimpleClient.class,
"HelloServiceSimpleClientWSComponent");
+ performTestMap(helloServiceSimpleClient);
+ }
/**
* Invokes the HelloServiceSimple service using WS binding.
* Service method invoked is getGreetingsHashMap.
*/
@Test
- @Ignore
+ // @Ignore
public void testWSHashMap() throws Exception {
HelloServiceSimpleClient helloServiceSimpleClient =
domain.getService(HelloServiceSimpleClient.class,
"HelloServiceSimpleClientWSComponent");
performTestHashMap(helloServiceSimpleClient);
@@ -225,11 +224,11 @@
* Invokes the HelloLocalServiceSimple service using SCA binding.
* Service method invoked is getGreetingsMap.
*/
-// @Test
-// public void testSCALocalMap() throws Exception {
-// HelloServiceSimpleClient helloServiceSimpleClient =
domain.getService(HelloServiceSimpleClient.class,
"HelloLocalServiceSimpleClientSCAComponent");
-// performTestMap(helloServiceSimpleClient);
-// }
+ @Test
+ public void testSCALocalMap() throws Exception {
+ HelloServiceSimpleClient helloServiceSimpleClient =
domain.getService(HelloServiceSimpleClient.class,
"HelloLocalServiceSimpleClientSCAComponent");
+ performTestMap(helloServiceSimpleClient);
+ }
/**
* Invokes the HelloLocalServiceSimple service using SCA binding.
@@ -279,7 +278,6 @@
}
}
- /*
private void performTestMap(HelloServiceSimpleClient
helloServiceSimpleClient) {
Map<String, String> namesMap = new HashMap<String, String>();
namesMap.put("Me", null);
@@ -291,7 +289,6 @@
Assert.assertEquals("Hello "+entry.getKey(),
respMap.get(entry.getKey()));
}
}
- */
private void performTestHashMap(HelloServiceSimpleClient
helloServiceSimpleClient) {
HashMap<String, String> namesMap = new HashMap<String, String>();
