From 73b30085532f863604f6861b4dd29993bd86f3f8 Mon Sep 17 00:00:00 2001 From: nash Date: Sun, 21 Aug 2011 11:55:43 +0000 Subject: TUSCANY-2735: Add tests for generic types git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1159968 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/itest/services/SubGenericsService.java | 25 +++++++++++ .../itest/services/SubGenericsServiceClient.java | 27 ++++++++++++ .../services/SubGenericsServiceClientImpl.java | 51 ++++++++++++++++++++++ .../sca/itest/services/SubGenericsServiceImpl.java | 29 ++++++++++++ .../sca/itest/services/SuperGenericsService.java | 28 ++++++++++++ .../itest/services/SuperGenericsServiceImpl.java | 29 ++++++++++++ .../src/main/resources/ServicesTest.composite | 11 +++++ .../sca/itest/services/ServicesTestCase.java | 18 ++++++++ 8 files changed, 218 insertions(+) create mode 100644 sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SubGenericsService.java create mode 100644 sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SubGenericsServiceClient.java create mode 100644 sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SubGenericsServiceClientImpl.java create mode 100644 sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SubGenericsServiceImpl.java create mode 100644 sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SuperGenericsService.java create mode 100644 sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SuperGenericsServiceImpl.java (limited to 'sca-java-1.x') diff --git a/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SubGenericsService.java b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SubGenericsService.java new file mode 100644 index 0000000000..2cc6cde689 --- /dev/null +++ b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SubGenericsService.java @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * 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. + */ + +package org.apache.tuscany.sca.itest.services; + +public interface SubGenericsService extends SuperGenericsService { + + void print(); +} diff --git a/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SubGenericsServiceClient.java b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SubGenericsServiceClient.java new file mode 100644 index 0000000000..8a156b6ee9 --- /dev/null +++ b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SubGenericsServiceClient.java @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * 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. + */ + +package org.apache.tuscany.sca.itest.services; + +public interface SubGenericsServiceClient { + + void print(); + + T doIt(T anything); +} diff --git a/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SubGenericsServiceClientImpl.java b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SubGenericsServiceClientImpl.java new file mode 100644 index 0000000000..0637e82dca --- /dev/null +++ b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SubGenericsServiceClientImpl.java @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * 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. + */ + +package org.apache.tuscany.sca.itest.services; + +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Service; + +@Service(SubGenericsServiceClient.class) +public class SubGenericsServiceClientImpl implements SubGenericsServiceClient { + + private SubGenericsService subGenericsService; + + public String doIt(String anything) { + return subGenericsService.doIt(anything); + } + + public void print() { + subGenericsService.print(); + + } + + public SubGenericsService getSubGenericsService() { + return subGenericsService; + } + + @Reference + public void setSubGenericsService(SubGenericsService subGenericsService) { + this.subGenericsService = subGenericsService; + } + + + + +} diff --git a/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SubGenericsServiceImpl.java b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SubGenericsServiceImpl.java new file mode 100644 index 0000000000..6b2ddfbe8c --- /dev/null +++ b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SubGenericsServiceImpl.java @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * 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. + */ + +package org.apache.tuscany.sca.itest.services; + + +public class SubGenericsServiceImpl extends SuperGenericsServiceImpl + implements SubGenericsService{ + + public void print(){ + System.out.println("I am print."); + } +} diff --git a/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SuperGenericsService.java b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SuperGenericsService.java new file mode 100644 index 0000000000..9a3e0f0925 --- /dev/null +++ b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SuperGenericsService.java @@ -0,0 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * 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. + */ +package org.apache.tuscany.sca.itest.services; + +/** + * The interface for SuperGenericsService. + * + */ +public interface SuperGenericsService { + + T doIt(T anything); +} diff --git a/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SuperGenericsServiceImpl.java b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SuperGenericsServiceImpl.java new file mode 100644 index 0000000000..cce2a5d355 --- /dev/null +++ b/sca-java-1.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/SuperGenericsServiceImpl.java @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * 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. + */ + +package org.apache.tuscany.sca.itest.services; + + +public abstract class SuperGenericsServiceImpl implements SuperGenericsService{ + + public T doIt(T anything){ + return anything; + } + +} diff --git a/sca-java-1.x/trunk/itest/services/src/main/resources/ServicesTest.composite b/sca-java-1.x/trunk/itest/services/src/main/resources/ServicesTest.composite index eda885f9ec..b1843d04bb 100644 --- a/sca-java-1.x/trunk/itest/services/src/main/resources/ServicesTest.composite +++ b/sca-java-1.x/trunk/itest/services/src/main/resources/ServicesTest.composite @@ -66,5 +66,16 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/sca-java-1.x/trunk/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/sca-java-1.x/trunk/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java index 4857b751b9..b7552281ac 100644 --- a/sca-java-1.x/trunk/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java +++ b/sca-java-1.x/trunk/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java @@ -99,6 +99,22 @@ public class ServicesTestCase { } + @Test + public void testSCASubGenericsServiceDoIt() throws Exception{ + @SuppressWarnings("unchecked") + SubGenericsServiceClient subGenericsServiceClient = domain.getService(SubGenericsServiceClient.class, "SubGenericsServiceClientSCAComponent"); + String actual = "noting"; + String expected = subGenericsServiceClient.doIt(actual); + Assert.assertEquals(actual, expected); + } + + @Test + public void testSCASubGenericsServicePrint() throws Exception{ + @SuppressWarnings("unchecked") + SubGenericsServiceClient subGenericsServiceClient = domain.getService(SubGenericsServiceClient.class, "SubGenericsServiceClientSCAComponent"); + subGenericsServiceClient.print(); + } + public static void main(String[] args) throws Exception { ServicesTestCase.init(); ServicesTestCase tester = new ServicesTestCase(); @@ -106,6 +122,8 @@ public class ServicesTestCase { tester.testBService(); tester.testCService(); tester.testDService(); + tester.testSCASubGenericsServiceDoIt(); + tester.testSCASubGenericsServicePrint(); ServicesTestCase.destroy(); } } -- cgit v1.2.3