You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sv...@apache.org on 2007/02/23 19:54:09 UTC
svn commit: r511049 - in
/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src:
main/java/org/apache/tuscany/sca/itest/ main/resources/META-INF/sca/
test/java/org/apache/tuscany/sca/itest/
Author: svkrish
Date: Fri Feb 23 10:54:08 2007
New Revision: 511049
URL: http://svn.apache.org/viewvc?view=rev&rev=511049
Log:
Updates to test Multivalued Properties
Modified:
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/META-INF/sca/application.composite
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java?view=diff&rev=511049&r1=511048&r2=511049
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java Fri Feb 23 10:54:08 2007
@@ -19,10 +19,14 @@
package org.apache.tuscany.sca.itest;
+import java.util.Collection;
+
public interface PropertyComponent {
public String getLocation();
public String getYear();
public ComplexPropertyBean getComplexPropertyOne();
public ComplexPropertyBean getComplexPropertyTwo();
+ public ComplexPropertyBean getComplexPropertyThree();
+ public Collection<ComplexPropertyBean> getComplexPropertyFour();
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java?view=diff&rev=511049&r1=511048&r2=511049
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java Fri Feb 23 10:54:08 2007
@@ -19,6 +19,8 @@
package org.apache.tuscany.sca.itest;
+import java.util.Collection;
+
import org.osoa.sca.annotations.Property;
public class PropertyComponentImpl implements PropertyComponent {
@@ -28,6 +30,12 @@
@Property
protected ComplexPropertyBean complexPropertyTwo;
+ @Property
+ protected ComplexPropertyBean complexPropertyThree;
+
+ @Property
+ protected Collection<ComplexPropertyBean> complexPropertyFour;
+
@Property(name = "location")
protected String location = "RTP";
@@ -43,10 +51,22 @@
}
public ComplexPropertyBean getComplexPropertyOne() {
+ //System.out.println(complexPropertyOne);
return complexPropertyOne;
}
public ComplexPropertyBean getComplexPropertyTwo() {
+ //System.out.println(complexPropertyTwo);
return complexPropertyTwo;
+ }
+
+ public ComplexPropertyBean getComplexPropertyThree() {
+ //System.out.println(complexPropertyThree);
+ return complexPropertyThree;
+ }
+
+ public Collection<ComplexPropertyBean> getComplexPropertyFour() {
+ //System.out.println(complexPropertyThree);
+ return complexPropertyFour;
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/META-INF/sca/application.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/META-INF/sca/application.composite?view=diff&rev=511049&r1=511048&r2=511049
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/META-INF/sca/application.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/META-INF/sca/application.composite Fri Feb 23 10:54:08 2007
@@ -18,109 +18,167 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:foo="http://foo"
- name="PropertyTest">
-
- <!-- <property name="manyValued" type="xsd:string" many="true"/> -->
-
+ xmlns:foo="http://foo"
+ name="PropertyTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<property name="number" type="xsd:int">1</property>
-
- <property name="complex" type="foo:MyComplexType">
- <foo:a>a</foo:a>
- <foo:b>b</foo:b>
- <foo:c>c</foo:c>
- <foo:d>d</foo:d>
- <foo:x>
- <y>y</y>
- <z>z</z>
- </foo:x>
- </property>
-
- <property name="moreComplex" type="foo:MyMoreComplexType">
- <foo:stringArray>TestString_1</foo:stringArray>
- <foo:stringArray>TestString_2</foo:stringArray>
- <foo:intArray>10</foo:intArray>
- <foo:integerNumber>27</foo:integerNumber>
- <foo:floatNumber>79.34</foo:floatNumber>
- <foo:doubleArray>25.52</foo:doubleArray>
- <foo:doubleNumber>184.52</foo:doubleNumber>
- <foo:doubleArray>50.05</foo:doubleArray>
- <foo:intArray>20</foo:intArray>
- <foo:numberSetArray>
- <foo:integerNumber>1</foo:integerNumber>
- <foo:floatNumber>11</foo:floatNumber>
- <foo:doubleNumber>111</foo:doubleNumber>
- </foo:numberSetArray>
- <foo:numberSetArray>
- <foo:integerNumber>2</foo:integerNumber>
- <foo:floatNumber>22</foo:floatNumber>
- <foo:doubleNumber>222</foo:doubleNumber>
- </foo:numberSetArray>
- <foo:numberSet>
- <foo:integerNumber>54</foo:integerNumber>
- <foo:floatNumber>158.68</foo:floatNumber>
- <foo:doubleNumber>369.04</foo:doubleNumber>
- </foo:numberSet>
- </property>
+ <property name="complex" type="foo:MyComplexType" >
+ <foo:MyComplexValue xmlns:foo="http://foo" xsi:type="foo:MyComplexType" >
+ <foo:a>a</foo:a>
+ <foo:b>b</foo:b>
+ <foo:c>c</foo:c>
+ <foo:d>d</foo:d>
+ <foo:x>
+ <foo:y>y</foo:y>
+ <foo:z>z</foo:z>
+ </foo:x>
+ </foo:MyComplexValue>
+ </property>
- <component name="ABCDComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.ABCDComponentImpl"/>
+ <property name="moreComplex" type="foo:MyMoreComplexType">
+ <foo:MyMoreComplexValue xsi:type="foo:MyMoreComplexType">
+ <foo:stringArray>TestString_1</foo:stringArray>
+ <foo:stringArray>TestString_2</foo:stringArray>
+ <foo:intArray>10</foo:intArray>
+ <foo:integerNumber>27</foo:integerNumber>
+ <foo:floatNumber>79.34</foo:floatNumber>
+ <foo:doubleArray>25.52</foo:doubleArray>
+ <foo:doubleNumber>184.52</foo:doubleNumber>
+ <foo:doubleArray>50.05</foo:doubleArray>
+ <foo:intArray>20</foo:intArray>
+ <foo:numberSetArray>
+ <foo:integerNumber>1</foo:integerNumber>
+ <foo:floatNumber>11</foo:floatNumber>
+ <foo:doubleNumber>111</foo:doubleNumber>
+ </foo:numberSetArray>
+ <foo:numberSetArray>
+ <foo:integerNumber>2</foo:integerNumber>
+ <foo:floatNumber>22</foo:floatNumber>
+ <foo:doubleNumber>222</foo:doubleNumber>
+ </foo:numberSetArray>
+ <foo:numberSet>
+ <foo:integerNumber>54</foo:integerNumber>
+ <foo:floatNumber>158.68</foo:floatNumber>
+ <foo:doubleNumber>369.04</foo:doubleNumber>
+ </foo:numberSet>
+ </foo:MyMoreComplexValue>
+ </property>
+
+ <component name="ABCDComponent">
+ <implementation.java class="org.apache.tuscany.sca.itest.ABCDComponentImpl"/>
<reference name="ab">ABComponent</reference>
<reference name="cd">CDComponent</reference>
</component>
-
+
<component name="ABComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.ABComponentImpl"/>
- <property name="a" source="$complex/foo:a"/>
- <property name="b" source="$complex/foo:b"/>
- <property name="f" source="$complex/foo:a">f</property>
- <property name="xpath" source="$complex/foo:x/*[local-name()='z']"/>
- <property name="one" source="$number"/>
+ <implementation.java class="org.apache.tuscany.sca.itest.ABComponentImpl"/>
+ <!--property name="a" source="$complex/foo:MyComplexValue/foo:a"/>
+ <property name="b" source="$complex/foo:MyComplexValue/foo:b"/>
+ <property name="f" source="$complex/foo:MyComplexValue/foo:a">f</property>
+ <property name="xpath" source="$complex/foo:MyComplexValue/foo:x/*[local-name()='z']"/>
+ <property name="one" source="$number"/-->
</component>
-
+
<component name="CDComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.CDComponentImpl"/>
- <property name="c" source="$complex/foo:c"/>
- <property name="d" source="$complex/foo:d"/>
- <property name="nosource">aValue</property>
- <property name="fileProperty" file="META-INF/sca/fileProperty.txt"/>
- <property name="nonFileProperty" file="META-INF/sca/fileProperty.txt" source="$complex/foo:c"/>
- <property name="two" source="$number">2</property>
- </component>
-
+ <implementation.java class="org.apache.tuscany.sca.itest.CDComponentImpl"/>
+ <!--property name="c" source="$complex/foo:MyComplexValue/foo:c"/>
+ <property name="d" source="$complex/foo:MyComplexValue/foo:d"/>
+ <property name="nosource">aValue</property>
+ <property name="fileProperty" file="META-INF/sca/fileProperty.txt"/>
+ <property name="nonFileProperty" file="META-INF/sca/fileProperty.txt" source="$complex/foo:MyComplexValue/foo:c"/>
+ <property name="two" source="$number">2</property-->
+ </component>
+
<component name="PropertyComponent">
<implementation.java class="org.apache.tuscany.sca.itest.PropertyComponentImpl"/>
<property name="complexPropertyOne" source="$moreComplex"></property>
<property name="complexPropertyTwo">
- <foo:stringArray>TestString_1</foo:stringArray>
- <foo:stringArray>TestString_2</foo:stringArray>
- <foo:intArray>10</foo:intArray>
- <foo:integerNumber>27</foo:integerNumber>
- <foo:floatNumber>79.34</foo:floatNumber>
- <foo:doubleArray>25.52</foo:doubleArray>
- <foo:doubleNumber>184.52</foo:doubleNumber>
- <foo:doubleArray>50.05</foo:doubleArray>
- <foo:intArray>20</foo:intArray>
- <foo:numberSetArray>
- <foo:integerNumber>1</foo:integerNumber>
- <foo:floatNumber>11</foo:floatNumber>
- <foo:doubleNumber>111</foo:doubleNumber>
- </foo:numberSetArray>
- <foo:numberSetArray>
- <foo:integerNumber>2</foo:integerNumber>
- <foo:floatNumber>22</foo:floatNumber>
- <foo:doubleNumber>222</foo:doubleNumber>
- </foo:numberSetArray>
- <foo:numberSet>
- <foo:integerNumber>54</foo:integerNumber>
- <foo:floatNumber>158.68</foo:floatNumber>
- <foo:doubleNumber>369.04</foo:doubleNumber>
- </foo:numberSet>
+ <foo:MyAnotherComplexValue>
+ <foo:stringArray>TestString_1</foo:stringArray>
+ <foo:stringArray>TestString_2</foo:stringArray>
+ <foo:intArray>10</foo:intArray>
+ <foo:integerNumber>27</foo:integerNumber>
+ <foo:floatNumber>79.34</foo:floatNumber>
+ <foo:doubleArray>25.52</foo:doubleArray>
+ <foo:doubleNumber>184.52</foo:doubleNumber>
+ <foo:doubleArray>50.05</foo:doubleArray>
+ <foo:intArray>20</foo:intArray>
+ <foo:numberSetArray>
+ <foo:integerNumber>1</foo:integerNumber>
+ <foo:floatNumber>11</foo:floatNumber>
+ <foo:doubleNumber>111</foo:doubleNumber>
+ </foo:numberSetArray>
+ <foo:numberSetArray>
+ <foo:integerNumber>2</foo:integerNumber>
+ <foo:floatNumber>22</foo:floatNumber>
+ <foo:doubleNumber>222</foo:doubleNumber>
+ </foo:numberSetArray>
+ <foo:numberSet>
+ <foo:integerNumber>54</foo:integerNumber>
+ <foo:floatNumber>158.68</foo:floatNumber>
+ <foo:doubleNumber>369.04</foo:doubleNumber>
+ </foo:numberSet>
+ </foo:MyAnotherComplexValue>
+ </property>
+ <property name="complexPropertyThree" element="foo:PropertyThreeElement" xmlns:foo="http://foo">
+ <foo:PropertyThreeElement>
+ <foo:stringArray>TestElementString_1</foo:stringArray>
+ <foo:stringArray>TestElementString_2</foo:stringArray>
+ <foo:intArray>10</foo:intArray>
+ <foo:integerNumber>27</foo:integerNumber>
+ <foo:floatNumber>79.34</foo:floatNumber>
+ <foo:doubleArray>25.52</foo:doubleArray>
+ <foo:doubleNumber>184.52</foo:doubleNumber>
+ <foo:doubleArray>50.05</foo:doubleArray>
+ <foo:intArray>20</foo:intArray>
+ <foo:numberSetArray>
+ <foo:integerNumber>1</foo:integerNumber>
+ <foo:floatNumber>11</foo:floatNumber>
+ <foo:doubleNumber>111</foo:doubleNumber>
+ </foo:numberSetArray>
+ <foo:numberSetArray>
+ <foo:integerNumber>2</foo:integerNumber>
+ <foo:floatNumber>22</foo:floatNumber>
+ <foo:doubleNumber>222</foo:doubleNumber>
+ </foo:numberSetArray>
+ <foo:numberSet>
+ <foo:integerNumber>54</foo:integerNumber>
+ <foo:floatNumber>158.68</foo:floatNumber>
+ <foo:doubleNumber>369.04</foo:doubleNumber>
+ </foo:numberSet>
+ </foo:PropertyThreeElement>
+ </property>
+ <property name="complexPropertyFour" element="foo:PropertyFourElement" xmlns:foo="http://foo">
+ <foo:PropertyFourElement>
+ <foo:integerNumber>1</foo:integerNumber>
+ <foo:floatNumber>11.11</foo:floatNumber>
+ <foo:doubleNumber>111.111</foo:doubleNumber>
+ <foo:numberSet>
+ <foo:integerNumber>11</foo:integerNumber>
+ <foo:floatNumber>1111.1111</foo:floatNumber>
+ <foo:doubleNumber>11111.11111</foo:doubleNumber>
+ </foo:numberSet>
+ </foo:PropertyFourElement>
+ <foo:PropertyFourElement>
+ <foo:integerNumber>2</foo:integerNumber>
+ <foo:floatNumber>22.22</foo:floatNumber>
+ <foo:doubleNumber>222.222</foo:doubleNumber>
+ <foo:numberSet>
+ <foo:integerNumber>22</foo:integerNumber>
+ <foo:floatNumber>2222.2222</foo:floatNumber>
+ <foo:doubleNumber>22222.22222</foo:doubleNumber>
+ </foo:numberSet>
+ </foo:PropertyFourElement>
+ <foo:PropertyFourElement>
+ <foo:integerNumber>3</foo:integerNumber>
+ <foo:floatNumber>33.33</foo:floatNumber>
+ <foo:doubleNumber>333.333</foo:doubleNumber>
+ <foo:numberSet>
+ <foo:integerNumber>33</foo:integerNumber>
+ <foo:floatNumber>3333.3333</foo:floatNumber>
+ <foo:doubleNumber>33333.33333</foo:doubleNumber>
+ </foo:numberSet>
+ </foo:PropertyFourElement>
</property>
- </component>
-
-<!-- <component name="Override">
- <implementation.composite name="OverrideComposite" scdlLocation="override.scdl"/>
</component>
- -->
</composite>
+
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java?view=diff&rev=511049&r1=511048&r2=511049
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java Fri Feb 23 10:54:08 2007
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.itest;
-import junit.framework.TestCase;
+import java.util.Collection;
import org.apache.tuscany.test.SCATestCase;
import org.osoa.sca.CurrentCompositeContext;
@@ -32,7 +32,7 @@
// private PropertyService propertyService;
- public void testA() {
+ /*public void testA() {
assertEquals("a", abService.getA());
}
@@ -93,7 +93,7 @@
assertEquals("2006",propertyService.getYear());
}
-
+ */
public void testComplexProperty()
{
ComplexPropertyBean propBean = propertyService.getComplexPropertyOne();
@@ -105,6 +105,17 @@
assertNotNull(propBean);
assertEquals(10, propBean.intArray[0]);
assertEquals((float)22, propBean.numberSetArray[1].floatNumber);
+
+ propBean = propertyService.getComplexPropertyThree();
+ assertNotNull(propBean);
+ assertEquals("TestElementString_1", propBean.stringArray[0]);
+ assertEquals((float)22, propBean.numberSetArray[1].floatNumber);
+
+ Object[] propBeanCollection = propertyService.getComplexPropertyFour().toArray();
+ assertNotNull(propBeanCollection);
+ assertEquals(1, ((ComplexPropertyBean)propBeanCollection[0]).getIntegerNumber());
+ assertEquals(222.22, ((ComplexPropertyBean)propBeanCollection[1]).getDoubleNumber());
+ assertEquals(33, ((ComplexPropertyBean)propBeanCollection[2]).getNumberSet().getIntegerNumber());
}
protected void setUp() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org