Author: mareshkau Date: 2010-11-24 09:44:28 -0500 (Wed, 24 Nov 2010) New Revision: 26878 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/JBIDE1484Test.java Removed: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java Log: https://jira.jboss.org/browse/JBIDE-7704, moving seam test to right place Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-11-24 14:20:55 UTC (rev 26877) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-11-24 14:44:28 UTC (rev 26878) @@ -22,7 +22,6 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1105Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1460Test; 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.JBIDE1494Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1615Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1720Test; @@ -163,7 +162,6 @@ suite.addTestSuite(JBIDE3441Test.class); suite.addTestSuite(JsfJbide1467Test.class); suite.addTestSuite(JsfJbide1501Test.class); - suite.addTestSuite(JBIDE1484Test.class); suite.addTestSuite(JsfJbide1568Test.class); suite.addTestSuite(JBIDE1615Test.class); suite.addTestSuite(JBIDE1479Test.class); Deleted: 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 2010-11-24 14:20:55 UTC (rev 26877) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1484Test.java 2010-11-24 14:44:28 UTC (rev 26878) @@ -1,92 +0,0 @@ -/******************************************************************************* - * 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 static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; - -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.jsf.vpe.jsf.test.JsfAllTests; -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; - -/** - * @author Max Areshkau - * - * junit for JBIDE-1484(http://jira.jboss.com/jira/browse/JBIDE-1484) - */ -public class JBIDE1484Test extends VpeTest { - - private static final String TEST_PAGE_NAME = "JBIDE/1484/JBIDE-1484.jsp"; //$NON-NLS-1$ - - public JBIDE1484Test(String name) { - - super(name); - } - - // 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, - JsfAllTests.IMPORT_PROJECT_NAME); - - assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME//$NON-NLS-1$ - + ";projectName = " + JsfAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$ - - IEditorInput input = new FileEditorInput(file); - - assertNotNull("Editor input is null", input); //$NON-NLS-1$ - // open and get editor - JSPMultiPageEditor part = openEditor(input); - - // get dom document - nsIDOMDocument document = TestUtil.getVpeVisualDocument(part); - nsIDOMElement element = document.getDocumentElement(); - - // check that element is not null - assertNotNull(element); - - // get root node - nsIDOMNode node = queryInterface(element, nsIDOMNode.class); - - List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>(); - - // find "input" elements - TestUtil.findElementsByName(node, elements, HTML.TAG_INPUT); - - assertEquals(3, elements.size()); - nsIDOMElement elementInput0 = queryInterface(elements.get(0), nsIDOMElement.class); - nsIDOMElement elementInput1 = queryInterface(elements.get(1), nsIDOMElement.class); - nsIDOMElement elementInput2 = queryInterface(elements.get(2), nsIDOMElement.class); - - assertEquals(" ", elementInput0.getAttribute("value")); //$NON-NLS-1$//$NON-NLS-2$ - assertEquals(" ", elementInput1.getAttribute("value")); //$NON-NLS-1$ //$NON-NLS-2$ - assertEquals("test", elementInput2.getAttribute("value")); //$NON-NLS-1$ //$NON-NLS-2$ - if (getException() != null) { - throw getException(); - } - } - -} Copied: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/JBIDE1484Test.java (from rev 26876, 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.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/JBIDE1484Test.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/JBIDE1484Test.java 2010-11-24 14:44:28 UTC (rev 26878) @@ -0,0 +1,91 @@ +/******************************************************************************* + * 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.seam.test; + +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + +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; + +/** + * @author Max Areshkau + * + * junit for JBIDE-1484(http://jira.jboss.com/jira/browse/JBIDE-1484) + */ +public class JBIDE1484Test extends VpeTest { + + private static final String TEST_PAGE_NAME = "JBIDE/1484/JBIDE-1484.jsp"; //$NON-NLS-1$ + + public JBIDE1484Test(String name) { + + super(name); + } + + // 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, + SeamAllTests.IMPORT_PROJECT_NAME); + + assertNotNull("Could not open specified file. componentPage = " + TEST_PAGE_NAME//$NON-NLS-1$ + + ";projectName = " + SeamAllTests.IMPORT_PROJECT_NAME, file);//$NON-NLS-1$ + + IEditorInput input = new FileEditorInput(file); + + assertNotNull("Editor input is null", input); //$NON-NLS-1$ + // open and get editor + JSPMultiPageEditor part = openEditor(input); + + // get dom document + nsIDOMDocument document = TestUtil.getVpeVisualDocument(part); + nsIDOMElement element = document.getDocumentElement(); + + // check that element is not null + assertNotNull(element); + + // get root node + nsIDOMNode node = queryInterface(element, nsIDOMNode.class); + + List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>(); + + // find "input" elements + TestUtil.findElementsByName(node, elements, HTML.TAG_INPUT); + + assertEquals(3, elements.size()); + nsIDOMElement elementInput0 = queryInterface(elements.get(0), nsIDOMElement.class); + nsIDOMElement elementInput1 = queryInterface(elements.get(1), nsIDOMElement.class); + nsIDOMElement elementInput2 = queryInterface(elements.get(2), nsIDOMElement.class); + + assertEquals(" ", elementInput0.getAttribute("value")); //$NON-NLS-1$//$NON-NLS-2$ + assertEquals(" ", elementInput1.getAttribute("value")); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("test", elementInput2.getAttribute("value")); //$NON-NLS-1$ //$NON-NLS-2$ + if (getException() != null) { + throw getException(); + } + } + +} Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java 2010-11-24 14:20:55 UTC (rev 26877) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamAllTests.java 2010-11-24 14:44:28 UTC (rev 26878) @@ -31,6 +31,7 @@ // $JUnit-BEGIN$ suite.addTestSuite(SeamComponentTest.class); suite.addTestSuite(SeamComponentContentTest.class); + suite.addTestSuite(JBIDE1484Test.class); // $JUnit-END$ return new VpeTestSetup(suite); }