Author: vrubezhny Date: 2011-03-22 13:38:16 -0400 (Tue, 22 Mar 2011) New Revision: 29935 Added: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.project trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/.jsdtscope trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.common.component trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/index.html trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/style.css trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/CSSStylesheetOpenOnTest.java trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JstTextExtAllTests.java Removed: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JsfExtAllTests.java Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml Log: JBIDE-5387 OpenOn does not work for CSS links in HTML files for plain Web Projects Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml 2011-03-22 16:25:08 UTC (rev 29934) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml 2011-03-22 17:38:16 UTC (rev 29935) @@ -283,6 +283,9 @@ <partitionType id="com.ibm.sse.STYLE"> <!--axis path="*/style/" /--> </partitionType> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK"> + <axis path="*/link/*" ignoreCase="true"/> + </partitionType> </contentType> <contentType id="org.eclipse.wst.html.core.htmlsource"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> @@ -294,6 +297,9 @@ <partitionType id="com.ibm.sse.STYLE"> <!--axis path="*/style/" /--> </partitionType> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK"> + <axis path="*/link/*" ignoreCase="true"/> + </partitionType> </contentType> <contentType id="jsf.facelet"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> @@ -305,6 +311,9 @@ <partitionType id="com.ibm.sse.STYLE"> <!--axis path="*/style/" /--> </partitionType> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK"> + <axis path="*/link/*" ignoreCase="true"/> + </partitionType> </contentType> <contentType id="jsf.facelet.composite"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> @@ -316,6 +325,9 @@ <partitionType id="com.ibm.sse.STYLE"> <!--axis path="*/style/" /--> </partitionType> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK"> + <axis path="*/link/*" ignoreCase="true"/> + </partitionType> </contentType> <contentType id="org.jboss.tools.jst.jsp.jspincludesource"> <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"> @@ -327,6 +339,9 @@ <partitionType id="com.ibm.sse.STYLE"> <!--axis path="*/style/" /--> </partitionType> + <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK"> + <axis path="*/link/*" ignoreCase="true"/> + </partitionType> </contentType> </hyperlinkPartitioner> Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF 2011-03-22 16:25:08 UTC (rev 29934) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF 2011-03-22 17:38:16 UTC (rev 29935) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.jst.text.ext.test -Bundle-Version: 3.1.0.qualifier +Bundle-Version: 3.3.0.qualifier Require-Bundle: org.jboss.tools.common.text.ext, org.junit, org.jboss.tools.tests, Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml 2011-03-22 16:25:08 UTC (rev 29934) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml 2011-03-22 17:38:16 UTC (rev 29935) @@ -8,7 +8,7 @@ </parent> <groupId>org.jboss.tools.jst.tests</groupId> <artifactId>org.jboss.tools.jst.text.ext.test</artifactId> - <version>3.1.0-SNAPSHOT</version> + <version>3.3.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> Added: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.project =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.project (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.project 2011-03-22 17:38:16 UTC (rev 29935) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>OpenOnTest</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + </natures> +</projectDescription> Property changes on: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/.jsdtscope =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/.jsdtscope (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/.jsdtscope 2011-03-22 17:38:16 UTC (rev 29935) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> + <attributes> + <attribute name="hide" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.common.component 2011-03-22 17:38:16 UTC (rev 29935) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="OpenOnTest"> + <wb-resource deploy-path="/" source-path="/WebContent"/> + <property name="context-root" value="OpenOnTest"/> + </wb-module> +</project-modules> Added: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-03-22 17:38:16 UTC (rev 29935) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <fixed facet="wst.web"/> + <installed facet="wst.web" version="1.0"/> +</faceted-project> Property changes on: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.jsdt.ui.superType.container 2011-03-22 17:38:16 UTC (rev 29935) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/.settings/org.eclipse.wst.jsdt.ui.superType.name 2011-03-22 17:38:16 UTC (rev 29935) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/index.html =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/index.html (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/index.html 2011-03-22 17:38:16 UTC (rev 29935) @@ -0,0 +1,10 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html"> +<head> + <link rel="stylesheet" href="style.css" /> +</head> +<body> + <div class="red">aaaa</div> +</body> +</html> Property changes on: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/index.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/style.css =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/style.css (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/style.css 2011-03-22 17:38:16 UTC (rev 29935) @@ -0,0 +1,3 @@ +.red { + color:red; +} \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/OpenOnTest/WebContent/style.css ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/CSSStylesheetOpenOnTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/CSSStylesheetOpenOnTest.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/CSSStylesheetOpenOnTest.java 2011-03-22 17:38:16 UTC (rev 29935) @@ -0,0 +1,133 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jst.text.ext.test; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.FindReplaceDocumentAdapter; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.hyperlink.IHyperlink; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.WorkbenchUtils; + +public class CSSStylesheetOpenOnTest extends TestCase { + private static final String PROJECT_NAME = "OpenOnTest"; + private static final String PAGE_NAME = PROJECT_NAME+"/WebContent/index.html"; + + public IProject project = null; + + protected void setUp() { + project = ResourcesPlugin.getWorkspace().getRoot().getProject( + PROJECT_NAME); + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false); + JobUtils.waitForIdle(); + } + + protected void tearDown() { + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false); + } + + public CSSStylesheetOpenOnTest() { + super("HTML OpenOn on CSS Stylesheets test"); + } + + public void testCSSStylesheetOpenOn() throws PartInitException, BadLocationException { + final String editorName = "style.css"; + final String tagName = "link"; + final String valueToFind = "style.css"; + IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME); + assertTrue(editor instanceof JSPMultiPageEditor); + JobUtils.waitForIdle(); + JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor; + ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer(); + + IDocument document = viewer.getDocument(); + IRegion reg = new FindReplaceDocumentAdapter(document).find(0, + tagName, true, true, false, false); + assertNotNull("Tag:"+tagName+" not found",reg); + + reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset(), + valueToFind, true, true, false, false); + assertNotNull("Value to find:"+valueToFind+" not found",reg); + + IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, true); // new Region(reg.getOffset() + reg.getLength(), 0) + + assertNotNull("Hyperlinks for value:"+valueToFind+" are not found",links); + + assertTrue("Hyperlinks for value:"+valueToFind+" are not found",links.length!=0); + + boolean found = false; + for(IHyperlink link : links){ + assertNotNull(link.toString()); + + link.open(); + JobUtils.waitForIdle(2000); + + IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + if(editorName.equals(resultEditor.getTitle())){ + found = true; + return; + } + } + assertTrue("OpenOn have not opened "+editorName+" editor",found); + } + + public void testCSSClassOpenOn() throws PartInitException, BadLocationException { + final String editorName = "style.css"; + final String tagName = "div"; + final String valueToFind = "red"; + IEditorPart editor = WorkbenchUtils.openEditor(PAGE_NAME); + assertTrue(editor instanceof JSPMultiPageEditor); + JobUtils.waitForIdle(); + JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor; + ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer(); + + IDocument document = viewer.getDocument(); + IRegion reg = new FindReplaceDocumentAdapter(document).find(0, + tagName, true, true, false, false); + assertNotNull("Tag:"+tagName+" not found",reg); + + reg = new FindReplaceDocumentAdapter(document).find(reg.getOffset(), + valueToFind, true, true, false, false); + assertNotNull("Value to find:"+valueToFind+" not found",reg); + + IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, true); // new Region(reg.getOffset() + reg.getLength(), 0) + + assertNotNull("Hyperlinks for value:"+valueToFind+" are not found",links); + + assertTrue("Hyperlinks for value:"+valueToFind+" are not found",links.length!=0); + + boolean found = false; + for(IHyperlink link : links){ + assertNotNull(link.toString()); + + link.open(); + JobUtils.waitForIdle(2000); + + IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + if(editorName.equals(resultEditor.getTitle())){ + found = true; + return; + } + } + assertTrue("OpenOn have not opened "+editorName+" editor",found); + } +} Property changes on: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/CSSStylesheetOpenOnTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JsfExtAllTests.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JsfExtAllTests.java 2011-03-22 16:25:08 UTC (rev 29934) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JsfExtAllTests.java 2011-03-22 17:38:16 UTC (rev 29935) @@ -1,22 +0,0 @@ -package org.jboss.tools.jst.text.ext.test; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -public class JsfExtAllTests extends TestCase{ - - // all tests were moved to jst.ui.test plugin - public void testJsfTextExt () { - - } - public static Test suite() { - TestSuite suite = new TestSuite("Test for default package"); - //$JUnit-BEGIN$ - - suite.addTestSuite(JsfExtAllTests.class); - - //$JUnit-END$ - return suite; - } -} Copied: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JstTextExtAllTests.java (from rev 29918, trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JsfExtAllTests.java) =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JstTextExtAllTests.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JstTextExtAllTests.java 2011-03-22 17:38:16 UTC (rev 29935) @@ -0,0 +1,31 @@ +package org.jboss.tools.jst.text.ext.test; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.jboss.tools.test.util.ProjectImportTestSetup; + +public class JstTextExtAllTests { + +/* + // all tests were moved to jst.ui.test plugin + public void testJsfTextExt () { + + } +*/ + public static Test suite() { + TestSuite suite = new TestSuite(JstTextExtAllTests.class.getName()); + + //$JUnit-BEGIN$ + +// suite.addTestSuite(JstTextExtAllTests.class); + + suite.addTest(new ProjectImportTestSetup(new TestSuite(CSSStylesheetOpenOnTest.class), + "org.jboss.tools.jst.text.ext.test", + new String[]{"projects/OpenOnTest"}, + new String[]{"OpenOnTest"})); + + //$JUnit-END$ + return suite; + } +} Property changes on: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/JstTextExtAllTests.java ___________________________________________________________________ Added: svn:mime-type + text/plain