Author: scabanovich Date: 2012-04-18 20:47:31 -0400 (Wed, 18 Apr 2012) New Revision: 40320 Added: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC1.java trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC2.java trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC3.java trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC4.java Modified: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/TypeInfoCollectorTest.java Log: JBIDE-11474 https://issues.jboss.org/browse/JBIDE-11474 Test is added. Added: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC1.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC1.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC1.java 2012-04-19 00:47:31 UTC (rev 40320) @@ -0,0 +1,12 @@ +package test; + +/** + * Test checks that info for method foo() returned by TypeInfoCollector is created for TestC1.foo() + * rather than for overriden methods from super classes. + */ +public class TestC1 extends TestC2 { + + public String foo() { + return null; + } +} \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC1.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC2.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC2.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC2.java 2012-04-19 00:47:31 UTC (rev 40320) @@ -0,0 +1,12 @@ +package test; + +/** + * Test checks that info for method foo() returned by TypeInfoCollector is created for TestC2.foo() + * rather than for overriden methods from super classes. + */ +public class TestC2 extends TestC3 { + + public String foo() { + return null; + } +} \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC2.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC3.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC3.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC3.java 2012-04-19 00:47:31 UTC (rev 40320) @@ -0,0 +1,8 @@ +package test; + +public class TestC3 extends TestC4 { + + public String foo() { + return null; + } +} \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC3.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC4.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC4.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC4.java 2012-04-19 00:47:31 UTC (rev 40320) @@ -0,0 +1,8 @@ +package test; + +public class TestC4 { + + public String foo() { + return null; + } +} \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestC4.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/TypeInfoCollectorTest.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/TypeInfoCollectorTest.java 2012-04-19 00:23:47 UTC (rev 40319) +++ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/TypeInfoCollectorTest.java 2012-04-19 00:47:31 UTC (rev 40320) @@ -20,6 +20,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaCore; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; @@ -80,6 +81,20 @@ assertNotNull(info.getMemberType()); } + public void testOverridenMethod() throws CoreException { + IJavaProject jp = JavaCore.create(project2); + for (int i = 1; i < 5; i++) { + String className = "test.TestC" + i; + IType bean = jp.findType(className); + TypeInfoCollector.TypeInfo typeInfo = new TypeInfoCollector.TypeInfo(bean, null, false); + TypeInfoCollector collector = typeInfo.getTypeCollector(false, false); + MemberInfo info = getMethod(collector, "foo"); + assertNotNull(info); + IMethod m = (IMethod)info.getJavaElement(); + assertEquals(bean.getFullyQualifiedName(), m.getDeclaringType().getFullyQualifiedName()); + } + } + private MemberInfo getMethod(TypeInfoCollector collector, String name) { collector.collectInfo(); List<MemberInfo> mts = collector.getMethods();