Author: scabanovich Date: 2010-11-18 09:34:15 -0500 (Thu, 18 Nov 2010) New Revision: 26711 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/one/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/one/Hare.java trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/one/Rabbit.java trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/two/ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/two/Animals.java trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/two/Wild.java trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/two/package-info.java Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java Log: JBIDE-7616 https://jira.jboss.org/browse/JBIDE-7616 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/one/Hare.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/one/Hare.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/one/Hare.java 2010-11-18 14:34:15 UTC (rev 26711) @@ -0,0 +1,8 @@ +package one; + +import org.jboss.seam.annotations.Name; + +(a)Name(&quot;animal.wild.Hare&quot;) +public class Hare { + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/one/Hare.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/one/Rabbit.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/one/Rabbit.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/one/Rabbit.java 2010-11-18 14:34:15 UTC (rev 26711) @@ -0,0 +1,8 @@ +package one; + +import org.jboss.seam.annotations.Name; + +(a)Name(&quot;animal.tame.Rabbit&quot;) +public class A { + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/one/Rabbit.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/two/Animals.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/two/Animals.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/two/Animals.java 2010-11-18 14:34:15 UTC (rev 26711) @@ -0,0 +1,10 @@ +package two; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Import; + +(a)Name(&quot;animals.all&quot;) +(a)Import({&quot;animal.tame&quot;}) +public class Animals { + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/two/Animals.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/two/Wild.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/two/Wild.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/two/Wild.java 2010-11-18 14:34:15 UTC (rev 26711) @@ -0,0 +1,8 @@ +package two; + +import org.jboss.seam.annotations.Name; + +(a)Name(&quot;animals.wild&quot;) +public class Wild { + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/two/Wild.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/two/package-info.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/two/package-info.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/two/package-info.java 2010-11-18 14:34:15 UTC (rev 26711) @@ -0,0 +1,4 @@ +(a)Import({&quot;animal.wild&quot;}) +package two; +import org.jboss.seam.annotations.Import; + Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/TestScanner/JavaSource/two/package-info.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2010-11-18 14:32:35 UTC (rev 26710) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2010-11-18 14:34:15 UTC (rev 26711) @@ -29,6 +29,7 @@ import org.jboss.tools.seam.core.ISeamComponent; import org.jboss.tools.seam.core.ISeamComponentDeclaration; import org.jboss.tools.seam.core.ISeamComponentMethod; +import org.jboss.tools.seam.core.ISeamContextVariable; import org.jboss.tools.seam.core.ISeamFactory; import org.jboss.tools.seam.core.ISeamJavaComponentDeclaration; import org.jboss.tools.seam.core.ISeamProject; @@ -537,6 +538,25 @@ assertTrue("Location should not point to 0", location.getStartPosition() > 0 && location.getLength() > 0); } + public void testImportAnnotatation() throws Exception { + ISeamProject seamProject = getSeamProject(); + + ISeamComponent c = seamProject.getComponent("animals.all"); + ISeamJavaComponentDeclaration d = c.getJavaDeclaration(); + Set<ISeamContextVariable> vs = d.getVariablesByName("Hare"); + assertTrue("Cannot find Hare among all animals, import 'animal.wild' is ignored", vs != null && !vs.isEmpty()); + + vs = d.getVariablesByName("Rabbit"); + assertTrue("Cannot find Rabbit among all animals, import 'animal.tame' is ignored", vs != null && !vs.isEmpty()); + + c = seamProject.getComponent("animals.wild"); + vs = d.getVariablesByName("Hare"); + assertTrue("Cannot find Hare among wild animals, import 'animal.wild' is ignored", vs != null && !vs.isEmpty()); + + vs = d.getVariablesByName("Rabbit"); + assertFalse("Foundd Rabbit among wild animals, import 'animal.tame' is illegally added", vs != null && !vs.isEmpty()); + } + @Override protected void tearDown() throws Exception { if(provider!=null) {