Author: dazarov Date: 2011-04-25 13:56:57 -0400 (Mon, 25 Apr 2011) New Revision: 30818 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF/lib/seam-solder-test.jar trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/ResourceLoader.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF trunk/cdi/plugins/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/plugins/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF 2011-04-25 17:42:30 UTC (rev 30817) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF 2011-04-25 17:56:57 UTC (rev 30818) @@ -17,7 +17,8 @@ org.eclipse.wst.xml.ui, org.eclipse.jface, org.jboss.tools.cdi.text.ext.test, - org.jboss.tools.cdi.seam.text.ext + org.jboss.tools.cdi.seam.text.ext, + org.jboss.tools.common Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.cdi.seam.text.ext.test Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java 2011-04-25 17:42:30 UTC (rev 30817) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java 2011-04-25 17:56:57 UTC (rev 30818) @@ -2,21 +2,29 @@ import java.util.ArrayList; +import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.Region; import org.jboss.tools.cdi.seam.text.ext.hyperlink.CDISeamResourceLoadingHyperlinkDetector; import org.jboss.tools.cdi.text.ext.test.HyperlinkDetectorTest; +import org.jboss.tools.common.util.FileUtil; public class CDISeamResourceLoadingHyperlinkDetectorTest extends HyperlinkDetectorTest{ + private static final String FILENAME = "JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/ResourceLoader.java"; public void testCDISeamResourceLoadingHyperlinkDetector() throws Exception { + IFile file = tckProject.getFile(FILENAME); + String text = FileUtil.readStream(file); + + ArrayList<Region> regionList = new ArrayList<Region>(); - regionList.add(new Region(115, 6)); - regionList.add(new Region(133, 6)); - regionList.add(new Region(140, 6)); - regionList.add(new Region(196, 6)); - regionList.add(new Region(250, 6)); - checkRegions("JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/ResourceLoader.java", regionList, new CDISeamResourceLoadingHyperlinkDetector()); + int injectPosition = text.indexOf("@Inject"); + System.out.println("injectPosition - "+injectPosition); + if(injectPosition > 0){ + regionList.add(new Region(injectPosition, 58)); + } + + checkRegions(FILENAME, regionList, new CDISeamResourceLoadingHyperlinkDetector()); } } Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF/lib/seam-solder-test.jar =================================================================== (Binary files differ) Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/WEB-INF/lib/seam-solder-test.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: 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 (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/ResourceLoader.java 2011-04-25 17:56:57 UTC (rev 30818) @@ -0,0 +1,30 @@ +package org.jboss.jsr299.tck.tests.jbt.openon; + +import java.net.URL; + +import javax.inject.Inject; + +import org.jboss.seam.solder.resourceLoader.Resource; + +public class ResourceLoader +{ + @Inject + @Resource("WEB-INF/beans.xml") + URL beansXml; + + private String foo; + + public ResourceLoader(String foo) + { + this.foo = foo; + } + + /** + * @return the foo + */ + public String getFoo() + { + return foo; + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/openon/ResourceLoader.java ___________________________________________________________________ Added: svn:mime-type + text/plain