[jbosstools-commits] JBoss Tools SVN: r17586 - in trunk/jst: plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common and 5 other directories.

Author: sdzmitrovich Date: 2009-09-15 10:29:50 -0400 (Tue, 15 Sep 2009) New Revision: 17586 Added: trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebContent/pages/JBIDE/4850/ trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebContent/pages/JBIDE/4850/cssViewTest.jsp trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/ExtendingCSSViewTest_JBIDE4850.java Modified: trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSSelectionListener.java trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/AbstractCSSViewTest.java trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/CSSAllTests.java trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/CSSViewTest.java trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/InputFractionalValueTest_JBIDE4790.java trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/SelectionLosingByPropertySheet_JBIDE4791.java Log: JBIDE-4850 Modified: trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF 2009-09-15 12:58:14 UTC (rev 17585) +++ trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF 2009-09-15 14:29:50 UTC (rev 17586) @@ -19,6 +19,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.jst.css, + org.jboss.tools.jst.css.common, org.jboss.tools.jst.css.messages, org.jboss.tools.jst.css.properties, org.jboss.tools.jst.css.view Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSSelectionListener.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSSelectionListener.java 2009-09-15 12:58:14 UTC (rev 17585) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSSelectionListener.java 2009-09-15 14:29:50 UTC (rev 17586) @@ -59,11 +59,15 @@ private void startListening() { PlatformUI.getWorkbench().getActiveWorkbenchWindow() .getSelectionService().addPostSelectionListener(this); +// PlatformUI.getWorkbench().getActiveWorkbenchWindow() +// .getSelectionService().addSelectionListener(this); } private void stopListening() { PlatformUI.getWorkbench().getActiveWorkbenchWindow() .getSelectionService().removePostSelectionListener(this); + // PlatformUI.getWorkbench().getActiveWorkbenchWindow() + // .getSelectionService().addSelectionListener(this); } Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF 2009-09-15 12:58:14 UTC (rev 17585) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF 2009-09-15 14:29:50 UTC (rev 17586) @@ -20,7 +20,10 @@ org.jboss.tools.jst.css, org.eclipse.core.databinding, org.eclipse.ui.views.properties.tabbed, - org.jboss.tools.jst.jsp + org.jboss.tools.jst.jsp, + org.eclipse.wst.xml.core, + org.jboss.tools.common.text.ext, + org.jboss.tools.jst.web Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Added: trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebContent/pages/JBIDE/4850/cssViewTest.jsp =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebContent/pages/JBIDE/4850/cssViewTest.jsp (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebContent/pages/JBIDE/4850/cssViewTest.jsp 2009-09-15 14:29:50 UTC (rev 17586) @@ -0,0 +1,16 @@ +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> + + +<html> +<head> +<style type="text/css" id="styleID">.classA {color: red}</style> +</head> + +<body> +<f:view> + <h:outputText value="some text" id="cssViewTest" /> +</f:view> +</body> + +</html> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.css.test/resources/cssTest/WebContent/pages/JBIDE/4850/cssViewTest.jsp ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/AbstractCSSViewTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/AbstractCSSViewTest.java 2009-09-15 12:58:14 UTC (rev 17585) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/AbstractCSSViewTest.java 2009-09-15 14:29:50 UTC (rev 17586) @@ -21,12 +21,17 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IViewPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.jboss.tools.jst.css.properties.CSSPropertyPage; +import org.jboss.tools.jst.css.view.CSSEditorView; +import org.jboss.tools.test.util.JobUtils; /** * @author Sergey Dzmitrovich @@ -43,6 +48,7 @@ public static final String CSS_EDITOR_ID = "org.eclipse.wst.css.core.csssource.source"; //$NON-NLS-1$ public static final String CSS_PERSPECTIVE = "org.jboss.tools.jst.cssPerspective"; //$NON-NLS-1$ public static final String IMPORT_PROJECT_NAME = "cssTest"; //$NON-NLS-1$ + public static final String CSS_PREVIEW_SELECTED_OBJECT = "selectedObject"; //$NON-NLS-1$ /** * @@ -88,13 +94,19 @@ public void setSelection(StructuredTextEditor textEditor, int offset, int length) { - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() - .activate(textEditor); + activatePart(textEditor); textEditor.selectAndReveal(offset, length); + JobUtils.delay(1000); + } + protected void activatePart(IWorkbenchPart part) { + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() + .activate(part); + } + /** * */ @@ -118,6 +130,23 @@ /** * + * @param viewId + * @return + * @throws PartInitException + */ + public void hideView(String viewId) throws PartInitException { + IWorkbenchPage activePage = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage(); + + IViewPart viewPart = activePage.findView(viewId); + if (viewPart != null) + PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getActivePage().hideView(viewPart); + + } + + /** + * * @param file * @return */ @@ -146,6 +175,18 @@ return getFieldValue(object, object.getClass(), fieldName); } + protected Object getSelectedObject(CSSEditorView view) + throws SecurityException, IllegalArgumentException, + NoSuchFieldException, IllegalAccessException { + + CSSPropertyPage page = (CSSPropertyPage) view.getCurrentPage(); + + assertNotNull(page); + + return getFieldValue(page, CSS_PREVIEW_SELECTED_OBJECT); + + } + /** * * @param object Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/CSSAllTests.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/CSSAllTests.java 2009-09-15 12:58:14 UTC (rev 17585) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/CSSAllTests.java 2009-09-15 14:29:50 UTC (rev 17586) @@ -14,6 +14,7 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.jboss.tools.jst.css.test.jbide.ExtendingCSSViewTest_JBIDE4850; import org.jboss.tools.jst.css.test.jbide.InputFractionalValueTest_JBIDE4790; import org.jboss.tools.jst.css.test.jbide.SelectionLosingByPropertySheet_JBIDE4791; import org.jboss.tools.test.util.ProjectImportTestSetup; @@ -32,9 +33,10 @@ TestSuite suite = new TestSuite("Tests for CSS views"); //$NON-NLS-1$ // $JUnit-BEGIN$ -// suite.addTestSuite(CSSViewTest.class); -// suite.addTestSuite(InputFractionalValueTest_JBIDE4790.class); + suite.addTestSuite(CSSViewTest.class); + suite.addTestSuite(InputFractionalValueTest_JBIDE4790.class); suite.addTestSuite(SelectionLosingByPropertySheet_JBIDE4791.class); + suite.addTestSuite(ExtendingCSSViewTest_JBIDE4850.class); // $JUnit-END$ return new ProjectImportTestSetup( Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/CSSViewTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/CSSViewTest.java 2009-09-15 12:58:14 UTC (rev 17585) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/CSSViewTest.java 2009-09-15 14:29:50 UTC (rev 17586) @@ -30,6 +30,7 @@ import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel; import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet; import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.jboss.tools.jst.css.common.StyleContainer; import org.jboss.tools.jst.css.properties.CSSPropertyPage; import org.jboss.tools.jst.css.view.CSSEditorView; import org.jboss.tools.jst.css.view.CSSPreview; @@ -43,12 +44,12 @@ */ public class CSSViewTest extends AbstractCSSViewTest { - public static final String TEST_PAGE_NAME = "test.css"; //$NON-NLS-1$ + public static final String SELECTED_OBJECT_FIELD = "selectedObject"; //$NON-NLS-1$ + public static final int COUNT_TABS = 5; - /** * * @throws PartInitException @@ -75,10 +76,6 @@ assertNotNull(view); - CSSPropertyPage page = (CSSPropertyPage) view.getCurrentPage(); - - assertNotNull(page); - ICSSModel model = (ICSSModel) getStructuredModel(pageFile); assertNotNull(model); @@ -96,18 +93,18 @@ setSelection(editor, offset, 0); - JobUtils.delay(1000); - Object selectedObject = getFieldValue(page, "selectedObject"); //$NON-NLS-1$ + Object selectedObject = getSelectedObject(view); + assertTrue(selectedObject instanceof StyleContainer); + assertEquals(cssRule, ((StyleContainer) selectedObject) + .getStyleObject()); setSelection(editor, 0, 0); - JobUtils.delay(1000); - selectedObject = getFieldValue(page, "selectedObject"); //$NON-NLS-1$ + selectedObject = getSelectedObject(view); + assertNull(selectedObject); - assertNotSame(cssRule, selectedObject); - } public void testEditorViewTabs() throws CoreException, SecurityException, @@ -149,7 +146,6 @@ setSelection(editor, offset, 0); - JobUtils.delay(1000); TabbedPropertyRegistry registry = (TabbedPropertyRegistry) getFieldValue( page, TabbedPropertySheetPage.class, "registry");//$NON-NLS-1$ @@ -214,7 +210,6 @@ setSelection(editor, offset, 0); - JobUtils.delay(1000); assertFalse(browserPage.equals(view.generateBrowserPage())); Added: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/ExtendingCSSViewTest_JBIDE4850.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/ExtendingCSSViewTest_JBIDE4850.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/ExtendingCSSViewTest_JBIDE4850.java 2009-09-15 14:29:50 UTC (rev 17586) @@ -0,0 +1,124 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jst.css.test.jbide; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; +import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; +import org.jboss.tools.jst.css.common.StyleContainer; +import org.jboss.tools.jst.css.test.AbstractCSSViewTest; +import org.jboss.tools.jst.css.view.CSSEditorView; +import org.jboss.tools.test.util.JobUtils; +import org.w3c.dom.Element; + +/** + * @author Sergey Dzmitrovich + * + */ +public class ExtendingCSSViewTest_JBIDE4850 extends AbstractCSSViewTest { + + public static final String TEST_PAGE_NAME = "JBIDE/4850/cssViewTest.jsp"; //$NON-NLS-1$ + + /** jsp editor id */ + public static final String JSP_EDITOR_ID = "org.eclipse.jst.jsp.core.jspsource.source";//"org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"; //$NON-NLS-1$ + + public static final String TESTED_ELEMENT_ID = "cssViewTest"; //$NON-NLS-1$ + + public static final String TESTED_STYLE_ID = "styleID"; //$NON-NLS-1$ + + public void testInlineStyleEditing() throws CoreException, + SecurityException, IllegalArgumentException, NoSuchFieldException, + IllegalAccessException { + + IFile pageFile = getComponentPath(TEST_PAGE_NAME, getProjectName()); + + assertNotNull(pageFile); + + StructuredTextEditor editor = (StructuredTextEditor) openEditor( + pageFile, JSP_EDITOR_ID); + + JobUtils.waitForIdle(); + + assertNotNull(editor); + + CSSEditorView view = (CSSEditorView) openView(CSS_EDITOR_VIEW); + + assertNotNull(view); + + IDOMModel model = (IDOMModel) getStructuredModel(pageFile); + + assertNotNull(model); + + IDOMDocument document = model.getDocument(); + + assertNotNull(document); + + Element element = document.getElementById(TESTED_ELEMENT_ID); + + assertNotNull(element); + + int offset = ((IndexedRegion) element).getStartOffset(); + + setSelection(editor, offset, 0); + + Object selectedObject = getSelectedObject(view); + + assertTrue(selectedObject instanceof StyleContainer); + + assertSame(element, ((StyleContainer) selectedObject).getStyleObject()); + + } + + public void testStyleTagEditing() throws CoreException, SecurityException, + IllegalArgumentException, NoSuchFieldException, + IllegalAccessException { + + IFile pageFile = getComponentPath(TEST_PAGE_NAME, getProjectName()); + + assertNotNull(pageFile); + + StructuredTextEditor editor = (StructuredTextEditor) openEditor( + pageFile, JSP_EDITOR_ID); + + JobUtils.waitForIdle(); + + assertNotNull(editor); + + CSSEditorView view = (CSSEditorView) openView(CSS_EDITOR_VIEW); + + assertNotNull(view); + + IDOMModel model = (IDOMModel) getStructuredModel(pageFile); + + assertNotNull(model); + + IDOMDocument document = model.getDocument(); + + assertNotNull(document); + + Element element = document.getElementById(TESTED_STYLE_ID); + + assertNotNull(element); + + int offset = ((IDOMElement) element).getStartEndOffset(); + + setSelection(editor, offset, 0); + + Object selectedObject = getSelectedObject(view); + + assertTrue(selectedObject instanceof StyleContainer); + + } +} Property changes on: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/ExtendingCSSViewTest_JBIDE4850.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/InputFractionalValueTest_JBIDE4790.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/InputFractionalValueTest_JBIDE4790.java 2009-09-15 12:58:14 UTC (rev 17585) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/InputFractionalValueTest_JBIDE4790.java 2009-09-15 14:29:50 UTC (rev 17586) @@ -111,7 +111,7 @@ newTestedValue); } catch (DOMException e) { - fail("Changing of attribute's value leads to DOMException. Probably it is regression of JBIDE-4790 "); //$NON-NLS-1$ + fail("Changing of attribute's value leads to DOMException. Probably it is problem concerned with of JBIDE-4790 "); //$NON-NLS-1$ } testedValue = declaration.getPropertyValue(TEST_CSS_ATTRIBUTE_NAME); Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/SelectionLosingByPropertySheet_JBIDE4791.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/SelectionLosingByPropertySheet_JBIDE4791.java 2009-09-15 12:58:14 UTC (rev 17585) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/src/org/jboss/tools/jst/css/test/jbide/SelectionLosingByPropertySheet_JBIDE4791.java 2009-09-15 14:29:50 UTC (rev 17586) @@ -82,9 +82,9 @@ .getFirstElement()); CSSEditorView view = (CSSEditorView) openView(CSS_EDITOR_VIEW); - - JobUtils.delay(2000); + JobUtils.delay(1000); + selection = (ISelection) getFieldValue(propertySheet, SELECTION_FIELD_NAME);