You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/02/26 12:30:19 UTC
svn commit: r748094 - in
/tuscany/branches/sca-java-1.x/vtest/assembly/component/src:
main/java/org/apache/tuscany/sca/vtest/assembly/component/property/
main/resources/ test/java/org/apache/tuscany/sca/vtest/assembly/component/
Author: slaws
Date: Thu Feb 26 11:30:18 2009
New Revision: 748094
URL: http://svn.apache.org/viewvc?rev=748094&view=rev
Log:
TUSCANY-2868 - Add more assembly/component test cases. Thanks for the patch Jun Guo
Added:
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_duplicate_property.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_1.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_2.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_3.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_1.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_2.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_3.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_4.composite (with props)
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java (with props)
Removed:
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referenceduplicatename.composite
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencenamemissmatch.composite
Modified:
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/zerocomponents.composite
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentBasicTestCase.java
tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentReferenceTestCase.java
Added: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java?rev=748094&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java Thu Feb 26 11:30:18 2009
@@ -0,0 +1,32 @@
+/*
+ * 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.component.property;
+
+/**
+ *
+ *
+ */
+public interface ServiceA {
+
+ String getServiceName() ;
+
+ String getStrProperty() ;
+
+ Object getObjProperty() ;
+}
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceA.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java?rev=748094&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java Thu Feb 26 11:30:18 2009
@@ -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.vtest.assembly.component.property;
+
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Service;
+
+/**
+ *
+ *
+ */
+@Service(ServiceA.class)
+public class ServiceAImpl implements ServiceA{
+
+ @Property
+ protected String strProperty ;
+
+ @Property
+ protected Object objProperty ;
+
+
+ public String getServiceName() {
+ return "AService" ;
+ }
+
+ public String getStrProperty() {
+
+ return strProperty ;
+ }
+
+ public Object getObjProperty() {
+
+ return objProperty ;
+ }
+}
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceAImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java?rev=748094&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java Thu Feb 26 11:30:18 2009
@@ -0,0 +1,32 @@
+/*
+ * 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.component.property;
+
+import org.osoa.sca.annotations.Property;
+
+/**
+ *
+ *
+ */
+public interface ServiceB {
+
+ Object getObjProperty() ;
+ String getStrProperty() ;
+ int getIntProperty() ;
+}
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceB.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java?rev=748094&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java Thu Feb 26 11:30:18 2009
@@ -0,0 +1,56 @@
+/*
+ * 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.component.property;
+
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Service;
+
+/**
+ *
+ *
+ */
+@Service(ServiceB.class)
+public class ServiceBImpl implements ServiceB{
+
+ @Property
+ protected Object objProperty ;
+
+ @Property
+ protected String strProperty ;
+
+// @Property
+// protected int intProperty ;
+
+ public Object getObjProperty() {
+ return objProperty ;
+ }
+
+ public String getStrProperty() {
+
+ return strProperty ;
+ }
+
+ public int getIntProperty() {
+
+ return 100 ;
+// return intProperty ;
+ }
+
+}
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceBImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java?rev=748094&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java Thu Feb 26 11:30:18 2009
@@ -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.component.property;
+
+/**
+ *
+ *
+ */
+public interface ServiceC {
+
+ String getStrProperty() ;
+ Object getObjProperty() ;
+}
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceC.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java?rev=748094&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java Thu Feb 26 11:30:18 2009
@@ -0,0 +1,44 @@
+/*
+ * 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.component.property;
+
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Service;
+
+/**
+ *
+ *
+ */
+@Service(ServiceC.class)
+public class ServiceCImpl implements ServiceC{
+
+ @Property
+ protected String strProperty ;
+
+ @Property(name="objProperty")
+ protected String objProperty ;
+
+ public String getStrProperty() {
+ return strProperty ;
+ }
+
+ public Object getObjProperty() {
+ return objProperty ;
+ }
+}
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/java/org/apache/tuscany/sca/vtest/assembly/component/property/ServiceCImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_duplicate_property.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_duplicate_property.composite?rev=748094&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_duplicate_property.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_duplicate_property.composite Thu Feb 26 11:30:18 2009
@@ -0,0 +1,35 @@
+<?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-Composite">
+
+ <component name="AComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.property.ServiceAImpl"/>
+
+ <property name="strProperty">value1</property>
+ <property name="strProperty">value2</property>
+
+
+ </component>
+
+
+</composite>
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_duplicate_property.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_duplicate_property.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_duplicate_property.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_1.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_1.composite?rev=748094&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_1.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_1.composite Thu Feb 26 11:30:18 2009
@@ -0,0 +1,48 @@
+<?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--Composite">
+
+ <component name="AComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.property.ServiceAImpl"/>
+
+ <property name="strProperty">I am a string</property>
+ <property name="objProperty">I am a object</property>
+
+ </component>
+
+ <component name="BComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.property.ServiceBImpl"/>
+ <property name="strProperty" type="xsd:string">
+ <value>I am a string</value>
+ </property>
+ <!--
+ <property name="intProperty" value="100" type="xsd:int"/>
+ -->
+
+ <property name="objProperty" value="I am a object"/>
+
+ </component>
+
+
+
+</composite>
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_1.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_1.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_1.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_2.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_2.composite?rev=748094&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_2.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_2.composite Thu Feb 26 11:30:18 2009
@@ -0,0 +1,52 @@
+<?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--Composite">
+
+ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns="http://www.example.com/Customer" targetNamespace="http://www.example.com/Customer">
+
+ <xsd:element name="customer" type="Customer"/>
+ <xsd:complexType name="Customer">
+ <xsd:sequence>
+ <xsd:element name="firstName" type="xsd:string"/>
+ <xsd:element name="middleName" type="xsd:string"/>
+ <xsd:element name="lastName" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+
+ <component name="CComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.property.ServiceCImpl"/>
+ <!--
+ <property name="customerInfo" xsi:type="Customer">
+
+ <firstName>Ku</firstName>
+ <middleName>Jun</middleName>
+ <lastName>Guo</lastName>
+
+ </property>
+ -->
+
+ </component>
+
+</composite>
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_2.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_2.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_2.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_3.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_3.composite?rev=748094&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_3.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_3.composite Thu Feb 26 11:30:18 2009
@@ -0,0 +1,38 @@
+<?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--Composite">
+
+
+ <component name="CComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.property.ServiceCImpl"/>
+
+ <property name="strProperty">
+ I am a string
+ </property>
+ <property name="objectProperty">
+ I am an object
+ </property>
+
+ </component>
+
+</composite>
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_3.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_3.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/component_property_3.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite?rev=748094&r1=748093&r2=748094&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_moretargets.composite Thu Feb 26 11:30:18 2009
@@ -20,7 +20,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://assembly-tests.component.reference"
+ targetNamespace="http://assembly-tests"
name="Assemby-component">
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite?rev=748094&r1=748093&r2=748094&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_multitargets.composite Thu Feb 26 11:30:18 2009
@@ -20,7 +20,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://assembly-tests.component.reference"
+ targetNamespace="http://assembly-tests"
name="Assemby-component">
<component name="ClientComponent">
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite?rev=748094&r1=748093&r2=748094&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_ntargets.composite Thu Feb 26 11:30:18 2009
@@ -20,7 +20,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://assembly-tests.component.reference"
+ targetNamespace="http://assembly-tests"
name="Assemby-component">
<component name="ClientComponent">
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite?rev=748094&r1=748093&r2=748094&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_multiplicity_zerotarget.composite Thu Feb 26 11:30:18 2009
@@ -20,7 +20,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://assembly-tests.component.reference"
+ targetNamespace="http://assembly-tests"
name="Assemby-component">
<component name="ClientComponent">
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite?rev=748094&r1=748093&r2=748094&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/reference_wiredbyimpl.composite Thu Feb 26 11:30:18 2009
@@ -20,7 +20,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://mynsss.com"
+ targetNamespace="http://assembly-tests"
name="Assemby-component">
<component name="ClientComponent">
Added: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_1.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_1.composite?rev=748094&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_1.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_1.composite Thu Feb 26 11:30:18 2009
@@ -0,0 +1,50 @@
+<?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-reference">
+
+ <component name="ClientComponent1">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/>
+
+ <service name="MyClientA">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/>
+ </service>
+
+ <reference name="b" target="ServiceComponent/MyService">
+ </reference>
+
+ <reference name="bService" target="ServiceComponent/MyService">
+ </reference>
+
+ </component>
+
+
+
+ <component name="ServiceComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
+ <service name="MyService">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>
+ </service>
+ </component>
+
+</composite>
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_1.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_1.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_1.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_2.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_2.composite?rev=748094&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_2.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_2.composite Thu Feb 26 11:30:18 2009
@@ -0,0 +1,51 @@
+<?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-reference">
+
+
+
+ <component name="ClientComponent2">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/>
+
+ <service name="MyClientA">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/>
+ </service>
+
+ <reference name="b" target="ServiceComponent/MyService">
+ </reference>
+
+ <reference name="b" target="ServiceComponent/MyService">
+ </reference>
+
+ </component>
+
+
+ <component name="ServiceComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
+ <service name="MyService">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>
+ </service>
+ </component>
+
+</composite>
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_2.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_2.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_2.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_3.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_3.composite?rev=748094&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_3.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_3.composite Thu Feb 26 11:30:18 2009
@@ -0,0 +1,52 @@
+<?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.
+-->
+<!--to test the reference name matched with implementation-->
+
+<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-reference">
+
+
+ <component name="ClientComponent1">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/>
+
+ <service name="MyClientA">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/>
+ </service>
+
+ <reference name="b" target="ServiceComponent/MyService">
+ </reference>
+
+ <reference name="bService" target="ServiceComponent/MyService">
+ </reference>
+
+ </component>
+
+
+ <component name="ServiceComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
+ <service name="MyService">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>
+ </service>
+ </component>
+
+</composite>
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_3.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_3.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_3.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_4.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_4.composite?rev=748094&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_4.composite (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_4.composite Thu Feb 26 11:30:18 2009
@@ -0,0 +1,53 @@
+<?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.
+-->
+<!--to test the reference name not matched with implementation-->
+
+<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-reference">
+
+
+ <component name="ClientComponent1">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientAImpl"/>
+
+ <service name="MyClientA">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyClientA"/>
+ </service>
+
+ <reference name="bb" target="ServiceComponent/MyService">
+ </reference>
+
+ <reference name="bService" target="ServiceComponent/MyService">
+ </reference>
+
+ </component>
+
+
+
+ <component name="ServiceComponent">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.component.reference.MyServiceImpl"/>
+ <service name="MyService">
+ <interface.java interface="org.apache.tuscany.sca.vtest.assembly.component.reference.MyService"/>
+ </service>
+ </component>
+
+</composite>
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_4.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_4.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/referencename_4.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/zerocomponents.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/zerocomponents.composite?rev=748094&r1=748093&r2=748094&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/zerocomponents.composite (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/main/resources/zerocomponents.composite Thu Feb 26 11:30:18 2009
@@ -21,6 +21,5 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://assembly-tests"
name="Assemby-zero-components-Composite">
-
</composite>
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentBasicTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentBasicTestCase.java?rev=748094&r1=748093&r2=748094&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentBasicTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentBasicTestCase.java Thu Feb 26 11:30:18 2009
@@ -356,5 +356,6 @@
+
}
Added: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java?rev=748094&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java (added)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java Thu Feb 26 11:30:18 2009
@@ -0,0 +1,166 @@
+/*
+ * 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.component;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.vtest.assembly.component.property.ServiceA;
+import org.apache.tuscany.sca.vtest.assembly.component.property.ServiceB;
+import org.apache.tuscany.sca.vtest.assembly.component.property.ServiceC;
+import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * This test case covers the main functionalities of component property.
+ *
+ */
+public class ComponentPropertyTestCase {
+
+ private void initDomain(String compositePath) {
+ System.out.println("Setting up");
+ ServiceFinder.init(compositePath);
+ }
+
+ private void cleanupDomain() {
+ System.out.println("Cleaning up");
+ ServiceFinder.cleanup();
+ }
+
+ /**
+ *
+ * <p>
+ * OSOA
+ * The property has no @value attribute now.
+ * <p>
+ * ASM50027
+ * <p>
+ * OASIS:
+ * If the @value attribute of a component property element is declared, the type of the
+ * property MUST be an XML Schema simple type and the @value attribute MUST
+ * contain a single value of that type
+ */
+ @Test
+ @Ignore("It will be implemented in SCA 2.x codebase")
+ public void testValueAttibuteValid_1() {
+
+ initDomain("component_property_1.composite");
+ ServiceA service = ServiceFinder.getService(ServiceA.class , "AComponent/ServiceA") ;
+ Assert.assertEquals("I am a string" ,service.getStrProperty()) ;
+ Assert.assertEquals("I am a object" ,service.getObjProperty()) ;
+ cleanupDomain();
+
+ }
+
+ /**
+ * <p>
+ * OSOA
+ * The property has no @value attribute now.
+ * <p>
+ * ASM50027
+ * <p>
+ * OASIS:
+ * If the @value attribute of a component property element is declared, the type of the
+ * property MUST be an XML Schema simple type and the @value attribute MUST
+ * contain a single value of that type
+ */
+ @Test
+ @Ignore("It will be implemented in SCA 2.x codebase")
+ public void testValueAttibuteValid_2() {
+
+ initDomain("component_property_1.composite");
+ ServiceB service = ServiceFinder.getService(ServiceB.class , "BComponent/ServiceB") ;
+// Assert.assertEquals("I am a object" ,service.getObjProperty()) ;
+ //It will fail to get the value from composite file, so it will be an empty string
+ System.out.println("::::" + service.getStrProperty());
+// System.out.println("::::" + service.getIntProperty());
+// Assert.assertEquals("I am a string" ,service.getStrProperty()) ;
+
+ Assert.assertEquals("" ,service.getObjProperty()) ;
+ cleanupDomain();
+
+ }
+
+ /**
+ * <p>
+ * OSOA
+ * Not mentioned in OSOA
+ * <p>
+ * ASM50030
+ * <p>
+ * OASIS:
+ * A <component/> element MUST NOT contain two <property/> subelements with the
+ * same value of the @name attribute
+ */
+ @Test
+ @Ignore("TUSCANY-2863")
+ public void testDuplicateProperty() {
+
+ initDomain("component_duplicate_property.composite");
+ ServiceA service = ServiceFinder.getService(ServiceA.class , "AComponent/ServiceA") ;
+// System.out.println(service.getStrProperty()) ;
+ Assert.assertEquals("value1", service.getStrProperty()) ;
+ cleanupDomain();
+
+ }
+
+ /**
+ * <p>
+ * OSOA
+ * No corresponding statements in OSOA.
+ * <p>
+ * ASM50031
+ * <p>
+ * OASIS:
+ * The name attribute of a component property MUST match the name of a property
+ * element in the component type of the component implementation.
+ */
+ @Test
+ public void testPropertyNameMatched() {
+
+ initDomain("component_property_3.composite");
+ ServiceC service = ServiceFinder.getService(ServiceC.class , "CComponent/ServiceC") ;
+ Assert.assertEquals("I am a string" , service.getStrProperty()) ;
+ cleanupDomain();
+
+ }
+
+ /**
+ * <p>
+ * OSOA
+ * No corresponding statements in OSOA.
+ * <p>
+ * ASM50031
+ * <p>
+ * OASIS:
+ * The name attribute of a component property MUST match the name of a property
+ * element in the component type of the component implementation.
+ */
+ @Test
+ public void testPropertyNameNotMatched() {
+
+ initDomain("component_property_3.composite");
+ ServiceC service = ServiceFinder.getService(ServiceC.class , "CComponent/ServiceC") ;
+ Assert.assertNull(service.getObjProperty()) ;
+ cleanupDomain();
+
+ }
+
+
+}
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentPropertyTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentReferenceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentReferenceTestCase.java?rev=748094&r1=748093&r2=748094&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentReferenceTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/vtest/assembly/component/src/test/java/org/apache/tuscany/sca/vtest/assembly/component/ComponentReferenceTestCase.java Thu Feb 26 11:30:18 2009
@@ -61,17 +61,14 @@
* reference elements of that <component/>
*/
@Test
- public void testComponentReferenceName() {
+ public void testReferenceNameUnique() {
- initDomain("referencename.composite");
+ initDomain("referencename_1.composite");
MyClientA service = ServiceFinder.getService(MyClientA.class, "ClientComponent1/MyClientA");
-// System.out.println(service.callOtherServices());
Assert.assertEquals("MyService:::MyService" , service.callOtherServices()) ;
cleanupDomain();
-
-
}
/**
@@ -89,10 +86,10 @@
* reference elements of that <component/>
*/
@Test
- public void testDuplicateComponentReferenceName() {
+ public void testReferenceNameDuplicated() {
//for this case, the reference of "b" in MyClientImpl is null.
try {
- initDomain("referenceduplicatename.composite");
+ initDomain("referencename_2.composite");
} catch (ServiceRuntimeException ex){
Assert.assertEquals("Duplicate component reference name: Component = ClientComponent2 Reference = b", ex.getMessage());
return;
@@ -114,13 +111,34 @@
* the name of the reference. Has to match a name of a reference defined by the implementation.
*
*/
+ @Test
+ public void testComponentReferenceNameMatched() {
+ initDomain("referencename_3.composite");
+ MyClientA service = ServiceFinder.getService(MyClientA.class, "ClientComponent1/MyClientA");
+ Assert.assertEquals("MyService:::MyService" , service.callOtherServices()) ;
+ cleanupDomain();
+ }
+
+ /**
+ * Line 192-193:
+ * <p>
+ * OSOA:
+ * the name of the reference. Has to match a name of a reference
+ * defined by the implementation.
+ * <p>
+ * ASM50008
+ * <p>
+ * OASIS:
+ * the name of the reference. Has to match a name of a reference defined by the implementation.
+ *
+ */
@Test
public void testComponentReferenceNameValid() {
try {
- initDomain("referencenamemissmatch.composite");
+ initDomain("referencename_4.composite");
} catch (ServiceRuntimeException ex){
- Assert.assertEquals("Reference not found for component reference: Component = ClientComponent1 Reference = bServiceX", ex.getMessage());
+ Assert.assertEquals("Reference not found for component reference: Component = ClientComponent1 Reference = bb", ex.getMessage());
return;
}
@@ -139,7 +157,7 @@
* wired statically within a composite, but left unwired
*/
@Test
- @Ignore("Not implemented now.")
+ @Ignore("Not implemented in SCA 1.x codebase.")
public void testWiredByImpl() {
initDomain("reference_wiredbyimpl.composite");
MyClientA service = ServiceFinder.getService(MyClientA.class, "ClientComponent/MyClientA");
@@ -147,6 +165,7 @@
cleanupDomain();
}
+
/**
* Line 208:
* <p>