Author: dgolovin Date: 2009-02-25 13:56:20 -0500 (Wed, 25 Feb 2009) New Revision: 13798 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XFacetTestSuite121EAP.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite201GA.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.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/wizard/Seam20XOperationsTestSuite201GA.java Log: https://jira.jboss.org/jira/browse/JBIDE-2850 - fixed now we have test suites that can be tested with different seam versions 1.2.1.EAP 2.0.1.GA 2.0.2.SP1 2.0.3.CR1 2.0.FP Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XFacetTestSuite121EAP.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XFacetTestSuite121EAP.java 2009-02-25 18:03:00 UTC (rev 13797) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam12XFacetTestSuite121EAP.java 2009-02-25 18:56:20 UTC (rev 13798) @@ -11,10 +11,11 @@ package org.jboss.tools.seam.core.test.project.facet; +import junit.framework.Test; import junit.framework.TestSuite; public class Seam12XFacetTestSuite121EAP { - public static TestSuite suite() { + public static Test suite() { TestSuite suite = new TestSuite("Seam 1.2.X tests"); suite.addTestSuite(SeamFacetInstallDelegateTest.class); return suite; Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite201GA.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite201GA.java 2009-02-25 18:03:00 UTC (rev 13797) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite201GA.java 2009-02-25 18:56:20 UTC (rev 13798) @@ -22,7 +22,7 @@ * */ public class Seam20XFacetTestSuite201GA { - public static final Test suite() { + public static Test suite() { TestSuite suite = new TestSuite("Seam 2.0.X tests"); suite.addTest(new Seam2FacetInstallDelegateTestSetup(new TestSuite(Seam2FacetInstallDelegateTest.class))); return suite; Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2009-02-25 18:03:00 UTC (rev 13797) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2009-02-25 18:56:20 UTC (rev 13798) @@ -317,8 +317,8 @@ IProject warProject = warPs.getWarProject(); assertTrue(warProject.exists()); - assertNotNull(warProject.findMember("src/model/seam.properties")); - IResource findMember = warProject.findMember("src/action/seam.properties"); + assertNotNull(warProject.findMember("src/main/seam.properties")); + IResource findMember = warProject.findMember("src/hot/seam.properties"); assertNotNull(findMember); assertTrue(findMember instanceof IFile); 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-25 18:03:00 UTC (rev 13797) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java 2009-02-25 18:56:20 UTC (rev 13798) @@ -47,7 +47,7 @@ final IFacetedProject fproj = createSeamProject("customProject",createSeamDataModel); JobUtils.waitForIdle(500); - assertTrue(fproj.getProject().findMember("src/action/x/y/z").exists()); + assertTrue(fproj.getProject().findMember("src/hot/x/y/z").exists()); } public void testJiraJbide1544() throws CoreException, IOException { @@ -59,7 +59,7 @@ createSeamDataModel.setProperty(ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME, catalogName); createSeamDataModel.setProperty(ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME, schemaName); IFacetedProject fproj = createSeamProject("customSchemaAndCatalog",createSeamDataModel); - IFile persistence = (IFile)fproj.getProject().findMember("src/model/META-INF/persistence.xml"); + IFile persistence = (IFile)fproj.getProject().findMember("src/main/META-INF/persistence.xml"); assertTrue(persistence.exists()); boolean schemaExists = ResourcesUtils.findLineInFile(persistence, ".*" + NLS.bind( @@ -89,7 +89,7 @@ createSeamDataModel = createSeamDataModel("war"); fproj = createSeamProject("noSchemaAndCatalog",createSeamDataModel); - persistence = (IFile)fproj.getProject().findMember("src/model/META-INF/persistence.xml"); + persistence = (IFile)fproj.getProject().findMember("src/main/META-INF/persistence.xml"); assertTrue(persistence.exists()); schemaExists = ResourcesUtils.findLineInFile(persistence, ".*" + NLS.bind( Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java 2009-02-25 18:03:00 UTC (rev 13797) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.java 2009-02-25 18:56:20 UTC (rev 13798) @@ -20,7 +20,7 @@ */ public class Seam20XOperationsTestSuite201GA { - public static final Test suite() { + public static Test suite() { TestSuite suite = new TestSuite(); suite.setName("Seam 2.0.X Operations Test"); suite.addTest(