summaryrefslogtreecommitdiffstats
path: root/java/sca
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2008-07-08 04:43:55 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2008-07-08 04:43:55 +0000
commite7dc1a8ddac9c28bcf57ea9d23b400ec65aa47f8 (patch)
tree37e7d885ad604ff8b5ce6f72610457d3b15116bc /java/sca
parent5aa47436d6fcd9c4bedf03a3e6bbb6b7c0d24661 (diff)
TUSCANY-2390 - Enabling the disable test and adding new one
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@674715 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca')
-rw-r--r--java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType2
-rw-r--r--java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite6
-rw-r--r--java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java10
3 files changed, 13 insertions, 5 deletions
diff --git a/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType b/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
index 360c31b8e2..c6a0f274c4 100644
--- a/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
+++ b/java/sca/vtest/assembly/ctypefile/src/main/resources/org/apache/tuscany/sca/vtest/assembly/ctypefile/impl/BServiceImpl.componentType
@@ -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
diff --git a/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite b/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite
index 3a70a1a977..889bb846ba 100644
--- a/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite
+++ b/java/sca/vtest/assembly/ctypefile/src/main/resources/typefile.composite
@@ -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>
diff --git a/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java b/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
index ff0f9ebee7..f8f7e45f61 100644
--- a/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
+++ b/java/sca/vtest/assembly/ctypefile/src/test/java/org/apache/tuscany/sca/vtest/assembly/ctypefile/CompomnentTypeFileTestCase.java
@@ -24,7 +24,6 @@ import junit.framework.Assert;
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 @@ public class CompomnentTypeFileTestCase {
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 @@ public class CompomnentTypeFileTestCase {
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 @@ public class CompomnentTypeFileTestCase {
* 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());
}
}