From jbosstools-commits at lists.jboss.org Wed Feb 27 12:28:09 2008 Content-Type: multipart/mixed; boundary="===============7056032047107373532==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r6608 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1720 and 3 other directories. Date: Wed, 27 Feb 2008 12:28:09 -0500 Message-ID: --===============7056032047107373532== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dsakovich Date: 2008-02-27 12:28:08 -0500 (Wed, 27 Feb 2008) New Revision: 6608 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/1720/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/1720/JBIDE-1720-selectOneListBox.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/1720/JBIDE-1720-selectOneMenu.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/1720/JBIDE-1720-selectOneRadio.jsp trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf= /vpe/jsf/test/jbide/JBIDE1720Test.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf= /vpe/jsf/test/JsfAllTests.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/uti= l/HTML.java Log: Add JUnit test for http://jira.jboss.com/jira/browse/JBIDE-1720 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W= ebContent/pages/JBIDE/1720/JBIDE-1720-selectOneListBox.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.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/1720/JBIDE-1720-selectOneListBox.jsp = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/1720/JBIDE-1720-selectOneListBox.jsp 2008-02-27 17:28:08= UTC (rev 6608) @@ -0,0 +1,29 @@ +<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h" %> +<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f" %> + + + + + + + + = + + + + + + + + + + = + = Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W= ebContent/pages/JBIDE/1720/JBIDE-1720-selectOneMenu.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.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/1720/JBIDE-1720-selectOneMenu.jsp = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/1720/JBIDE-1720-selectOneMenu.jsp 2008-02-27 17:28:08 UT= C (rev 6608) @@ -0,0 +1,29 @@ +<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h" %> +<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f" %> + + + + + + + + + = + + + + + + + + + = + = Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W= ebContent/pages/JBIDE/1720/JBIDE-1720-selectOneRadio.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.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/1720/JBIDE-1720-selectOneRadio.jsp = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/1720/JBIDE-1720-selectOneRadio.jsp 2008-02-27 17:28:08 U= TC (rev 6608) @@ -0,0 +1,28 @@ +<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h" %> +<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f" %> + + + + + + + + + News" itemValue=3D"1" = + escape=3D"false" /> + + + + + + + = + = Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to= ols/jsf/vpe/jsf/test/JsfAllTests.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.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/JsfAllTests.java 2008-02-27 17:24:48 UTC (rev 6607) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/JsfAllTests.java 2008-02-27 17:28:08 UTC (rev 6608) @@ -21,6 +21,7 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1479Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1484Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1615Test; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1720Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1744Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test; @@ -55,6 +56,8 @@ suite.addTestSuite(JBIDE1744Test.class); = suite.addTestSuite(JBIDE675Test.class); suite.addTestSuite(JBIDE1460Test.class); + suite.addTestSuite(JBIDE1720Test.class); + = // $JUnit-END$ //added by Max Areshkau //add here projects which should be imported for junit tests Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools= /jsf/vpe/jsf/test/jbide/JBIDE1720Test.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.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/jbide/JBIDE1720Test.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/jbide/JBIDE1720Test.java 2008-02-27 17:28:08 UTC (rev 6608) @@ -0,0 +1,280 @@ +/*************************************************************************= ****** = + * Copyright (c) 2007 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.jsf.vpe.jsf.test.jbide; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.ui.test.TestUtil; +import org.jboss.tools.vpe.ui.test.VpeTest; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNode; + +/** + * Test JBIDE-1720 + * = + * @author Dzmitry Sakovich (dsakovich(a)exadel.com) + * = + */ +public class JBIDE1720Test extends VpeTest { + + public static final String IMPORT_PROJECT_NAME =3D "jsfTest"; + + private static final String TEST_PAGE_NAME1 =3D "JBIDE/1720/JBIDE-1720-se= lectOneRadio.jsp"; + private static final String TEST_PAGE_NAME2 =3D "JBIDE/1720/JBIDE-1720-se= lectOneListBox.jsp"; + private static final String TEST_PAGE_NAME3 =3D "JBIDE/1720/JBIDE-1720-se= lectOneMenu.jsp"; + + public JBIDE1720Test(String name) { + super(name); + } + + // test method for JBIDE 1720 selectOneRadio component + public void testJBIDE_1720_selectOneRadio() throws Throwable { + // wait + TestUtil.waitForJobs(); + // set exception + setException(null); + + // get test page path + IFile file =3D (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME1, + IMPORT_PROJECT_NAME); + + assertNotNull("Could not open specified file " + file.getFullPath(), + file); + + IEditorInput input =3D new FileEditorInput(file); + + assertNotNull("Editor input is null", input); + // open and get editor + JSPMultiPageEditor part =3D openEditor(input); + + // get dom document + nsIDOMDocument document =3D getVpeVisualDocument(part); + nsIDOMElement element =3D document.getDocumentElement(); + + // check that element is not null + assertNotNull(element); + + // get root node + nsIDOMNode node =3D (nsIDOMNode) element + .queryInterface(nsIDOMNode.NS_IDOMNODE_IID); + + List elements =3D new ArrayList(); + + // find "input" elements + TestUtil.findElementsByName(node, elements, HTML.TAG_INPUT); + + assertEquals(5, elements.size()); + + for (int i =3D 0; i < elements.size(); i++) { + + nsIDOMElement inputElement =3D (nsIDOMElement) elements.get(i) + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + assertNotNull(inputElement); + String dir =3D inputElement.getAttribute(HTML.ATTR_DIR); + assertNotNull(dir); + assertEquals("rtl", dir); + + String disabled =3D inputElement.getAttribute(HTML.ATTR_DISABLED); + assertNotNull(disabled); + assertEquals("disabled", disabled); + } + + elements.clear(); + + // find "label" elements + TestUtil.findElementsByName(node, elements, HTML.TAG_LABEL); + + assertEquals(5, elements.size()); + + for (int i =3D 0; i < elements.size(); i++) { + + nsIDOMElement inputElement =3D (nsIDOMElement) elements.get(i) + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + assertNotNull(inputElement); + String style =3D inputElement.getAttribute(HTML.ATTR_CLASS); + assertNotNull(style); + assertEquals("myStyle1", style); + + } + + if (getException() !=3D null) { + throw getException(); + } + } + + // test method for JBIDE 1720 selectOneMenu component + public void testJBIDE_1720_selectOneMenu() throws Throwable { + // wait + TestUtil.waitForJobs(); + // set exception + setException(null); + + // get test page path + IFile file =3D (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME3, + IMPORT_PROJECT_NAME); + + assertNotNull("Could not open specified file " + file.getFullPath(), + file); + + IEditorInput input =3D new FileEditorInput(file); + + assertNotNull("Editor input is null", input); + // open and get editor + JSPMultiPageEditor part =3D openEditor(input); + + // get dom document + nsIDOMDocument document =3D getVpeVisualDocument(part); + nsIDOMElement element =3D document.getDocumentElement(); + + // check that element is not null + assertNotNull(element); + + // get root node + nsIDOMNode node =3D (nsIDOMNode) element + .queryInterface(nsIDOMNode.NS_IDOMNODE_IID); + + List elements =3D new ArrayList(); + + // find "select" elements + TestUtil.findElementsByName(node, elements, HTML.TAG_SELECT); + + assertEquals(1, elements.size()); + + nsIDOMElement select =3D (nsIDOMElement) elements.get(0).queryInterface( + nsIDOMElement.NS_IDOMELEMENT_IID); + + String size =3D select.getAttribute(HTML.ATTR_SIZE); + assertNotNull("Attribute size is not exist.", size); + assertEquals("1", size); + + String styleClass =3D select.getAttribute(HTML.ATTR_CLASS); + assertNotNull("Attribute class is not exist.", styleClass); + assertEquals("myStyle2", styleClass); + + String style =3D select.getAttribute(HTML.ATTR_STYLE); + assertNotNull("Attribute style is not exist.", style); + assertEquals("font-size: large;", style); + + String dir =3D select.getAttribute(HTML.ATTR_DIR); + assertNotNull("Attribute dir is not exist.", dir); + assertEquals("rtl", dir); + + elements.clear(); + + // find "option" elements + TestUtil.findElementsByName(node, elements, HTML.TAG_OPTION); + + assertEquals(5, elements.size()); + + for (int i =3D 0; i < elements.size(); i++) { + + nsIDOMElement inputElement =3D (nsIDOMElement) elements.get(i) + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + assertNotNull(inputElement); + String attr =3D inputElement.getAttribute(HTML.ATTR_CLASS); + assertNotNull("Attribute class is not exist in option tag", attr); + assertEquals("myStyle1", attr); + + } + + if (getException() !=3D null) { + throw getException(); + } + } + + // test method for JBIDE 1720 selectOneListBox component + public void testJBIDE_1720_selectOneListBox() throws Throwable { + // wait + TestUtil.waitForJobs(); + // set exception + setException(null); + + // get test page path + IFile file =3D (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME2, + IMPORT_PROJECT_NAME); + + assertNotNull("Could not open specified file " + file.getFullPath(), + file); + + IEditorInput input =3D new FileEditorInput(file); + + assertNotNull("Editor input is null", input); + // open and get editor + JSPMultiPageEditor part =3D openEditor(input); + + // get dom document + nsIDOMDocument document =3D getVpeVisualDocument(part); + nsIDOMElement element =3D document.getDocumentElement(); + + // check that element is not null + assertNotNull(element); + + // get root node + nsIDOMNode node =3D (nsIDOMNode) element + .queryInterface(nsIDOMNode.NS_IDOMNODE_IID); + + List elements =3D new ArrayList(); + + // find "select" elements + TestUtil.findElementsByName(node, elements, HTML.TAG_SELECT); + + assertEquals(1, elements.size()); + + nsIDOMElement select =3D (nsIDOMElement) elements.get(0).queryInterface( + nsIDOMElement.NS_IDOMELEMENT_IID); + + String size =3D select.getAttribute(HTML.ATTR_SIZE); + assertNotNull("Attribute size is not exist.", size); + assertEquals("3", size); + + String styleClass =3D select.getAttribute(HTML.ATTR_CLASS); + assertNotNull("Attribute class is not exist.", styleClass); + assertEquals("myStyle2", styleClass); + + String style =3D select.getAttribute(HTML.ATTR_STYLE); + assertNotNull("Attribute style is not exist.", style); + assertEquals("font-size: large;", style); + + String disabled =3D select.getAttribute(HTML.ATTR_DISABLED); + assertNotNull("Attribute disabled is not exist.", disabled); + assertEquals("disabled", disabled); + + elements.clear(); + + // find "option" elements + TestUtil.findElementsByName(node, elements, HTML.TAG_OPTION); + + assertEquals(5, elements.size()); + + for (int i =3D 0; i < elements.size(); i++) { + + nsIDOMElement inputElement =3D (nsIDOMElement) elements.get(i) + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + assertNotNull(inputElement); + String attr =3D inputElement.getAttribute(HTML.ATTR_CLASS); + assertNotNull("Attribute class is not exist in option tag", attr); + assertEquals("myStyle", attr); + + } + + if (getException() !=3D null) { + throw getException(); + } + } + +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/util/HTML.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/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ut= il/HTML.java 2008-02-27 17:24:48 UTC (rev 6607) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ut= il/HTML.java 2008-02-27 17:28:08 UTC (rev 6608) @@ -73,7 +73,7 @@ public static final String ATTR_CELLPADDING =3D "cellpadding"; //$NON-= NLS-1$ public static final String ATTR_WIDTH =3D "WIDTH"; //$NON-NLS-1$ public static final String ATTR_HEIGHT =3D "HEIGHT"; //$NON-NLS-1$ - public static final String ATTR_BORDER =3D "BORDER"; //$NON-NLS-1$ + public static final String ATTR_BORDER =3D "border"; //$NON-NLS-1$ public static final String ATTR_FOR =3D "FOR"; public static final String ATTR_DIR =3D "dir"; public static final String ATTR_DISABLED =3D "disabled"; --===============7056032047107373532==--