Author: dazarov Date: 2011-07-07 14:42:06 -0400 (Thu, 07 Jul 2011) New Revision: 32723 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.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java Log: https://issues.jboss.org/browse/JBIDE-8202 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-07 18:03:43 UTC (rev 32722) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CDISeamResourceLoadingHyperlinkDetectorTest.java 2011-07-07 18:42:06 UTC (rev 32723) @@ -26,7 +26,8 @@ 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"))})); + 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"))})); } CDIHyperlinkTestUtil.checkRegions(tckProject, FILENAME, regionList, new CDISeamResourceLoadingHyperlinkDetector()); Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-07-07 18:03:43 UTC (rev 32722) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-07-07 18:42:06 UTC (rev 32723) @@ -18,6 +18,7 @@ import org.eclipse.jface.text.hyperlink.IHyperlink; import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; @@ -42,6 +43,7 @@ import org.jboss.tools.jst.web.ui.editors.WebCompoundEditor; public class CDIHyperlinkTestUtil extends TestCase{ + public static void checkRegions(IProject project, String fileName, List<TestRegion> regionList, AbstractHyperlinkDetector elPartitioner) throws Exception { IFile file = project.getFile(fileName); @@ -133,6 +135,14 @@ assertNotNull("Unexpected hyperlink - "+link.getHyperlinkText(), testLink); assertEquals("Unexpected hyperlink type", testLink.hyperlink, link.getClass()); assertTrue("Validation fails for hyperlink - "+link.getHyperlinkText(), testLink.validateHyperlink(link)); + if(testLink.fileName != null){ + link.open(); + IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + IFileEditorInput input = (IFileEditorInput)editor.getEditorInput(); + IFile f = input.getFile(); + assertEquals(testLink.fileName, f.getName()); + editor.dispose(); + } } for(TestHyperlink testLink : testRegion.hyperlinks){ @@ -342,7 +352,13 @@ ICDIElement element = null; String[] elementPaths = null; String name; + String fileName=null; + public TestHyperlink(Class<? extends IHyperlink> hyperlink, String name, String fileName){ + this(hyperlink, name); + this.fileName = fileName; + } + public TestHyperlink(Class<? extends IHyperlink> hyperlink, String name){ this.hyperlink = hyperlink; this.name = name;