Author: dazarov Date: 2011-07-08 18:05:58 -0400 (Fri, 08 Jul 2011) New Revision: 32778 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/test.properties Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/ResourceLoader.java trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java Log: https://issues.jboss.org/browse/JBIDE-8202 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/ResourceLoader.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/ResourceLoader.java 2011-07-08 21:44:42 UTC (rev 32777) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/ResourceLoader.java 2011-07-08 22:05:58 UTC (rev 32778) @@ -12,6 +12,22 @@ @Resource("WEB-INF/beans.xml") URL beansXml; + @Inject + @Resource("org/jboss/jsr299/tck/tests/jbt/openon/test.properties") + URL properties1; + + @Inject + @Resource("org/jboss/jsr299/tck/tests/jbt/openon/test") + URL properties2; + + @Inject + @Resource("org.jboss.jsr299.tck.tests.jbt.openon.test.properties") + URL properties3; + + @Inject + @Resource("org.jboss.jsr299.tck.tests.jbt.openon.test") + URL properties4; + private String foo; public ResourceLoader(String foo) Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/test.properties =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/test.properties (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/test.properties 2011-07-08 22:05:58 UTC (rev 32778) @@ -0,0 +1,3 @@ +header=Hello Demo Application +prompt_message=Name: +hello_message=Hello \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/test.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java 2011-07-08 21:44:42 UTC (rev 32777) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java 2011-07-08 22:05:58 UTC (rev 32778) @@ -24,11 +24,40 @@ ArrayList<TestRegion> regionList = new ArrayList<TestRegion>(); int injectPosition = text.indexOf("@Inject"); - //System.out.println("injectPosition - "+injectPosition); if(injectPosition > 0){ regionList.add(new TestRegion(injectPosition, 58, - new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK, "WEB-INF/beans.xml", "WebContent/WEB-INF/beans.xml"))})); + new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK, + "WEB-INF/beans.xml", + "WebContent/WEB-INF/beans.xml"))})); } + injectPosition = text.indexOf("@Inject",injectPosition+1); + if(injectPosition > 0){ + regionList.add(new TestRegion(injectPosition, 97, + new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK, + "org/jboss/jsr299/tck/tests/jbt/openon/test.properties", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/test.properties"))})); + } + injectPosition = text.indexOf("@Inject",injectPosition+1); + if(injectPosition > 0){ + regionList.add(new TestRegion(injectPosition, 86, + new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK, + "org/jboss/jsr299/tck/tests/jbt/openon/test", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/test.properties"))})); + } + injectPosition = text.indexOf("@Inject",injectPosition+1); + if(injectPosition > 0){ + regionList.add(new TestRegion(injectPosition, 97, + new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK, + "org.jboss.jsr299.tck.tests.jbt.openon.test.properties", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/test.properties"))})); + } + injectPosition = text.indexOf("@Inject",injectPosition+1); + if(injectPosition > 0){ + regionList.add(new TestRegion(injectPosition, 86, + new TestHyperlink[]{new TestHyperlink(CDISeamResourceLoadingHyperlink.class, NLS.bind(CDISeamExtMessages.CDI_SEAM_RESOURCE_LOADING_HYPERLINK, + "org.jboss.jsr299.tck.tests.jbt.openon.test", + "JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/test.properties"))})); + } CDIHyperlinkTestUtil.checkRegions(tckProject, FILENAME, regionList, new CDISeamResourceLoadingHyperlinkDetector()); }