Insert title here

From jbosstools-commits at lists.jboss.org Mon Jan 5 12:21:46 2009 Content-Type: multipart/mixed; boundary="===============3542788723568575800==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r12882 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.test: resources and 6 other directories. Date: Mon, 05 Jan 2009 12:21:46 -0500 Message-ID: --===============3542788723568575800== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yradtsevich Date: 2009-01-05 12:21:46 -0500 (Mon, 05 Jan 2009) New Revision: 12882 Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/.project trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent/ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent= /pages/ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent= /pages/JBIDE/ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent= /pages/JBIDE/JBIDE-3441-1.html trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebContent= /pages/JBIDE/JBIDE-3441-2.html trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/t= est/jbide/ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/t= est/jbide/Jbide3441.java Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/t= est/VPETestPlugin.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/t= est/VpeAllTests.java Log: CODING IN PROGRESS - issue JBIDE-3441: VPE - Preferences - change size of V= E pane - press OK - Preview will show empty page. = https://jira.jboss.org/jira/browse/JBIDE-3441 JUnit test of JBIDE-3441 has been added. Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/.proje= ct =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/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/.project = (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/.project = 2009-01-05 17:21:46 UTC (rev 12882) @@ -0,0 +1,11 @@ + + + vpeTest + + + + + + + + Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebCon= tent/pages/JBIDE/JBIDE-3441-1.html =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/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebConten= t/pages/JBIDE/JBIDE-3441-1.html (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebConten= t/pages/JBIDE/JBIDE-3441-1.html 2009-01-05 17:21:46 UTC (rev 12882) @@ -0,0 +1,69 @@ + + + + +Insert title here + + + + + + = + + +

dddddd

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

dddddd

tagged div content

dddddd=

dddddd

ddd= ddd

dddddd

= dddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

+ + \ No newline at end of file Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebCon= tent/pages/JBIDE/JBIDE-3441-2.html =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/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebConten= t/pages/JBIDE/JBIDE-3441-2.html (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/resources/vpeTest/WebConten= t/pages/JBIDE/JBIDE-3441-2.html 2009-01-05 17:21:46 UTC (rev 12882) @@ -0,0 +1,69 @@ + + + + +Insert title here + + + + + + = + + +

dddddd

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

dddddd

tagged div content

dddddd=

dddddd

ddd= ddd

dddddd

= dddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

dddddd<= /div>

dddddd

dddd= dd

dddddd

d= ddddd

dddddd

+ + \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/v= pe/ui/test/VPETestPlugin.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/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/= test/VPETestPlugin.java 2009-01-05 16:40:33 UTC (rev 12881) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/= test/VPETestPlugin.java 2009-01-05 17:21:46 UTC (rev 12882) @@ -10,7 +10,12 @@ **************************************************************************= ****/ package org.jboss.tools.vpe.ui.test; = +import java.net.URL; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.Platform; import org.jboss.tools.common.log.BaseUIPlugin; +import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; = /** @@ -57,4 +62,15 @@ return plugin; } = + public static String getPluginResourcePath() { + Bundle bundle =3D Platform.getBundle(PLUGIN_ID); + URL url =3D null; + try { + url =3D bundle =3D=3D null ? null : FileLocator.resolve(bundle + .getEntry("/resources")); // $NON-NLS-1$ + } catch (Exception e) { + url =3D bundle.getEntry("/resources"); // $NON-NLS-1$ + } + return (url =3D=3D null) ? null : url.getPath(); + } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/v= pe/ui/test/VpeAllTests.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/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/= test/VpeAllTests.java 2009-01-05 16:40:33 UTC (rev 12881) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/= test/VpeAllTests.java 2009-01-05 17:21:46 UTC (rev 12882) @@ -12,6 +12,8 @@ = import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.Arrays; + import junit.framework.Test; import junit.framework.TestSuite; import org.eclipse.core.runtime.IConfigurationElement; @@ -19,6 +21,8 @@ import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; +import org.jboss.tools.tests.ImportBean; +import org.jboss.tools.vpe.ui.test.jbide.Jbide3441; import org.osgi.framework.Bundle; = /** @@ -33,6 +37,7 @@ public static final String TEST_SUITE_PARAM =3D "testSuite"; //$NON-NLS-1$ = public static final String METHOD_SUITE_NAME =3D "suite"; //$NON-NLS-1$ + public static final String VPE_TEST_PROJECT_NAME =3D "vpeTest"; //$NON-NL= S-1$ = public static Test suite() { = @@ -40,6 +45,14 @@ IExtensionRegistry extensionRepository =3D Platform .getExtensionRegistry(); = + // Create test suite for vpeTest project related tests + final TestSuite vpeTestProjectSuite =3D new TestSuite(); = + vpeTestProjectSuite.addTestSuite(Jbide3441.class); + final ImportBean vpeTestProjectBean =3D new ImportBean(); + vpeTestProjectBean.setImportProjectName(VPE_TEST_PROJECT_NAME); + vpeTestProjectBean.setImportProjectPath(VPETestPlugin.getPluginResourceP= ath()); + result.addTest( new VpeTestSetup(vpeTestProjectSuite, Arrays.asList(vpeT= estProjectBean)) ); + = IExtensionPoint extensionPoint =3D extensionRepository .getExtensionPoint(VPE_TEST_EXTENTION_POINT_ID); IExtension[] extensions =3D extensionPoint.getExtensions(); Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/= ui/test/jbide/Jbide3441.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/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/= test/jbide/Jbide3441.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/= test/jbide/Jbide3441.java 2009-01-05 17:21:46 UTC (rev 12882) @@ -0,0 +1,100 @@ +/*************************************************************************= ****** + * 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.vpe.ui.test.jbide; + +import junit.framework.Assert; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.editor.VpeController; +import org.jboss.tools.vpe.ui.test.TestUtil; +import org.jboss.tools.vpe.ui.test.VpeAllTests; +import org.jboss.tools.vpe.ui.test.VpeTest; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNode; + +/** + * Test for JIRA Issue JBIDE-3441 ( https://jira.jboss.org/jira/browse/JBI= DE-3441 ): + * "VPE - Preferences - change size of VE pane - press OK - Preview will s= how empty page" + * = + * @author yradtsevich + * + */ +public class Jbide3441 extends VpeTest { + private static final String TAGGED_DIV_ID =3D "tagged-div"; //$NON-NLS-1$ + private static final String TAGGED_DIV_CONTENT =3D "tagged div content"; = //$NON-NLS-1$ + private static final String TEST_PAGE_NAME_1 =3D "JBIDE/JBIDE-3441-1.html= "; //$NON-NLS-1$ + private static final String TEST_PAGE_NAME_2 =3D "JBIDE/JBIDE-3441-2.html= "; //$NON-NLS-1$ + = + public Jbide3441(String name) { + super(name); + } + = + /** + * Try to open two pages in VPE and refresh them n times. + */ + public void testVisualRefresh() throws Throwable { + setException(null); + + VpeController controller1 =3D openPageInVpe(TEST_PAGE_NAME_1); + VpeController controller2 =3D openPageInVpe(TEST_PAGE_NAME_2); + = + Display display =3D Display.getCurrent(); + for (int i =3D 0; i < 20; i++) { + controller1.visualRefresh(); + controller2.visualRefresh(); + while(display.readAndDispatch()); + TestUtil.waitForJobs(); + Thread.sleep(500); + = + checkTaggedDivValue(controller1, i); + checkTaggedDivValue(controller2, i); = + } + + if (getException() !=3D null) { + throw getException(); + } + } + + private void checkTaggedDivValue(VpeController controller, int i) { + nsIDOMElement taggedDiv =3D controller.getXulRunnerEditor().getDOMDocume= nt().getElementById(TAGGED_DIV_ID); + assertNotNull("taggedDiv should be not null", taggedDiv); //$NON-NLS-1$ + nsIDOMNode innerSpan =3D taggedDiv.getFirstChild(); + assertNotNull("taggedDiv should have inner span", innerSpan); //$NON-NLS= -1$ + nsIDOMNode taggedDivTextNode =3D innerSpan.getFirstChild(); + assertNotNull("taggedDiv should have inner span with text node inside", = taggedDivTextNode); //$NON-NLS-1$ + String taggedDivTextValue =3D taggedDivTextNode.getNodeValue(); + Assert.assertEquals("body of taggedDiv should be equal to \'" + TAGGED_D= IV_CONTENT //$NON-NLS-1$ = + + "\', but it is \'" + taggedDivTextValue + "\'", //$NON-NLS-1$ //$NO= N-NLS-2$ + taggedDivTextValue, TAGGED_DIV_CONTENT); + } + + private VpeController openPageInVpe(final String pageName) throws CoreExc= eption, + PartInitException { + IFile elementPageFile =3D (IFile) TestUtil.getComponentPath( + pageName, VpeAllTests.VPE_TEST_PROJECT_NAME); + IEditorInput input =3D new FileEditorInput(elementPageFile); + + JSPMultiPageEditor editor =3D (JSPMultiPageEditor) PlatformUI.getWorkben= ch() + .getActiveWorkbenchWindow().getActivePage().openEditor(input, + EDITOR_ID, true); + assertNotNull(editor); + + VpeController controller =3D TestUtil.getVpeController(editor); + return controller; + } +} --===============3542788723568575800==--