Author: dgolovin Date: 2009-02-23 14:00:52 -0500 (Mon, 23 Feb 2009) New Revision: 13739 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XTestSuite.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XTestSuite.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite.java Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java Log: https://jira.jboss.org/jira/browse/JBIDE-2850 test that can be ran with different Seam versions moved to separated suits to provide a way to run them separately Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2009-02-23 18:18:50 UTC (rev 13738) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2009-02-23 19:00:52 UTC (rev 13739) @@ -13,6 +13,8 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.jboss.tools.seam.core.test.project.facet.Seam12XTestSuite; +import org.jboss.tools.seam.core.test.project.facet.Seam20XTestSuite; import org.jboss.tools.seam.core.test.project.facet.Seam2FacetInstallDelegateTest; import org.jboss.tools.seam.core.test.project.facet.SeamFacetInstallDelegateTest; import org.jboss.tools.seam.core.test.project.facet.SeamRuntimeListConverterTest; @@ -35,11 +37,10 @@ suite.addTestSuite(SeamEARTest.class); suite.addTestSuite(SeamRuntimeListConverterTest.class); suite.addTestSuite(SeamRuntimeManagerTest.class); - suite.addTestSuite(SeamFacetInstallDelegateTest.class); suite.addTest(SeamValidatorsAllTests.suite()); suite.addTest(SeamRefactoringAllTests.suite()); - suite.addTestSuite(Seam2FacetInstallDelegateTest.class); - + suite.addTest(Seam12XTestSuite.suite()); + suite.addTest(Seam20XTestSuite.suite()); return suite; } } \ No newline at end of file Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XTestSuite.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XTestSuite.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XTestSuite.java 2009-02-23 19:00:52 UTC (rev 13739) @@ -0,0 +1,22 @@ +/******************************************************************************* + * 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.core.test.project.facet; + + +import junit.framework.TestSuite; + +public class Seam12XTestSuite { + public static TestSuite suite() { + TestSuite suite = new TestSuite("Seam 1.2.X tests"); + suite.addTestSuite(SeamFacetInstallDelegateTest.class); + return suite; + } +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XTestSuite.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XTestSuite.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XTestSuite.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XTestSuite.java 2009-02-23 19:00:52 UTC (rev 13739) @@ -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.core.test.project.facet; + +import junit.framework.TestSuite; + + +/** + * @author eskimo + * + */ +public class Seam20XTestSuite { + public static TestSuite suite() { + TestSuite suite = new TestSuite("Seam 2.0.X tests"); + suite.addTestSuite(Seam2FacetInstallDelegateTest.class); + return suite; + } +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XTestSuite.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java 2009-02-23 18:18:50 UTC (rev 13738) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java 2009-02-23 19:00:52 UTC (rev 13739) @@ -19,6 +19,7 @@ import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties; import org.jboss.tools.seam.internal.core.project.facet.SeamFacetPreInstallDelegate; +import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; public class SeamFacetInstallDelegateTest extends AbstractSeamFacetTest { @@ -45,7 +46,7 @@ createSeamDataModel.setProperty(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, "x.y.z"); final IFacetedProject fproj = createSeamProject("customProject",createSeamDataModel); - + JobUtils.waitForIdle(500); assertTrue(fproj.getProject().findMember("src/action/x/y/z").exists()); } 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 2009-02-23 18:18:50 UTC (rev 13738) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2009-02-23 19:00:52 UTC (rev 13739) @@ -25,8 +25,10 @@ import org.jboss.tools.seam.ui.test.wizard.PackageNamesTest; import org.jboss.tools.seam.ui.test.wizard.Seam12EARNewOperationTest; import org.jboss.tools.seam.ui.test.wizard.Seam12WARNewOperationTest; +import org.jboss.tools.seam.ui.test.wizard.Seam12XOperationsTestSuite; import org.jboss.tools.seam.ui.test.wizard.Seam20EARNewOperationTest; import org.jboss.tools.seam.ui.test.wizard.Seam20WARNewOperationTest; +import org.jboss.tools.seam.ui.test.wizard.Seam20XOperationsTestSuite; import org.jboss.tools.seam.ui.test.wizard.SeamActionNewWizardTest; import org.jboss.tools.seam.ui.test.wizard.SeamFormNewWizardTest; import org.jboss.tools.seam.ui.test.wizard.SeamProjectNewWizardTest; @@ -54,13 +56,9 @@ suite.addTestSuite(SeamELContentAssistJbide1676Test.class); suite.addTestSuite(SeamELContentAssistJbide1645Test.class); suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamSettingsPreferencesPageTest.class), "org.jboss.tools.seam.ui.test", "projects/TestSeamSettingsPreferencesPage", "TestSeamSettingsPreferencesPage")); - - suite.addTestSuite(Seam12EARNewOperationTest.class); - suite.addTestSuite(Seam12WARNewOperationTest.class); - suite.addTestSuite(Seam20EARNewOperationTest.class); - suite.addTestSuite(Seam20WARNewOperationTest.class); suite.addTestSuite(PackageNamesTest.class); - + suite.addTest(Seam20XOperationsTestSuite.suite()); + suite.addTest(Seam12XOperationsTestSuite.suite()); return suite; } } \ No newline at end of file Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite.java 2009-02-23 19:00:52 UTC (rev 13739) @@ -0,0 +1,27 @@ +/******************************************************************************* + * 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.wizard; + +import junit.framework.TestSuite; + +/** + * @author eskimo + * + */ +public class Seam12XOperationsTestSuite { + public static TestSuite suite() { + TestSuite suite = new TestSuite(); + suite.setName("Seam 1.2.X Operations Tests"); + suite.addTestSuite(Seam12EARNewOperationTest.class); + suite.addTestSuite(Seam12WARNewOperationTest.class); + return suite; + } +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite.java 2009-02-23 19:00:52 UTC (rev 13739) @@ -0,0 +1,29 @@ +/******************************************************************************* + * 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.wizard; + +import junit.framework.TestSuite; + +/** + * + * @author eskimo + */ +public class Seam20XOperationsTestSuite { + + public static TestSuite suite() { + TestSuite suite = new TestSuite(); + suite.setName("Seam 2.0.X Operations Test"); + suite.addTestSuite(Seam20EARNewOperationTest.class); + suite.addTestSuite(Seam20WARNewOperationTest.class); + return suite; + } + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite.java ___________________________________________________________________ Name: svn:mime-type + text/plain