diff options
Diffstat (limited to 'sca-java-2.x/trunk/testing/itest/properties/src')
2 files changed, 2 insertions, 5 deletions
diff --git a/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/CTCalcTest.composite b/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/CTCalcTest.composite index e562568492..db7b3be2d2 100644 --- a/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/CTCalcTest.composite +++ b/sca-java-2.x/trunk/testing/itest/properties/src/main/resources/CTCalcTest.composite @@ -35,10 +35,8 @@ <component name="Annotated2Component">
<implementation.java class="org.apache.tuscany.sca.itest.ctcalc.Annotated2CTCalcComponentImpl" />
- <property name="aPropertyAnnotated" value="xyz"/>
-<!-- TUSCANY-3924 playing with whether we should take note of inherited annotations as per JSR-250
+ <property name="aPropertyAnnotated" value="xyz"/>
<property name="aPropertyPublic" value="abc"/>
- -->
</component>
</composite>
diff --git a/sca-java-2.x/trunk/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/ctcalc/CTCalcTestCase.java b/sca-java-2.x/trunk/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/ctcalc/CTCalcTestCase.java index c77dbb1232..b0bd9ec8fe 100644 --- a/sca-java-2.x/trunk/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/ctcalc/CTCalcTestCase.java +++ b/sca-java-2.x/trunk/testing/itest/properties/src/test/java/org/apache/tuscany/sca/itest/ctcalc/CTCalcTestCase.java @@ -84,7 +84,7 @@ public class CTCalcTestCase { @Test
public void testUnannotatedExtension() {
assertEquals("Unannotated", unannotatedComponent.test());
- assertEquals(2, ((NodeImpl)node).getDomainComposite().getComponents().get(1).getProperties().size());
+ assertEquals(4, ((NodeImpl)node).getDomainComposite().getComponents().get(1).getProperties().size());
System.out.println(((NodeImpl)node).getDomainComposite().getComponents().get(1).getProperties());
}
@@ -95,7 +95,6 @@ public class CTCalcTestCase { System.out.println(((NodeImpl)node).getDomainComposite().getComponents().get(2).getProperties());
}
- @Ignore("TUSCANY-3924 playing with whether we should take note of inherited annotations as per JSR-250")
@Test
public void testAnnotated2Extension() {
assertEquals("Annotated", annotatedComponent.test());
|