Author: yradtsevich Date: 2009-08-21 08:54:34 -0400 (Fri, 21 Aug 2009) New Revision: 17218 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1460/JBIDE-1460.xhtml.xml Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1460/JBIDE-1460.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java Log: JBIDE-1460: https://jira.jboss.org/jira/browse/JBIDE-1460 - JUnit fixed Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1460/JBIDE-1460.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1460/JBIDE-1460.xhtml 2009-08-21 12:46:46 UTC (rev 17217) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1460/JBIDE-1460.xhtml 2009-08-21 12:54:34 UTC (rev 17218) @@ -7,7 +7,7 @@ <h:form> <rich:tree style="width:300px" switchType="ajax" stateAdvisor="#{treeDemoStateAdvisor}"> - <rich:recursiveTreeNodesAdaptor roots="#{fileSystemBean.sourceRoots}" var="item" nodes="#{item.nodes}" /> + <rich:recursiveTreeNodesAdaptor id="treeNodes" roots="#{fileSystemBean.sourceRoots}" var="item" nodes="#{item.nodes}" /> </rich:tree> </h:form> </ui:composition> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1460/JBIDE-1460.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1460/JBIDE-1460.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/1460/JBIDE-1460.xhtml.xml 2009-08-21 12:54:34 UTC (rev 17218) @@ -0,0 +1,23 @@ +<tests> + <test id="treeNodes"> + <DIV> + <TABLE> + <TBODY> + <TR> + <TD> + <IMG/> + </TD> + <TD> + <IMG/> + </TD> + <TD> + <SPAN> + #{item.nodes} + </SPAN> + </TD> + </TR> + </TBODY> + </TABLE> + </DIV> + </test> +</tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2009-08-21 12:46:46 UTC (rev 17217) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1460Test.java 2009-08-21 12:54:34 UTC (rev 17218) @@ -10,81 +10,32 @@ ******************************************************************************/ 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.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; +import org.jboss.tools.vpe.ui.test.ComponentContentTest; /** * Test JBIDE-1460 * * @author dsakovich(a)exadel.com + * @author yradtsevich * */ -public class JBIDE1460Test extends VpeTest { - - private static final String TEST_PAGE_NAME = "JBIDE/1460/JBIDE-1460.xhtml"; //$NON-NLS-1$ - +public class JBIDE1460Test extends ComponentContentTest { public JBIDE1460Test(String name) { - super(name); + super(name); } // test method for JBIDE 1460 public void testJBIDE_1460() throws Throwable { - // wait - TestUtil.waitForJobs(); - // set exception - setException(null); + performContentTest( "JBIDE/1460/JBIDE-1460.xhtml"); //$NON-NLS-1$ + } - // 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 = (nsIDOMNode) element - .queryInterface(nsIDOMNode.NS_IDOMNODE_IID); - - List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>(); - - // find "span" elements - TestUtil.findElementsByName(node, elements, HTML.TAG_SPAN); - - assertEquals(3, elements.size()); - - nsIDOMNode span = elements.get(0); - - nsIDOMNode text = span.getFirstChild(); - assertEquals(text.getNodeValue().trim(), "#{item.nodes}"); //$NON-NLS-1$ - - if (getException() != null) { - throw getException(); + /* (non-Javadoc) + * @see org.jboss.tools.vpe.ui.test.ComponentContentTest#getTestProjectName() + */ + @Override + protected String getTestProjectName() { + return JsfAllTests.IMPORT_PROJECT_NAME; } - } }