diff options
11 files changed, 357 insertions, 8 deletions
diff --git a/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CService.java b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CService.java new file mode 100644 index 0000000000..3664d67299 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CService.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.vtest.assembly.ctypefile; + +/** + * Simple Remotable Service + */ +public interface CService { + + public String getState(); + public String getSomeProperty(); + +} diff --git a/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/DService.java b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/DService.java new file mode 100644 index 0000000000..0d2dcb580b --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/DService.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.vtest.assembly.ctypefile; + +/** + * Simple Remotable Service + */ +public interface DService { + + public String getState(); + public String getSomeProperty(); + +} diff --git a/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.java b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.java new file mode 100644 index 0000000000..659eff8798 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.java @@ -0,0 +1,38 @@ +/* + * 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.vtest.assembly.ctypefile.impl; + +import org.apache.tuscany.sca.vtest.assembly.ctypefile.CService; + +public class CServiceImpl implements CService { + + //@Property + protected String someProperty = "test"; + + public String getState() { + return "SomeStateFromB"; + } + + public String getSomeProperty() { + return someProperty; + } + +} + diff --git a/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.java b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.java new file mode 100644 index 0000000000..dce6e24902 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.java @@ -0,0 +1,38 @@ +/* + * 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.vtest.assembly.ctypefile.impl; + +import org.apache.tuscany.sca.vtest.assembly.ctypefile.DService; + +public class DServiceImpl implements DService { + + //@Property + protected String someProperty = "test"; + + public String getState() { + return "SomeStateFromB"; + } + + public String getSomeProperty() { + return someProperty; + } + +} + diff --git a/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/constrainingtype.composite b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/constrainingtype.composite new file mode 100644 index 0000000000..715e22b318 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/constrainingtype.composite @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://assembly-tests" + name="Assemby-component-typefile-Composite"> + + <component name="CComponent"> + <implementation.java class="org.apache.tuscany.sca.vtest.assembly.ctypefile.impl.CServiceImpl"/> + </component> + +</composite> diff --git a/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/noconstrainingtype.composite b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/noconstrainingtype.composite new file mode 100644 index 0000000000..a8ae946647 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/noconstrainingtype.composite @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://assembly-tests" + name="Assemby-component-typefile-Composite"> + + <component name="DComponent"> + <implementation.java class="org.apache.tuscany.sca.vtest.assembly.ctypefile.impl.DServiceImpl"/> + </component> + +</composite> diff --git a/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.componentType b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.componentType new file mode 100644 index 0000000000..4a0fed82ac --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.componentType @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="ASCII"?> +<!-- + * 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. +--> +<componentType + xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://assembly-tests" + constrainingType="xmlns:CT"> + + <service name="CService"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.ctypefile.CService"/> + </service> + +</componentType>
\ No newline at end of file diff --git a/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.constrainingType b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.constrainingType new file mode 100644 index 0000000000..e639b55986 --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/CServiceImpl.constrainingType @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="ASCII"?> +<!-- + * 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. +--> +<constrainingType + xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://assembly-tests" + name="CT"> + <service name="CService"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.ctypefile.CService"/> + </service> +</constrainingType> diff --git a/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.componentType b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.componentType new file mode 100644 index 0000000000..47e7a4b6ea --- /dev/null +++ b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/DServiceImpl.componentType @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="ASCII"?> +<!-- + * 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. +--> +<componentType + xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://assembly-tests" + constrainingType="xmlns:DT"> + + <service name="DService"> + <interface.java interface="org.apache.tuscany.sca.vtest.assembly.ctypefile.DService"/> + </service> + +</componentType>
\ No newline at end of file diff --git a/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/typefile.composite b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/typefile.composite index 889bb846ba..634101d95b 100644 --- a/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/typefile.composite +++ b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/main/resources/typefile.composite @@ -33,8 +33,8 @@ <property name="someProperty">compositeValue</property> </component> - <!-- component name="BComponent2"> + <component name="BComponent2"> <implementation.java class="org.apache.tuscany.sca.vtest.assembly.ctypefile.impl.BServiceImpl"/> - </component--> + </component> </composite> diff --git a/branches/sca-java-1.x/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java index f8f7e45f61..d2d2257277 100644 --- a/branches/sca-java-1.x/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java +++ b/branches/sca-java-1.x/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java @@ -31,23 +31,25 @@ import org.junit.Test; */ public class CompomnentTypeFileTestCase { - protected static String compositeName = "typefile.composite"; + //protected static String compositeName = "typefile.composite"; protected static AService aService = null; protected static BService bService2 = null; + protected static CService cService = null; + protected static DService dService = null; - @BeforeClass - public static void init() throws Exception { + //@BeforeClass + public static void init(String compositeName) throws Exception { try { System.out.println("Setting up"); ServiceFinder.init(compositeName); - aService = ServiceFinder.getService(AService.class, "AComponent/AService"); - bService2 = ServiceFinder.getService(BService.class, "BComponent2/BService"); + //aService = ServiceFinder.getService(AService.class, "AComponent/AService"); + //bService2 = ServiceFinder.getService(BService.class, "BComponent2/BService"); } catch (Exception ex) { ex.printStackTrace(); } } - @AfterClass + //@AfterClass public static void destroy() throws Exception { System.out.println("Cleaning up"); @@ -74,7 +76,11 @@ public class CompomnentTypeFileTestCase { */ @Test public void typeFile1() throws Exception { + init("typefile.composite"); + aService = ServiceFinder.getService(AService.class, "AComponent/AService"); + bService2 = ServiceFinder.getService(BService.class, "BComponent2/BService"); Assert.assertSame("SomeStateFromB", aService.getState()); + destroy(); } /** @@ -89,8 +95,12 @@ public class CompomnentTypeFileTestCase { */ @Test public void typeFile2() throws Exception { + init("typefile.composite"); + aService = ServiceFinder.getService(AService.class, "AComponent/AService"); + bService2 = ServiceFinder.getService(BService.class, "BComponent2/BService"); Assert.assertSame("SomeStateFromB", aService.getState()); Assert.assertSame("SomeStateFromB", aService.getState2()); + destroy(); } /** @@ -101,11 +111,73 @@ public class CompomnentTypeFileTestCase { */ @Test public void typeFile3() throws Exception { + init("typefile.composite"); + aService = ServiceFinder.getService(AService.class, "AComponent/AService"); + bService2 = ServiceFinder.getService(BService.class, "BComponent2/BService"); Assert.assertEquals("compositeValue", aService.getBProperty()); + destroy(); } public void typeFile31() throws Exception { + init("typefile.composite"); + aService = ServiceFinder.getService(AService.class, "AComponent/AService"); + bService2 = ServiceFinder.getService(BService.class, "BComponent2/BService"); Assert.assertEquals("componentTypeValue", bService2.getSomeProperty()); + destroy(); } + + /** + * Lines 2204-2205: + * <p> + * A constrainingType can be applied to an implementation. In this case, + * the implementation's componentType has a constrainingType attribute set to + * the QName of the constrainingType. + * <p> + * ASM40002 + * <p> + * If present, the @constrainingType attribute of a <componentType/> element + * MUST reference a <constrainingType/> element in the Domain through its QName. + * <p> + * Description of how the OSOA function differs from the OASIS function: + * <p> + * The OASIS spec explicitly requires the <constrainingType/> element, + * whereas the OSOA spec implies the <constrainingType/> element is needed. + * <p> + */ + @Test + public void ASM40002_positive() throws Exception { + System.out.println("Running ASM40002 positive test"); + init("constrainingtype.composite"); + cService = ServiceFinder.getService(CService.class, "CComponent/CService"); + cService.getSomeProperty(); + destroy(); + } + + /** + * Lines 2204-2205: + * <p> + * A constrainingType can be applied to an implementation. In this case, + * the implementation's componentType has a constrainingType attribute set to + * the QName of the constrainingType. + * <p> + * ASM40002 + * <p> + * If present, the @constrainingType attribute of a <componentType/> element + * MUST reference a <constrainingType/> element in the Domain through its QName. + * <p> + * Description of how the OSOA function differs from the OASIS function: + * <p> + * The OASIS spec explicitly requires the <constrainingType/> element, + * whereas the OSOA spec implies the <constrainingType/> element is needed. + * <p> + */ + @Test + public void ASM40002_negative() throws Exception { + System.out.println("Running ASM40002 negative test"); + init("noconstrainingtype.composite"); + dService = ServiceFinder.getService(DService.class, "DComponent/DService"); + dService.getSomeProperty(); + destroy(); + } } |