You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2008/07/08 06:43:55 UTC
svn commit: r674715 - in /tuscany/java/sca/vtest/assembly/ctypefile/src:
main/resources/
main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/
test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/
Author: lresende
Date: Mon Jul 7 21:43:55 2008
New Revision: 674715
URL: http://svn.apache.org/viewvc?rev=674715&view=rev
Log:
TUSCANY-2390 - Enabling the disable test and adding new one
Modified:
tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite
tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
Modified: tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
URL: http://svn.apache.org/viewvc/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType?rev=674715&r1=674714&r2=674715&view=diff
==============================================================================
--- tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType (original)
+++ tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType Mon Jul 7 21:43:55 2008
@@ -22,7 +22,7 @@
<interface.java interface="org.apache.tuscany.sca.vtest.assembly.ctypefile.BService"/>
</service>
- <property name="someProperty" type="xsd:string">SomePropertyValue</property>
+ <property name="someProperty" type="xsd:string">componentTypeValue</property>
</componentType>
\ No newline at end of file
Modified: tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite?rev=674715&r1=674714&r2=674715&view=diff
==============================================================================
--- tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite (original)
+++ tuscany/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite Mon Jul 7 21:43:55 2008
@@ -30,7 +30,11 @@
<component name="BComponent">
<implementation.java class="org.apache.tuscany.sca.vtest.assembly.ctypefile.impl.BServiceImpl"/>
- <property name="someProperty"></property>
+ <property name="someProperty">compositeValue</property>
</component>
+
+ <!-- component name="BComponent2">
+ <implementation.java class="org.apache.tuscany.sca.vtest.assembly.ctypefile.impl.BServiceImpl"/>
+ </component-->
</composite>
Modified: tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java?rev=674715&r1=674714&r2=674715&view=diff
==============================================================================
--- tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java (original)
+++ tuscany/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java Mon Jul 7 21:43:55 2008
@@ -24,7 +24,6 @@
import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -34,6 +33,7 @@
protected static String compositeName = "typefile.composite";
protected static AService aService = null;
+ protected static BService bService2 = null;
@BeforeClass
public static void init() throws Exception {
@@ -41,6 +41,7 @@
System.out.println("Setting up");
ServiceFinder.init(compositeName);
aService = ServiceFinder.getService(AService.class, "AComponent/AService");
+ bService2 = ServiceFinder.getService(BService.class, "BComponent2/BService");
} catch (Exception ex) {
ex.printStackTrace();
}
@@ -99,9 +100,12 @@
* elements and Property elements.
*/
@Test
- @Ignore("TUSCANY-2390")
public void typeFile3() throws Exception {
- Assert.assertEquals("SomePropertyValue", aService.getBProperty());
+ Assert.assertEquals("compositeValue", aService.getBProperty());
+ }
+
+ public void typeFile31() throws Exception {
+ Assert.assertEquals("componentTypeValue", bService2.getSomeProperty());
}
}