From f3b9cd6311a0b7c8ce1af36057aefa6f00eed7e7 Mon Sep 17 00:00:00 2001 From: slaws Date: Mon, 31 Oct 2011 10:30:29 +0000 Subject: TUSCANY-3924 - ignore artifacts of the base class when a java implementation class extends a base class git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1195397 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/tuscany/sca/implementation/java/util/Bean1.java | 6 +++--- .../implementation/java/util/JavaIntrospectionHelperTestCase.java | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'sca-java-2.x/trunk/modules/implementation-java-runtime') diff --git a/sca-java-2.x/trunk/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java index e993cdd382..a289a58091 100644 --- a/sca-java-2.x/trunk/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java +++ b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java @@ -25,9 +25,9 @@ package org.apache.tuscany.sca.implementation.java.util; */ public class Bean1 extends SuperBean { - public static final int ALL_BEAN1_FIELDS = 6 + ALL_SUPER_FIELDS; - public static final int ALL_BEAN1_PUBLIC_PROTECTED_FIELDS = 5 + ALL_SUPER_PUBLIC_PROTECTED_FIELDS; - public static final int ALL_BEAN1_METHODS = 4 + ALL_SUPER_METHODS - 1; + public static final int ALL_BEAN1_FIELDS = 6; //TUSCANY-3924 + ALL_SUPER_FIELDS; + public static final int ALL_BEAN1_PUBLIC_PROTECTED_FIELDS = 5; //TUSCANY-3924 + ALL_SUPER_PUBLIC_PROTECTED_FIELDS; + public static final int ALL_BEAN1_METHODS = 4; //TUSCANY-3924 + ALL_SUPER_METHODS - 1; public String field3; protected String field2; private String field1; diff --git a/sca-java-2.x/trunk/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java index 9624865dcc..dfb3c77966 100644 --- a/sca-java-2.x/trunk/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java +++ b/sca-java-2.x/trunk/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java @@ -29,6 +29,7 @@ import java.util.Map; import java.util.Set; import org.apache.tuscany.sca.implementation.java.introspect.JavaIntrospectionHelper; +import org.junit.Ignore; import org.junit.Test; /** @@ -46,7 +47,7 @@ public class JavaIntrospectionHelperTestCase { @Test public void testBean1AllPublicProtectedFields() throws Exception { Set beanFields = JavaIntrospectionHelper.getAllPublicAndProtectedFields(Bean1.class, true); - assertEquals(4, beanFields.size()); //Bean1.ALL_BEAN1_PUBLIC_PROTECTED_FIELDS + assertEquals(2, beanFields.size()); //Bean1.ALL_BEAN1_PUBLIC_PROTECTED_FIELDS } @Test @@ -75,7 +76,8 @@ public class JavaIntrospectionHelperTestCase { throw new Exception("Override never invoked"); } } - + + @Ignore("TUSCANY-3924") @Test public void testNoOverrideMethod() throws Exception { Set beanFields = JavaIntrospectionHelper.getAllUniquePublicProtectedMethods(Bean1.class, true); -- cgit v1.2.3