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/27 16:55:50 UTC
svn commit: r512294 - in
/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src:
main/resources/META-INF/sca/application.composite
test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
Author: svkrish
Date: Tue Feb 27 07:55:48 2007
New Revision: 512294
URL: http://svn.apache.org/viewvc?view=rev&rev=512294
Log:
Uncommented tests using xpath since xpath support is now fixed in the core
Modified:
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/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=512294&r1=512293&r2=512294
==============================================================================
--- 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 Tue Feb 27 07:55:48 2007
@@ -22,7 +22,7 @@
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:MyComplexValue xmlns:foo="http://foo" xsi:type="foo:MyComplexType" >
+ <foo:MyComplexValue xsi:type="foo:MyComplexType" >
<foo:a>a</foo:a>
<foo:b>b</foo:b>
<foo:c>c</foo:c>
@@ -71,21 +71,21 @@
<component name="ABComponent">
<implementation.java class="org.apache.tuscany.sca.itest.ABComponentImpl"/>
- <!--property name="a" source="$complex/foo:MyComplexValue/foo:a"/>
+ <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"/-->
+ <property name="one" source="$number"/>
</component>
<component name="CDComponent">
<implementation.java class="org.apache.tuscany.sca.itest.CDComponentImpl"/>
- <!--property name="c" source="$complex/foo:MyComplexValue/foo:c"/>
+ <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-->
+ <property name="two" source="$number">2</property>
</component>
<component name="PropertyComponent">
@@ -119,7 +119,7 @@
</foo:numberSet>
</foo:MyAnotherComplexValue>
</property>
- <property name="complexPropertyThree" element="foo:PropertyThreeElement" xmlns:foo="http://foo">
+ <property name="complexPropertyThree" element="foo:PropertyThreeElement">
<foo:PropertyThreeElement>
<foo:stringArray>TestElementString_1</foo:stringArray>
<foo:stringArray>TestElementString_2</foo:stringArray>
@@ -147,7 +147,7 @@
</foo:numberSet>
</foo:PropertyThreeElement>
</property>
- <property name="complexPropertyFour" element="foo:PropertyFourElement" xmlns:foo="http://foo">
+ <property name="complexPropertyFour" element="foo:PropertyFourElement" >
<foo:PropertyFourElement>
<foo:integerNumber>1</foo:integerNumber>
<foo:floatNumber>11.11</foo:floatNumber>
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=512294&r1=512293&r2=512294
==============================================================================
--- 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 Tue Feb 27 07:55:48 2007
@@ -32,7 +32,7 @@
// private PropertyService propertyService;
- /*public void testA() {
+ public void testA() {
assertEquals("a", abService.getA());
}
@@ -93,24 +93,29 @@
assertEquals("2006",propertyService.getYear());
}
- */
- public void testComplexProperty()
- {
+
+ public void testComplexPropertyOne() {
ComplexPropertyBean propBean = propertyService.getComplexPropertyOne();
assertNotNull(propBean);
assertEquals("TestString_1", propBean.getStringArray()[0]);
assertEquals(2, propBean.numberSetArray[1].integerNumber);
-
- propBean = propertyService.getComplexPropertyTwo();
+ }
+
+ public void testComplexPropertyTwo() {
+ ComplexPropertyBean propBean = propertyService.getComplexPropertyTwo();
assertNotNull(propBean);
assertEquals(10, propBean.intArray[0]);
assertEquals((float)22, propBean.numberSetArray[1].floatNumber);
-
- propBean = propertyService.getComplexPropertyThree();
+ }
+
+ public void testComplexPropertyThree() {
+ ComplexPropertyBean propBean = propertyService.getComplexPropertyThree();
assertNotNull(propBean);
assertEquals("TestElementString_1", propBean.stringArray[0]);
assertEquals((float)22, propBean.numberSetArray[1].floatNumber);
-
+ }
+
+ public void testComplexPropertyFour() {
Object[] propBeanCollection = propertyService.getComplexPropertyFour().toArray();
assertNotNull(propBeanCollection);
assertEquals(1, ((ComplexPropertyBean)propBeanCollection[0]).getIntegerNumber());
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org