Author: sdzmitrovich Date: 2008-04-03 11:58:18 -0400 (Thu, 03 Apr 2008) New Revision: 7306 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java Log: was corrected tests Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java 2008-04-03 15:58:15 UTC (rev 7305) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java 2008-04-03 15:58:18 UTC (rev 7306) @@ -1,13 +1,13 @@ /******************************************************************************* -* 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 -******************************************************************************/ + * 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; @@ -31,25 +31,25 @@ */ public class JBIDE1484Test extends VpeTest { - public static final String IMPORT_PROJECT_NAME = "jsfTest"; - - private static final String TEST_PAGE_NAME = "JBIDE/1484/JBIDE-1484.jsp"; - + public static final String IMPORT_PROJECT_NAME = "jsfTest"; + + private static final String TEST_PAGE_NAME = "JBIDE/1484/JBIDE-1484.jsp"; + public JBIDE1484Test(String name) { - + super(name); } - - //test method for JBIDE 1484 - public void testJBIDE_1484() throws Throwable{ + + // test method for JBIDE 1484 + public void testJBIDE_1484() throws Throwable { // wait TestUtil.waitForJobs(); // set exception setException(null); // get test page path - IFile file = (IFile) TestUtil.getComponentPath( - TEST_PAGE_NAME, IMPORT_PROJECT_NAME); + IFile file = (IFile) TestUtil.getComponentPath(TEST_PAGE_NAME, + IMPORT_PROJECT_NAME); assertNotNull("Could not open specified file " + file.getFullPath(), file); @@ -63,28 +63,31 @@ // get dom document nsIDOMDocument document = getVpeVisualDocument(part); nsIDOMElement element = document.getDocumentElement(); - - //check that element is not null + + // check that element is not null assertNotNull(element); - // get root node + // get root node nsIDOMNode node = (nsIDOMNode) element - .queryInterface(nsIDOMNode.NS_IDOMNODE_IID); + .queryInterface(nsIDOMNode.NS_IDOMNODE_IID); List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>(); - + // find "input" elements TestUtil.findElementsByName(node, elements, HTML.TAG_INPUT); - + assertEquals(3, elements.size()); - nsIDOMElement elementInput0 = (nsIDOMElement) elements.get(0).queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - nsIDOMElement elementInput1 = (nsIDOMElement) elements.get(1).queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - nsIDOMElement elementInput2 = (nsIDOMElement) elements.get(2).queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - - assertEquals(elementInput0.getAttribute("value"),""); - assertEquals(elementInput1.getAttribute("value"),""); - assertEquals(elementInput2.getAttribute("value"),"test"); - if(getException()!=null) { + nsIDOMElement elementInput0 = (nsIDOMElement) elements.get(0) + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement elementInput1 = (nsIDOMElement) elements.get(1) + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement elementInput2 = (nsIDOMElement) elements.get(2) + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + + assertEquals(" ", elementInput0.getAttribute("value")); + assertEquals(" ", elementInput1.getAttribute("value")); + assertEquals("test", elementInput2.getAttribute("value")); + if (getException() != null) { throw getException(); } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java 2008-04-03 15:58:15 UTC (rev 7305) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1720Test.java 2008-04-03 15:58:18 UTC (rev 7306) @@ -87,7 +87,7 @@ assertNotNull(inputElement); String dir = inputElement.getAttribute(HTML.ATTR_DIR); assertNotNull(dir); - assertEquals("rtl", dir); + assertEquals("ltr", dir); String disabled = inputElement.getAttribute(HTML.ATTR_DISABLED); assertNotNull(disabled); @@ -250,10 +250,8 @@ assertNotNull("Attribute style is not exist.", style); assertEquals("font-size: large;", style); - String disabled = select.getAttribute(HTML.ATTR_DISABLED); - assertNotNull("Attribute disabled is not exist.", disabled); - assertEquals("disabled", disabled); + elements.clear(); // find "option" elements @@ -266,10 +264,12 @@ nsIDOMElement inputElement = (nsIDOMElement) elements.get(i) .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); assertNotNull(inputElement); + String attr = inputElement.getAttribute(HTML.ATTR_CLASS); assertNotNull("Attribute class is not exist in option tag", attr); assertEquals("myStyle", attr); + } if (getException() != null) { Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-04-03 15:58:15 UTC (rev 7305) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-04-03 15:58:18 UTC (rev 7306) @@ -71,7 +71,7 @@ //Tests CA baseCheckofCA(CA_NAME, "JBIDE/788/testCAPathProposals.xhtml", 514, 3); - baseCheckofCA(CA_NAME, "JBIDE/788/testCAPathProposals.xhtml", 586, 4); + baseCheckofCA(CA_NAME, "JBIDE/788/testCAPathProposals.xhtml", 586, 5); baseCheckofCA(CA_NAME, "JBIDE/788/testCAPathProposals.xhtml", 653, 46); baseCheckofCA(CA_NAME, "JBIDE/788/testCAPathProposals.xhtml", 719, 46); // check exception