Author: sdzmitrovich
Date: 2009-08-27 10:06:40 -0400 (Thu, 27 Aug 2009)
New Revision: 17332
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOn1.css
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOnTestPage.xhtml
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOnTestPage.html
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnCssClassTest_JBIDE4775.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4821
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOn1.css
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOn1.css
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOn1.css 2009-08-27
14:06:40 UTC (rev 17332)
@@ -0,0 +1,3 @@
+.classC {
+ color: green;
+}
\ No newline at end of file
Property changes on:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOn1.css
___________________________________________________________________
Name: svn:mime-type
+ text/css
Name: svn:eol-style
+ native
Deleted:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOnTestPage.html
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOnTestPage.html 2009-08-27
13:24:53 UTC (rev 17331)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOnTestPage.html 2009-08-27
14:06:40 UTC (rev 17332)
@@ -1,19 +0,0 @@
-<html>
-
-<head>
-
-
-<style type="text/css">
-.classA {
- color: red
-}
-</style>
-<link rel="stylesheet" href="openOn.css" />
-</head>
-
-<body>
-<div class="classA" id="openOn1">Test Page</div>
-<div class="classB" id="openOn2">Test Page</div>
-
-</body>
-</html>
\ No newline at end of file
Copied:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOnTestPage.xhtml
(from rev 17313,
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOnTestPage.html)
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOnTestPage.xhtml
(rev 0)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4775/openOnTestPage.xhtml 2009-08-27
14:06:40 UTC (rev 17332)
@@ -0,0 +1,18 @@
+<!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>
+<style type="text/css">
+.classA {
+ color: red;
+}
+</style>
+<link rel="stylesheet" href="openOn.css" />
+<link rel="stylesheet"
href="#{facesContext.externalContext.requestContextPath}/pages/JBIDE/4775/openOn1.css"
/>
+</head>
+<body>
+<div class="classA" id="openOn1">Test Page</div>
+<div class="classB" id="openOn2">Test Page</div>
+<h:inputText styleClass="classC" value="test"
id="openOn3" />
+</body>
+</html>
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnCssClassTest_JBIDE4775.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnCssClassTest_JBIDE4775.java 2009-08-27
13:24:53 UTC (rev 17331)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/OpenOnCssClassTest_JBIDE4775.java 2009-08-27
14:06:40 UTC (rev 17332)
@@ -35,13 +35,16 @@
*/
public class OpenOnCssClassTest_JBIDE4775 extends VpeTest {
- private static final String TEST_PAGE_NAME = "JBIDE/4775/openOnTestPage.html";
//$NON-NLS-1$
+ private static final String TEST_PAGE_NAME =
"JBIDE/4775/openOnTestPage.xhtml"; //$NON-NLS-1$
private static String ON_PAGE_STYLE_TEST_TAG_ID = "openOn1"; //$NON-NLS-1$
private static String LINK_STYLE_TEST_TAG_ID = "openOn2"; //$NON-NLS-1$
+ private static String LINK_WITH_EL_EXPRESSION_STYLE_TEST_TAG_ID = "openOn3";
//$NON-NLS-1$
+
private static String CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
+ private static String STYLE_CLASS_ATTRIBUTE = "styleClass"; //$NON-NLS-1$
public OpenOnCssClassTest_JBIDE4775(String name) {
super(name);
@@ -159,4 +162,60 @@
}
}
+
+ public void testOpenOnLinkWithElExpressionsStyles() throws Throwable {
+
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME,
+ JsfAllTests.IMPORT_PROJECT_NAME);
+
+ assertNotNull("Could not open specified file. componentPage = "
+ + TEST_PAGE_NAME
+ + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$
+
+ IEditorInput input = new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input);
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ // get controller
+ VpeController controller = TestUtil.getVpeController(part);
+ assertNotNull(controller);
+
+ // get source document
+ Document sourceDocument = getSourceDocument(controller);
+ assertNotNull(sourceDocument);
+
+ Element openOnTestedElement = sourceDocument
+ .getElementById(LINK_WITH_EL_EXPRESSION_STYLE_TEST_TAG_ID);
+ Attr testedClassAttr = openOnTestedElement
+ .getAttributeNode(STYLE_CLASS_ATTRIBUTE);
+
+ OpenOnUtil.performOpenOnAction(part.getSourceEditor(),
+ ((IDOMAttr) testedClassAttr).getValueRegionStartOffset() + 1);
+
+ IStructuredSelection selection = (IStructuredSelection) PlatformUI
+ .getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .getSelection();
+
+ TestUtil.waitForJobs();
+
+ CSSStyleRule cssClassNode = (CSSStyleRule) selection.getFirstElement();
+
+ assertTrue(cssClassNode.getSelectorText().contains(
+ testedClassAttr.getNodeValue()));
+
+ // check exception
+ if (getException() != null) {
+ throw getException();
+ }
+
+ }
+
}