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/01/25 20:15:37 UTC
svn commit: r499923 - in
/incubator/tuscany/java/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: Thu Jan 25 11:15:36 2007
New Revision: 499923
URL: http://svn.apache.org/viewvc?view=rev&rev=499923
Log:
Extended to include tests for complex properties (https://issues.apache.org/jira/browse/TUSCANY-925)
Added:
incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
Modified:
incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/testing/sca/itest/propertyTest/src/test/java/org/apache/tuscany/sca/itest/PropertyITest.java
Added: incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java?view=auto&rev=499923
==============================================================================
--- incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java (added)
+++ incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java Thu Jan 25 11:15:36 2007
@@ -0,0 +1,69 @@
+package org.apache.tuscany.sca.itest;
+
+public class ComplexPropertyBean {
+
+ protected int integerNumber = 25;
+ public float floatNumber = 50;
+ public double doubleNumber = 75;
+ public int[] intArray = null;
+ public double[] doubleArray = null;
+ protected String[] stringArray = null;
+
+ ComplexPropertyBean numberSet;
+ public ComplexPropertyBean[] numberSetArray = null;
+
+ public ComplexPropertyBean() {
+
+ }
+
+ public double getDoubleNumber() {
+ return doubleNumber;
+ }
+
+ public void setDoubleNumber(double doubleNumber) {
+ this.doubleNumber = doubleNumber;
+ }
+
+ public float getFloatNumber() {
+ return floatNumber;
+ }
+
+ public void setFloatNumber(float floatNumber) {
+ this.floatNumber = floatNumber;
+ }
+
+ public int getIntegerNumber() {
+ return integerNumber;
+ }
+
+ public void setIntegerNumber(int integerNumber) {
+ this.integerNumber = integerNumber;
+ }
+
+ public ComplexPropertyBean getNumberSet() {
+ return numberSet;
+ }
+
+ public void setNumberSet(ComplexPropertyBean numberSet) {
+ this.numberSet = numberSet;
+ }
+
+ public String toString() {
+ return Double.toString(integerNumber) + " - " +
+ Double.toString(floatNumber) + " - " +
+ Double.toString(doubleNumber) + " \n" +
+ ((intArray == null ) ? "no int array" : intArray[0] + " - " + intArray[1] + " \n " ) +
+ ((doubleArray == null ) ? "no double array" : doubleArray[0] + " - " + doubleArray[1] + " \n " ) +
+ ((stringArray == null ) ? "no string array" : stringArray[0] + " - " + stringArray[1] + " \n " ) +
+ ((numberSetArray == null ) ? "no numberset array" : numberSetArray[0] + " - " + numberSetArray[1] + " \n " ) +
+ ((numberSet == null ) ? "" : numberSet.toString());
+ }
+
+ public String[] getStringArray() {
+ return stringArray;
+ }
+
+ public void setStringArray(String[] stringArray) {
+ this.stringArray = stringArray;
+ }
+}
Modified: incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java?view=diff&rev=499923&r1=499922&r2=499923
==============================================================================
--- incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java (original)
+++ incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java Thu Jan 25 11:15:36 2007
@@ -23,4 +23,6 @@
public interface PropertyComponent {
public String getLocation();
public String getYear();
+ public ComplexPropertyBean getComplexPropertyOne();
+ public ComplexPropertyBean getComplexPropertyTwo();
}
Modified: incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java?view=diff&rev=499923&r1=499922&r2=499923
==============================================================================
--- incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java (original)
+++ incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java Thu Jan 25 11:15:36 2007
@@ -22,6 +22,12 @@
import org.osoa.sca.annotations.Property;
public class PropertyComponentImpl implements PropertyComponent {
+ @Property
+ protected ComplexPropertyBean complexPropertyOne;
+
+ @Property
+ protected ComplexPropertyBean complexPropertyTwo;
+
@Property(name = "location")
protected String location = "RTP";
@@ -34,5 +40,13 @@
public String getYear(){
return year;
+ }
+
+ public ComplexPropertyBean getComplexPropertyOne() {
+ return complexPropertyOne;
+ }
+
+ public ComplexPropertyBean getComplexPropertyTwo() {
+ return complexPropertyTwo;
}
}
Modified: incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=499923&r1=499922&r2=499923
==============================================================================
--- incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/testing/sca/itest/propertyTest/src/main/resources/META-INF/sca/default.scdl Thu Jan 25 11:15:36 2007
@@ -34,7 +34,33 @@
<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>
<component name="ABCDComponent">
@@ -64,6 +90,33 @@
<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>
+ </property>
</component>
<!-- <component name="Override">
Modified: incubator/tuscany/java/testing/sca/itest/propertyTest/src/test/java/org/apache/tuscany/sca/itest/PropertyITest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/testing/sca/itest/propertyTest/src/test/java/org/apache/tuscany/sca/itest/PropertyITest.java?view=diff&rev=499923&r1=499922&r2=499923
==============================================================================
--- incubator/tuscany/java/testing/sca/itest/propertyTest/src/test/java/org/apache/tuscany/sca/itest/PropertyITest.java (original)
+++ incubator/tuscany/java/testing/sca/itest/propertyTest/src/test/java/org/apache/tuscany/sca/itest/PropertyITest.java Thu Jan 25 11:15:36 2007
@@ -93,12 +93,24 @@
}
+ public void testComplexProperty()
+ {
+ ComplexPropertyBean propBean = propertyService.getComplexPropertyOne();
+ assertNotNull(propBean);
+ assertEquals("TestString_1", propBean.getStringArray()[0]);
+ assertEquals(2, propBean.numberSetArray[1].integerNumber);
+
+ propBean = propertyService.getComplexPropertyTwo();
+ assertNotNull(propBean);
+ assertEquals(10, propBean.intArray[0]);
+ assertEquals((float)22, propBean.numberSetArray[1].floatNumber);
+ }
+
protected void setUp() throws Exception {
super.setUp();
abService = CurrentCompositeContext.getContext().locateService(ABComponent.class, "ABComponent");
cdService = CurrentCompositeContext.getContext().locateService(CDComponent.class, "CDComponent");
abcdService = CurrentCompositeContext.getContext().locateService(ABCDComponent.class, "ABCDComponent");
propertyService = CurrentCompositeContext.getContext().locateService(PropertyComponent.class, "PropertyComponent");
- //propertyService = CurrentCompositeContext.getContext().locateService(PropertyService.class, "PropertyService");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org