Author: vrubezhny Date: 2008-05-27 14:59:52 -0400 (Tue, 27 May 2008) New Revision: 8380 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/wizard/AbstractSeamNewOperationTest.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20EARNewOperationTest.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20WARNewOperationTest.java Log: http://jira.jboss.com/jira/browse/JBIDE-2004 Create JUnit tests for New Seam Action/Form/Conversation/Entity wizards. It should invoke seam-gen and check results of its work. JUnit TestCases are created (No test project templates are required) 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-05-27 18:48:15 UTC (rev 8379) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2008-05-27 18:59:52 UTC (rev 8380) @@ -51,22 +51,10 @@ suite.addTestSuite(SeamELContentAssistJbide1645Test.class); suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamSettingsPreferencesPageTest.class), "org.jboss.tools.seam.ui.test", "projects/TestSeamSettingsPreferencesPage", "TestSeamSettingsPreferencesPage")); - suite.addTest(new ProjectImportTestSetup(new TestSuite(Seam12EARNewOperationTest.class), - "org.jboss.tools.seam.ui.test", - new String[]{"projects/seam_ear", "projects/seam_ear-ejb", "projects/seam_ear-test"}, - new String[]{"seam_ear", "seam_ear-ejb", "seam_ear-test"})); - suite.addTest(new ProjectImportTestSetup(new TestSuite(Seam12WARNewOperationTest.class), - "org.jboss.tools.seam.ui.test", - new String[]{"projects/seam_war", "projects/seam_war-test"}, - new String[]{"seam_war", "seam_war-test"})); - suite.addTest(new ProjectImportTestSetup(new TestSuite(Seam20EARNewOperationTest.class), - "org.jboss.tools.seam.ui.test", - new String[]{"projects/seam_ear", "projects/seam_ear-ejb", "projects/seam_ear-test"}, - new String[]{"seam_ear", "seam_ear-ejb", "seam_ear-test"})); - suite.addTest(new ProjectImportTestSetup(new TestSuite(Seam20WARNewOperationTest.class), - "org.jboss.tools.seam.ui.test", - new String[]{"projects/seam_war", "projects/seam_war-test"}, - new String[]{"seam_war", "seam_war-test"})); + suite.addTestSuite(Seam12EARNewOperationTest.class); + suite.addTestSuite(Seam12WARNewOperationTest.class); + suite.addTestSuite(Seam20EARNewOperationTest.class); + suite.addTestSuite(Seam20WARNewOperationTest.class); return suite; } Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java 2008-05-27 18:48:15 UTC (rev 8379) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/AbstractSeamNewOperationTest.java 2008-05-27 18:59:52 UTC (rev 8380) @@ -12,8 +12,12 @@ import java.io.File; import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; +import java.util.List; import java.util.Map; +import java.util.Set; import junit.framework.TestCase; @@ -36,12 +40,19 @@ import org.eclipse.ui.IWorkbench; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.WorkspaceModifyOperation; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IProjectFacet; +import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCorePlugin; +import org.jboss.tools.seam.core.SeamProjectsSet; import org.jboss.tools.seam.core.project.facet.SeamRuntime; import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; import org.jboss.tools.seam.core.project.facet.SeamVersion; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; +import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider; import org.jboss.tools.seam.ui.widget.editor.IFieldEditor; import org.jboss.tools.seam.ui.wizard.IParameter; import org.jboss.tools.seam.ui.wizard.SeamWizardFactory; @@ -76,15 +87,50 @@ private static final IUndoableOperation CREATE_SEAM_CONVERSATION = new SeamConversationCreateOperation(); private static final IUndoableOperation CREATE_SEAM_ENTITY = new SeamEntityCreateOperation(); - + protected final Set<IResource> resourcesToCleanup = new HashSet<IResource>(); + + protected static final IProjectFacetVersion dynamicWebVersion; + protected static final IProjectFacetVersion javaVersion; + protected static final IProjectFacetVersion javaFacesVersion; + private static final IProjectFacet seamFacet; + + static { + javaVersion = ProjectFacetsManager.getProjectFacet("jst.java").getVersion("5.0"); + dynamicWebVersion = ProjectFacetsManager.getProjectFacet("jst.web").getVersion("2.5"); + javaFacesVersion = ProjectFacetsManager.getProjectFacet("jst.jsf").getVersion("1.2"); + seamFacet = ProjectFacetsManager.getProjectFacet("jst.seam"); + } + public AbstractSeamNewOperationTest() { } protected void setUp() throws Exception { super.setUp(); + try { EditorTestHelper.joinBackgroundActivities(); } + catch (Exception e) { JUnitUtils.fail(e.getMessage(), e); } + EditorTestHelper.runEventQueue(3000); } protected void tearDown() throws Exception { + // Wait until all jobs is finished to avoid delete project problems + EditorTestHelper.joinBackgroundActivities(); + EditorTestHelper.runEventQueue(3000); + Exception last = null; + for (IResource r : this.resourcesToCleanup) { + try { + System.out.println("Deleting " + r); + r.delete(true, null); + } catch(Exception e) { + System.out.println("Error deleting " + r); + e.printStackTrace(); + last = e; + } + } + + if(last!=null) throw last; + + resourcesToCleanup.clear(); + super.tearDown(); } @@ -120,20 +166,13 @@ return seamProject; } - protected void setUpSeamProject(IProject project, String seamRTName) { - File folder = getSeamHomeFolder(seamRTName); - assertNotNull("An error occured while getting the SEAM HOME folder for: " + seamRTName, folder); - - SeamRuntimeManager.getInstance().addRuntime(seamRTName, folder.getAbsolutePath(), getSeamRTVersion(seamRTName), true); - SeamRuntime sr = SeamRuntimeManager.getInstance().findRuntimeByName(seamRTName); - assertNotNull("An error occured while getting the SEAM RUNTIME for: " + seamRTName, sr); - + protected void setUpSeamProject(IProject project) { IScopeContext projectScope = new ProjectScope(project); IEclipsePreferences prefs = projectScope.getNode(SeamCorePlugin.PLUGIN_ID); assertNotNull("An error occured while getting the preferences for project: " + project.getName(), prefs); prefs.put(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME, - seamRTName); + getSeamRTName()); try { prefs.flush(); @@ -142,6 +181,96 @@ } } + protected IFacetedProject createSeamWarProject(String name) throws CoreException { + final IFacetedProject fproj = createSeamProject(name, createSeamDataModel("war")); + + final IProject proj = fproj.getProject(); + + assertNotNull(proj); + assertTrue(proj.exists()); + + assertTrue(proj.getWorkspace().getRoot().getProject(proj.getName() + "-test").exists()); + IProject testProject = proj.getWorkspace().getRoot().getProject(proj.getName() + "-test"); + this.addResourceToCleanup(testProject); + this.addResourceToCleanup(proj); + + return fproj; + } + + protected IDataModel createSeamDataModel(String deployType) { + IDataModel config = (IDataModel) new SeamFacetInstallDataModelProvider().create(); + config.setStringProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME, getSeamRTName()); + config.setBooleanProperty(ISeamFacetDataModelProperties.DB_ALREADY_EXISTS, true); + config.setBooleanProperty(ISeamFacetDataModelProperties.RECREATE_TABLES_AND_DATA_ON_DEPLOY, false); + config.setStringProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, deployType); + config.setStringProperty(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, "org.session.beans"); + config.setStringProperty(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, "org.entity.beans"); + config.setStringProperty(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, "org.test.beans"); + config.setStringProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, "noop-connection"); + config.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH, new String[] { "noop-driver.jar" }); + return config; + } + + protected IFacetedProject createSeamProject(String baseProjectName, IDataModel config) throws CoreException { + final IFacetedProject fproj = ProjectFacetsManager.create(baseProjectName, null, + null); + + installDependentFacets(fproj); +// new SeamFacetPreInstallDelegate().execute(fproj.getProject(), getSeamFacetVersion(), config, null); + fproj.installProjectFacet(getSeamFacetVersion(getSeamRTName()), config, null); + + SeamProjectsSet seamProjectsSet = new SeamProjectsSet(fproj.getProject()); + assertTrue(seamProjectsSet.getActionFolder().exists()); + assertTrue(seamProjectsSet.getModelFolder().exists()); + + return fproj; + } + + protected void installDependentFacets(final IFacetedProject fproj) throws CoreException { + fproj.installProjectFacet(javaVersion, null, null); + fproj.installProjectFacet(dynamicWebVersion, null, null); + fproj.installProjectFacet(javaFacesVersion, null, null); + } + + protected IProjectFacetVersion getSeamFacetVersion(String seamRTName) { + assertTrue("Wrong SEAM run-time name is specified: " + seamRTName, + (SEAM_1_2.equals(seamRTName) || SEAM_2_0.equals(seamRTName))); + if (SEAM_1_2.equals(seamRTName)) { + return seamFacet.getVersion("1.2"); + } else if (SEAM_2_0.equals(seamRTName)) { + return seamFacet.getVersion("2.0"); + } + return null; + } + + protected final void addResourceToCleanup(final IResource resource) { + this.resourcesToCleanup.add(resource); + } + + protected IFacetedProject createSeamEarProject(String name) throws CoreException { + final IFacetedProject fproj = createSeamProject(name, createSeamDataModel("ear")); + + final IProject proj = fproj.getProject(); + assertNotNull(proj); + + IProject testProject = proj.getWorkspace().getRoot().getProject(proj.getName() + "-test"); + IProject ejbProject = proj.getWorkspace().getRoot().getProject(proj.getName() + "-ejb"); + IProject earProject = proj.getWorkspace().getRoot().getProject(proj.getName() + "-ear"); + + this.resourcesToCleanup.add(proj); + this.resourcesToCleanup.add(testProject); + this.resourcesToCleanup.add(ejbProject); + this.resourcesToCleanup.add(earProject); + + assertTrue(proj.exists()); + assertTrue(testProject.exists()); + assertTrue(ejbProject.exists()); + assertTrue(earProject.exists()); + + return fproj; + } + + protected File getSeamHomeFolder(String seamRTName) { if (SEAM_1_2.equals(seamRTName)) { return new File(System.getProperty(SEAM_1_2_HOME, SEAM_1_2_HOME_DEFAULT)); @@ -160,7 +289,9 @@ return null; } - + + abstract protected String getSeamRTName() ; + protected String getPackagePath(String packageName) { return (packageName == null ? "" : packageName.replace('.', '/')); } Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java 2008-05-27 18:48:15 UTC (rev 8379) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12EARNewOperationTest.java 2008-05-27 18:59:52 UTC (rev 8380) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.test.wizard; +import java.io.File; + import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -17,16 +19,22 @@ import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.SeamProjectsSet; +import org.jboss.tools.seam.core.project.facet.SeamRuntime; +import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; import org.jboss.tools.seam.ui.wizard.IParameter; +import org.jboss.tools.test.util.JUnitUtils; import org.jboss.tools.test.util.ProjectImportTestSetup; +import org.jboss.tools.test.util.xpl.EditorTestHelper; public class Seam12EARNewOperationTest extends AbstractSeamNewOperationTest { private static final String SEAM_EAR_PROJECTNAME = "seam_ear"; private static final String SEAM_EAR_EJB_PROJECTNAME = "seam_ear-ejb"; + private static final String SEAM_EAR_EAR_PROJECTNAME = "seam_ear-ear"; private static final String SEAM_EAR_TEST_PROJECTNAME = "seam_ear-test"; - protected IProject earProject = null; - private IProject earEjbProject = null; - private IProject testProject = null; + protected static IProject earProject = null; + private static IProject earEjbProject = null; + private static IProject earEarProject = null; + private static IProject testProject = null; private ISeamProject seamEarProject = null; private ISeamProject seamEarEjbProject = null; private ISeamProject seamTestProject = null; @@ -38,12 +46,32 @@ protected void setUp() throws Exception { super.setUp(); + + File folder = getSeamHomeFolder(getSeamRTName()); + assertNotNull("An error occured while getting the SEAM HOME folder for: " + getSeamRTName(), folder); + + SeamRuntimeManager.getInstance().addRuntime(getSeamRTName(), folder.getAbsolutePath(), getSeamRTVersion(getSeamRTName()), true); + SeamRuntime sr = SeamRuntimeManager.getInstance().findRuntimeByName(getSeamRTName()); + assertNotNull("An error occured while getting the SEAM RUN-TIME for: " + getSeamRTName(), sr); + + if (earProject == null && earEjbProject == null && earEarProject == null && testProject == null) + createSeamEarProject(SEAM_EAR_PROJECTNAME); + + try { + EditorTestHelper.joinBackgroundActivities(); + } catch (Exception e) { + JUnitUtils.fail(e.getMessage(), e); + } + if(earProject==null) { earProject = ProjectImportTestSetup.loadProject(SEAM_EAR_PROJECTNAME); } if(earEjbProject==null) { earEjbProject = ProjectImportTestSetup.loadProject(SEAM_EAR_EJB_PROJECTNAME); } + if(earEarProject==null) { + earEarProject = ProjectImportTestSetup.loadProject(SEAM_EAR_EAR_PROJECTNAME); + } if(testProject==null) { testProject = ProjectImportTestSetup.loadProject(SEAM_EAR_TEST_PROJECTNAME); } @@ -54,10 +82,22 @@ seamEarEjbProject = loadSeamProject(earEjbProject); } if(seamTestProject==null) { - seamTestProject = loadSeamProject(earProject); + seamTestProject = loadSeamProject(testProject); } } + protected void tearDown() throws Exception { + super.tearDown(); + earProject = null; + earEjbProject = null; + earEarProject = null; + testProject = null; + seamEarProject = null; + seamEarEjbProject = null; + seamTestProject = null; + } + + protected IProject getProject() { return earProject; } @@ -66,6 +106,7 @@ void assertProjectsAreCreated() { assertTrue("Test project \"" + SEAM_EAR_PROJECTNAME + "\" is not loaded", (earProject != null)); assertTrue("Test project \"" + SEAM_EAR_EJB_PROJECTNAME + "\" is not loaded", (earEjbProject != null)); + assertTrue("Test project \"" + SEAM_EAR_EAR_PROJECTNAME + "\" is not loaded", (earEarProject != null)); assertTrue("Test project \"" + SEAM_EAR_TEST_PROJECTNAME + "\" is not loaded", (testProject != null)); assertTrue("Test Seam project \"" + SEAM_EAR_PROJECTNAME + "\" is not loaded", (seamEarProject != null)); assertTrue("Test Seam project \"" + SEAM_EAR_EJB_PROJECTNAME + "\" is not loaded", (seamEarEjbProject != null)); @@ -74,7 +115,7 @@ @Override void setUpSeamProjects() { - setUpSeamProject(earProject, AbstractSeamNewOperationTest.SEAM_1_2); + setUpSeamProject(earProject); } @Override @@ -268,4 +309,9 @@ void assertNewFormFilesAreCreatedSuccessfully(AdaptableRegistry data) { assertNewActionFilesAreCreatedSuccessfully(data); } + + @Override + protected String getSeamRTName() { + return AbstractSeamNewOperationTest.SEAM_1_2; + } } Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java 2008-05-27 18:48:15 UTC (rev 8379) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12WARNewOperationTest.java 2008-05-27 18:59:52 UTC (rev 8380) @@ -11,6 +11,8 @@ package org.jboss.tools.seam.ui.test.wizard; +import java.io.File; + import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -18,8 +20,13 @@ import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.SeamProjectsSet; +import org.jboss.tools.seam.core.project.facet.SeamRuntime; +import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; +import org.jboss.tools.seam.core.project.facet.SeamVersion; import org.jboss.tools.seam.ui.wizard.IParameter; +import org.jboss.tools.test.util.JUnitUtils; import org.jboss.tools.test.util.ProjectImportTestSetup; +import org.jboss.tools.test.util.xpl.EditorTestHelper; public class Seam12WARNewOperationTest extends AbstractSeamNewOperationTest { private static final String SEAM_WAR_PROJECTNAME = "seam_war"; @@ -36,6 +43,22 @@ protected void setUp() throws Exception { super.setUp(); + + File folder = getSeamHomeFolder(getSeamRTName()); + assertNotNull("An error occured while getting the SEAM HOME folder for: " + getSeamRTName(), folder); + + SeamRuntimeManager.getInstance().addRuntime(getSeamRTName(), folder.getAbsolutePath(), getSeamRTVersion(getSeamRTName()), true); + SeamRuntime sr = SeamRuntimeManager.getInstance().findRuntimeByName(getSeamRTName()); + assertNotNull("An error occured while getting the SEAM RUN-TIME for: " + getSeamRTName(), sr); + + createSeamWarProject(SEAM_WAR_PROJECTNAME); + + try { + EditorTestHelper.joinBackgroundActivities(); + } catch (Exception e) { + JUnitUtils.fail(e.getMessage(), e); + } + if(warProject==null) { warProject = ProjectImportTestSetup.loadProject(SEAM_WAR_PROJECTNAME); } @@ -46,7 +69,7 @@ seamWarProject = loadSeamProject(warProject); } if(seamTestProject==null) { - seamTestProject = loadSeamProject(warProject); + seamTestProject = loadSeamProject(testProject); } } @@ -64,9 +87,14 @@ @Override void setUpSeamProjects() { - setUpSeamProject(warProject, AbstractSeamNewOperationTest.SEAM_1_2); + setUpSeamProject(warProject); } + protected String getSeamRTName() { + return AbstractSeamNewOperationTest.SEAM_1_2; + } + + @Override void assertNewActionFilesAreCreatedSuccessfully(AdaptableRegistry data) { IEclipsePreferences seamFacetPrefs = SeamCorePlugin.getSeamPreferences(warProject); Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20EARNewOperationTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20EARNewOperationTest.java 2008-05-27 18:48:15 UTC (rev 8379) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20EARNewOperationTest.java 2008-05-27 18:59:52 UTC (rev 8380) @@ -13,6 +13,11 @@ public class Seam20EARNewOperationTest extends Seam12EARNewOperationTest { @Override void setUpSeamProjects() { - setUpSeamProject(earProject, AbstractSeamNewOperationTest.SEAM_2_0); + setUpSeamProject(earProject); } + + @Override + protected String getSeamRTName() { + return AbstractSeamNewOperationTest.SEAM_2_0; + } } Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20WARNewOperationTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20WARNewOperationTest.java 2008-05-27 18:48:15 UTC (rev 8379) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20WARNewOperationTest.java 2008-05-27 18:59:52 UTC (rev 8380) @@ -13,6 +13,11 @@ public class Seam20WARNewOperationTest extends Seam12WARNewOperationTest { @Override void setUpSeamProjects() { - setUpSeamProject(warProject, AbstractSeamNewOperationTest.SEAM_2_0); + setUpSeamProject(warProject); } + + @Override + protected String getSeamRTName() { + return AbstractSeamNewOperationTest.SEAM_2_0; + } }