From jbosstools-commits at lists.jboss.org Wed May 4 19:27:12 2011 Content-Type: multipart/mixed; boundary="===============1017204882545019348==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r31076 - in trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test: projects/HiperlinksTestProject/WebContent/WEB-INF and 1 other directories. Date: Wed, 04 May 2011 19:27:11 -0400 Message-ID: <201105042327.p44NRBug026451@svn01.web.mwc.hst.phx2.redhat.com> --===============1017204882545019348== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2011-05-04 19:27:11 -0400 (Wed, 04 May 2011) New Revision: 31076 Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/HiperlinksTes= tProject/WebContent/WEB-INF/myLibrary.tld trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/HiperlinksTes= tProject/WebContent/tldTagsHyperlinkTests.jsp Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/js= f/text/ext/test/OpenOnsTest.java Log: JBIDE-8845 https://issues.jboss.org/browse/JBIDE-8845 Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/Hiperlink= sTestProject/WebContent/WEB-INF/myLibrary.tld =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/HiperlinksTe= stProject/WebContent/WEB-INF/myLibrary.tld (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/HiperlinksTe= stProject/WebContent/WEB-INF/myLibrary.tld 2011-05-04 23:27:11 UTC (rev 310= 76) @@ -0,0 +1,17 @@ + + + 1.0 + myLibrary + myLibrary + + myTag + String + empty + + myattr + false + String + + + Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/proj= ects/HiperlinksTestProject/WebContent/WEB-INF/myLibrary.tld ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/Hiperlink= sTestProject/WebContent/tldTagsHyperlinkTests.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/HiperlinksTe= stProject/WebContent/tldTagsHyperlinkTests.jsp (rev= 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/HiperlinksTe= stProject/WebContent/tldTagsHyperlinkTests.jsp 2011-05-04 23:27:11 UTC (rev= 31076) @@ -0,0 +1,19 @@ +<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%> +<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f"%> +<%@ taglib uri=3D"myLibrary" prefix=3D"m"%> + + + + + + + + + + + + + + + + Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/proj= ects/HiperlinksTestProject/WebContent/tldTagsHyperlinkTests.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/t= ools/jsf/text/ext/test/OpenOnsTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/j= sf/text/ext/test/OpenOnsTest.java 2011-05-04 23:26:11 UTC (rev 31075) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/j= sf/text/ext/test/OpenOnsTest.java 2011-05-04 23:27:11 UTC (rev 31076) @@ -20,6 +20,7 @@ import org.jboss.tools.common.model.ui.editors.multipage.DefaultMultipageE= ditor; import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector; import org.jboss.tools.jsf.text.ext.hyperlink.JsfJSPTagNameHyperlinkDetect= or; +import org.jboss.tools.jsf.text.ext.hyperlink.TLDTagHyperlink; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.WorkbenchUtils; @@ -571,4 +572,120 @@ String fileName =3D editor.getEditorInput().getName(); assertTrue("style1.css".equals(fileName)); = } + + public static final String TAGLIB_TAGS_TEST_FILE =3D OPENON_TEST_PROJECT = + "/WebContent/tldTagsHyperlinkTests.jsp"; + = + public void testTaglibAttributeFromJarOpenOn() throws BadLocationExceptio= n { + IEditorPart editor =3D WorkbenchUtils.openEditor(TAGLIB_TAGS_TEST_FILE); + assertTrue(editor instanceof JSPMultiPageEditor); + JobUtils.waitForIdle(); + JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; + ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); + IDocument document =3D jspMultyPageEditor.getSourceEditor().getTextViewe= r().getDocument(); + IRegion reg =3D new FindReplaceDocumentAdapter(document).find(0, + "value", true, true, false, false); + IHyperlink[] links =3D new JsfJSPTagNameHyperlinkDetector().detectHyperl= inks(viewer, reg, true); + assertNotNull(links); + assertTrue(links.length!=3D0); + //assertNotNull(links[0].getHyperlinkText()); + assertNotNull(links[0].toString()); + links[0].open(); + JobUtils.waitForIdle(); + = + editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); + = + String fileName =3D editor.getEditorInput().getName(); + assertTrue("html_basic.tld".equals(fileName)); + = + assertModelObjectSelection(links[0], "value"); + } + = + public void testTaglibTagsFromJarOpenOn() throws BadLocationException { + IEditorPart editor =3D WorkbenchUtils.openEditor(TAGLIB_TAGS_TEST_FILE); + assertTrue(editor instanceof JSPMultiPageEditor); + JobUtils.waitForIdle(); + JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; + ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); + IDocument document =3D jspMultyPageEditor.getSourceEditor().getTextViewe= r().getDocument(); + IRegion reg =3D new FindReplaceDocumentAdapter(document).find(0, + "h:outputText", true, true, false, false); + IHyperlink[] links =3D new JsfJSPTagNameHyperlinkDetector().detectHyperl= inks(viewer, reg, true); + assertNotNull(links); + assertTrue(links.length!=3D0); + //assertNotNull(links[0].getHyperlinkText()); + assertNotNull(links[0].toString()); + links[0].open(); + JobUtils.waitForIdle(); + = + editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); + = + String fileName =3D editor.getEditorInput().getName(); + assertTrue("html_basic.tld".equals(fileName)); + + try { + assertModelObjectSelection(links[0], "outputText"); + } finally { + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().cl= oseEditor(editor, false); + } + } + = + public void testTaglibTagsInWebInfOpenOn() throws BadLocationException { + IEditorPart editor =3D WorkbenchUtils.openEditor(TAGLIB_TAGS_TEST_FILE); + assertTrue(editor instanceof JSPMultiPageEditor); + JobUtils.waitForIdle(); + JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; + ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); + IDocument document =3D jspMultyPageEditor.getSourceEditor().getTextViewe= r().getDocument(); + IRegion reg =3D new FindReplaceDocumentAdapter(document).find(0, + "m:myTag", true, true, false, false); + IHyperlink[] links =3D new JsfJSPTagNameHyperlinkDetector().detectHyperl= inks(viewer, reg, true); + assertNotNull(links); + assertTrue(links.length!=3D0); + //assertNotNull(links[0].getHyperlinkText()); + assertNotNull(links[0].toString()); + links[0].open(); + JobUtils.waitForIdle(); + = + editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); + = + String fileName =3D editor.getEditorInput().getName(); + assertTrue("myLibrary.tld".equals(fileName)); + = + assertModelObjectSelection(links[0], "myTag"); + } + = + public void testTaglibAttributeInWebInfOpenOn() throws BadLocationExcepti= on { + IEditorPart editor =3D WorkbenchUtils.openEditor(TAGLIB_TAGS_TEST_FILE); + assertTrue(editor instanceof JSPMultiPageEditor); + JobUtils.waitForIdle(); + JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; + ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); + IDocument document =3D jspMultyPageEditor.getSourceEditor().getTextViewe= r().getDocument(); + IRegion reg =3D new FindReplaceDocumentAdapter(document).find(0, + "myattr", true, true, false, false); + IHyperlink[] links =3D new JsfJSPTagNameHyperlinkDetector().detectHyperl= inks(viewer, reg, true); + assertNotNull(links); + assertTrue(links.length!=3D0); + //assertNotNull(links[0].getHyperlinkText()); + assertNotNull(links[0].toString()); + links[0].open(); + JobUtils.waitForIdle(); + = + editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); + = + String fileName =3D editor.getEditorInput().getName(); + assertTrue("myLibrary.tld".equals(fileName)); + = + assertModelObjectSelection(links[0], "myattr"); + } + + void assertModelObjectSelection(IHyperlink link, String name) { + assertTrue(link instanceof TLDTagHyperlink); + TLDTagHyperlink tagLink =3D (TLDTagHyperlink)link; + String objectName =3D tagLink.getObjectName(); + int i =3D objectName.lastIndexOf(":"); + if(i > 0) objectName =3D objectName.substring(i + 1).trim(); + assertEquals(name, objectName); + } = + } --===============1017204882545019348==--