Author: dgolovin Date: 2008-01-18 15:58:47 -0500 (Fri, 18 Jan 2008) New Revision: 5816 Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewAllTests.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTestSetup.java Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamFormNewWizardTest.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamProjectNewWizardTest.java Log: fix test errors Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2008-01-18 20:02:11 UTC (rev 5815) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2008-01-18 20:58:47 UTC (rev 5816) @@ -16,7 +16,9 @@ import org.jboss.tools.seam.ui.test.preferences.SeamPreferencesPageTest; import org.jboss.tools.seam.ui.test.hyperlink.SeamViewHyperlinkPartitionerTest; +import org.jboss.tools.seam.ui.test.view.SeamComponentsViewAllTests; import org.jboss.tools.seam.ui.test.view.SeamComponentsViewTest; +import org.jboss.tools.seam.ui.test.view.SeamComponentsViewTestSetup; import org.jboss.tools.seam.ui.test.wizard.SeamFormNewWizardTest; import org.jboss.tools.seam.ui.test.wizard.SeamProjectNewWizardTest; @@ -27,8 +29,8 @@ public class SeamUiAllTests { public static Test suite() { - TestSuite suite = new TestSuite(SeamUiAllTests.class.getName()); - suite.addTestSuite(SeamComponentsViewTest.class); + TestSuite suite = new TestSuite("Seam UI tests"); + suite.addTest(SeamComponentsViewAllTests.suite()); suite.addTestSuite(SeamProjectNewWizardTest.class); suite.addTestSuite(SeamFormNewWizardTest.class); suite.addTestSuite(SeamPreferencesPageTest.class); Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewAllTests.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewAllTests.java 2008-01-18 20:58:47 UTC (rev 5816) @@ -0,0 +1,26 @@ +/******************************************************************************* + * 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.seam.ui.test.view; + +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * @author eskimo + * + */ +public class SeamComponentsViewAllTests { + public static Test suite() { + TestSuite suite = new TestSuite("Seam Components View tests"); + suite.addTest(new SeamComponentsViewTestSetup(new TestSuite(SeamComponentsViewTest.class))); + return suite; + } +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewAllTests.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2008-01-18 20:02:11 UTC (rev 5815) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2008-01-18 20:58:47 UTC (rev 5816) @@ -64,32 +64,23 @@ @Override protected void setUp() throws Exception { super.setUp(); - //ScopePresentationActionProvider.setPackageStructureFlat(false); - WorkbenchUtils.getWorkbench().showPerspective( - WebDevelopmentPerspectiveFactory.PERSPECTIVE_ID, - WorkbenchUtils.getWorkbench().getActiveWorkbenchWindow()); - TestProjectProvider provider=null; + project = (IProject)ResourcesPlugin.getWorkspace().getRoot().findMember("TestComponentView"); + assertNotNull("",project); - if(project==null) { - project = ResourcesUtils.importProject(Platform.getBundle("org.jboss.tools.seam.ui.test"), "/projects/TestComponentView", new NullProgressMonitor()); - } componentsFile = project.getFile("WebContent/WEB-INF/components.xml"); assertTrue("Cannot find components.xml in test project", componentsFile != null && componentsFile.exists()); + + EditorTestHelper.joinBackgroundActivities(); } - public void testAddComponentInXmlFile(){ - SeamCorePlugin.getSeamProject(project, true); - + public void testAddComponentInXmlFile() throws CoreException{ CommonNavigator navigator = getSeamComponentsView(); navigator.getCommonViewer().expandAll(); - Tree tree = navigator.getCommonViewer().getTree(); - updateTree(tree); - ISeamPackage seamPackage = findSeamPackage(tree, "myPackage"); assertTrue("Error in initial loading components from components.xml. " + @@ -104,7 +95,6 @@ try { componentsFile.setContents(file1.getContents(), true, false, new NullProgressMonitor()); - componentsFile.touch(new NullProgressMonitor()); } catch (CoreException e) { JUnitUtils.fail("Error in changing 'components.xml' content to " + "'WebContent/WEB-INF/components.1'", e); @@ -112,8 +102,8 @@ refreshProject(project); - updateTree(tree); - + navigator.getCommonViewer().expandAll(); + seamPackage = findSeamPackage(tree, "myPackage"); assertTrue("Seam model is not updated, expected package 'myPackage'" + " is not found in tree",seamPackage!=null); @@ -126,13 +116,12 @@ } - public void testRenameComponentInXmlFile(){ + public void testRenameComponentInXmlFile() throws CoreException{ CommonNavigator navigator = getSeamComponentsView(); navigator.getCommonViewer().expandAll(); Tree tree = navigator.getCommonViewer().getTree(); - updateTree(tree); ISeamPackage seamPackage = findSeamPackage(tree, "myPackage"); @@ -152,16 +141,15 @@ try{ componentsFile.setContents(file1.getContents(), true, false, new NullProgressMonitor()); - componentsFile.touch(new NullProgressMonitor()); }catch(Exception ex){ JUnitUtils.fail("Error in changing 'components.xml' content to " + "'WebContent/WEB-INF/components.2'", ex); } refreshProject(project); + + navigator.getCommonViewer().expandAll(); - updateTree(tree); - seamPackage = findSeamPackage(tree, "myPackage"); assertTrue("Expected package 'myPackage' was not found it tree", seamPackage!=null); @@ -176,7 +164,6 @@ } try{ componentsFile.setContents(file1.getContents(), true, false, new NullProgressMonitor()); - componentsFile.touch(new NullProgressMonitor()); }catch(Exception ex){ JUnitUtils.fail("Error in changing 'components.xml' content to " + "'WebContent/WEB-INF/components.3'", ex); @@ -184,8 +171,10 @@ refreshProject(project); - updateTree(tree); + navigator.getCommonViewer().expandAll(); + EditorTestHelper.joinBackgroundActivities(); + seamPackage = findSeamPackage(tree, "myNewPackage"); assertTrue("Expected package 'myNewPackage' was not found it tree after " + "renaming", @@ -196,15 +185,13 @@ "after renaming",component!=null); } - public void testDeleteComponentInXmlFile(){ + public void testDeleteComponentInXmlFile() throws CoreException{ CommonNavigator navigator = getSeamComponentsView(); navigator.getCommonViewer().expandAll(); - + EditorTestHelper.joinBackgroundActivities(); Tree tree = navigator.getCommonViewer().getTree(); - updateTree(tree); - ISeamPackage seamPackage = findSeamPackage(tree, "myNewPackage"); assertTrue("Package \"myNewPackage\" not found!",seamPackage!=null); @@ -216,14 +203,13 @@ try{ componentsFile.setContents(file1.getContents(), true, false, new NullProgressMonitor()); - componentsFile.touch(new NullProgressMonitor()); }catch(Exception ex){ JUnitUtils.fail("Cannot read file WebContent/WEB-INF/components.4", ex); } refreshProject(project); - updateTree(tree); + navigator.getCommonViewer().expandAll(); seamPackage = findSeamPackage(tree, "myNewPackage"); assertTrue("Package \"myNewPackage\" found!",seamPackage==null); @@ -248,14 +234,13 @@ try{ classFile.create(file1.getContents(), false, new NullProgressMonitor()); - classFile.touch(new NullProgressMonitor()); }catch(Exception ex){ JUnitUtils.fail("Cannot read file JavaSource/demo/Person.1", ex); } refreshProject(project); - updateTree(tree); + navigator.getCommonViewer().expandAll(); seamPackage = findSeamPackage(tree, "demo"); assertTrue("Package \"demo\" not found!",seamPackage!=null); @@ -286,14 +271,13 @@ try{ classFile.setContents(file1.getContents(), true, false, new NullProgressMonitor()); - classFile.touch(new NullProgressMonitor()); }catch(Exception ex){ JUnitUtils.fail("Cannot read file JavaSource/demo/Person.2", ex); } refreshProject(project); - updateTree(tree); + navigator.getCommonViewer().expandAll(); seamPackage = findSeamPackage(tree, "demo"); assertTrue("Package \"demo\" not found!",seamPackage!=null); @@ -309,14 +293,13 @@ try{ classFile.setContents(file2.getContents(), true, false, new NullProgressMonitor()); - classFile.touch(new NullProgressMonitor()); }catch(Exception ex){ JUnitUtils.fail("Cannot read file JavaSource/demo/Person.3", ex); } refreshProject(project); - updateTree(tree); + navigator.getCommonViewer().expandAll(); seamPackage = findSeamPackage(tree, "demo"); assertTrue("Package \"demo\" found!",seamPackage==null); @@ -352,7 +335,7 @@ refreshProject(project); - updateTree(tree); + navigator.getCommonViewer().expandAll(); seamPackage = findSeamPackage(tree, "beatles"); assertTrue("Package \"beatles\" found!",seamPackage==null); @@ -390,7 +373,7 @@ } Tree tree = navigator.getCommonViewer().getTree(); - updateTree(tree); + navigator.getCommonViewer().expandAll(); ISeamPackage seamPackage = findSeamPackage(tree, "package1"); @@ -423,7 +406,7 @@ Tree tree = navigator.getCommonViewer().getTree(); - updateTree(tree); + navigator.getCommonViewer().expandAll(); ISeamPackage seamPackage = findSeamPackage(tree, "package1"); @@ -564,11 +547,4 @@ } } - - public void updateTree(Tree tree) { - for(int i=0;i<tree.getItemCount();i++){ - showTreeItem(tree.getItem(i),0); - } - - } } Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTestSetup.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTestSetup.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTestSetup.java 2008-01-18 20:58:47 UTC (rev 5816) @@ -0,0 +1,62 @@ +/******************************************************************************* + * 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.seam.ui.test.view; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Platform; +import org.jboss.tools.jst.web.ui.WebDevelopmentPerspectiveFactory; +import org.jboss.tools.test.util.ResourcesUtils; +import org.jboss.tools.test.util.WorkbenchUtils; +import org.jboss.tools.test.util.xpl.EditorTestHelper; + +import junit.extensions.TestSetup; +import junit.framework.Test; + +/** + * @author eskimo + * + */ +public class SeamComponentsViewTestSetup extends TestSetup { + + private IProject project; + + /** + * @param test + */ + public SeamComponentsViewTestSetup(Test test) { + super(test); + } + + /* (non-Javadoc) + * @see junit.extensions.TestSetup#setUp() + */ + protected void setUp() throws Exception { + super.setUp(); + //ScopePresentationActionProvider.setPackageStructureFlat(false); + WorkbenchUtils.getWorkbench().showPerspective( + WebDevelopmentPerspectiveFactory.PERSPECTIVE_ID, + WorkbenchUtils.getWorkbench().getActiveWorkbenchWindow()); + EditorTestHelper.joinBackgroundActivities(); + project = ResourcesUtils.importProject(Platform.getBundle("org.jboss.tools.seam.ui.test"), "/projects/TestComponentView", new NullProgressMonitor()); + EditorTestHelper.joinBackgroundActivities(); + } + + /* (non-Javadoc) + * @see junit.extensions.TestSetup#tearDown() + */ + protected void tearDown() throws Exception { + EditorTestHelper.joinBackgroundActivities(); + project.delete(true,true, null); + } + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTestSetup.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamFormNewWizardTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamFormNewWizardTest.java 2008-01-18 20:02:11 UTC (rev 5815) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamFormNewWizardTest.java 2008-01-18 20:58:47 UTC (rev 5816) @@ -10,14 +10,20 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.test.wizard; +import java.util.Map; + import junit.framework.TestCase; +import org.apache.velocity.runtime.directive.Foreach; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.swt.widgets.Control; import org.eclipse.ui.PlatformUI; import org.jboss.tools.common.util.WorkbenchUtils; import org.jboss.tools.seam.ui.ISeamUiConstants; +import org.jboss.tools.seam.ui.widget.editor.IFieldEditor; +import org.jboss.tools.seam.ui.wizard.SeamBaseWizardPage; /** * @author eskimo @@ -28,14 +34,58 @@ /** * */ - public void testSeamFormNewWizardInstanceIsCreated() { + public void checkNewWizardStartPage(String ID) { IWizard aWizard = WorkbenchUtils.findWizardByDefId( - ISeamUiConstants.NEW_SEAM_FORM_WIZARD_ID); + ID); WizardDialog dialog = new WizardDialog( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), aWizard); - IWizardPage startPage = aWizard.getStartingPage(); + dialog.setBlockOnOpen(false); + dialog.open(); + try { + SeamBaseWizardPage page = (SeamBaseWizardPage)dialog.getSelectedPage(); + Map<String,IFieldEditor> editors = (Map<String,IFieldEditor>) page.getAdapter(Map.class); + for (IFieldEditor editor : editors.values()) { + Object[] controls = editor.getEditorControls(); + for (Object object : controls) { + assertNotNull(object); + } + } + } finally { + dialog.close(); + } } + + /** + * + */ + public void testSeamActionNewWizardIsCreated() { + checkNewWizardStartPage( + ISeamUiConstants.NEW_SEAM_ACTION_WIZARD_ID); + } + /** + * + */ + public void testSeamActionNewFormWizardIsCreated() { + checkNewWizardStartPage( + ISeamUiConstants.NEW_SEAM_FORM_WIZARD_ID); + } + + /** + * + */ + public void testSeamActionNewConversationIsCreated() { + checkNewWizardStartPage( + ISeamUiConstants.NEW_SEAM_CONVERSATION_WIZARD_ID); + } + + /** + * + */ + public void testSeamActionNewEntityIsCreated() { + checkNewWizardStartPage( + ISeamUiConstants.NEW_SEAM_ENTITY_WIZARD_ID); + } } Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamProjectNewWizardTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamProjectNewWizardTest.java 2008-01-18 20:02:11 UTC (rev 5815) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamProjectNewWizardTest.java 2008-01-18 20:58:47 UTC (rev 5816) @@ -57,6 +57,10 @@ SeamRuntimeManager manager = SeamRuntimeManager.getInstance(); + public SeamProjectNewWizardTest() { + super("New Seam Web Project tests"); + } + @Override protected void setUp() throws Exception { super.setUp();