[jbosstools-commits] JBoss Tools SVN: r14047 - in branches/jbosstools-3.0.x: tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests and 1 other directory.

Author: dgolovin Date: 2009-03-05 14:28:20 -0500 (Thu, 05 Mar 2009) New Revision: 14047 Modified: branches/jbosstools-3.0.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java branches/jbosstools-3.0.x/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PreferencePageTest.java Log: fix error in JUnit Test SeamCoreAllTests.testEarProject Failing for the past 7 builds (Since Unstable#4 ) Took 39 sec. Error Message: War project must see component 'authenticator' declared in ejb project Modified: branches/jbosstools-3.0.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java =================================================================== --- branches/jbosstools-3.0.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2009-03-05 19:23:46 UTC (rev 14046) +++ branches/jbosstools-3.0.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2009-03-05 19:28:20 UTC (rev 14047) @@ -16,7 +16,6 @@ import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.jdt.launching.IVMInstall; @@ -26,11 +25,12 @@ import org.eclipse.wst.server.core.IRuntimeWorkingCopy; import org.eclipse.wst.server.core.ServerUtil; import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy; -import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.seam.core.ISeamComponent; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ProjectImportTestSetup; +import org.jboss.tools.test.util.ResourcesUtils; /** * @author V.Kabanovich @@ -41,26 +41,21 @@ IProject projectWAR = null; IProject projectEJB = null; - TestProjectProvider providerEAR = null; - TestProjectProvider providerWAR = null; - TestProjectProvider providerEJB = null; - boolean makeCopy = true; - + ProjectImportTestSetup setup; + public SeamEARTest() {} protected void setUp() throws Exception { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); createRuntime("JBoss 4.2 Runtime"); + setup = new ProjectImportTestSetup(this, "org.jboss.tools.seam.core.test", new String[]{"projects/Test1-ejb", "projects/Test1-ear", "projects/Test1"}, new String[]{"Test1-ejb", "Test1-ear", "Test1"}); + IProject[] projects = setup.importProjects(); + projectEAR = projects[1]; + projectEJB = projects[2]; + projectWAR = projects[0]; + ResourcesUtils.setBuildAutomatically(saveAutoBuild); JobUtils.waitForIdle(); - providerEAR = new TestProjectProvider("org.jboss.tools.seam.core.test", null, "Test1-ear", makeCopy); - projectEAR = providerEAR.getProject(); - JobUtils.waitForIdle(); - providerEJB = new TestProjectProvider("org.jboss.tools.seam.core.test", null, "Test1-ejb", makeCopy); - projectEJB = providerEJB.getProject(); - JobUtils.waitForIdle(); - providerWAR = new TestProjectProvider("org.jboss.tools.seam.core.test", null, "Test1", makeCopy); - projectWAR = providerWAR.getProject(); - JobUtils.waitForIdle(); } private ISeamProject getSeamProject(IProject project) throws CoreException { @@ -89,10 +84,8 @@ assertNotNull("War project must see component 'authenticator' declared in ejb project", c); } - protected void tearDown() throws CoreException { - providerWAR.dispose(); - providerEJB.dispose(); - providerEAR.dispose(); + protected void tearDown() throws Exception { + setup.deleteProjects(); } private static IRuntime createRuntime(String runtimeName) throws CoreException { Modified: branches/jbosstools-3.0.x/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PreferencePageTest.java =================================================================== --- branches/jbosstools-3.0.x/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PreferencePageTest.java 2009-03-05 19:23:46 UTC (rev 14046) +++ branches/jbosstools-3.0.x/tests/tests/org.jboss.tools.test/src/org/jboss/tools/tests/PreferencePageTest.java 2009-03-05 19:28:20 UTC (rev 14047) @@ -48,7 +48,7 @@ prefDialog.open(); Object selectedPage = prefDialog.getSelectedPage(); - assertTrue("Selected page is not an instance of SeamPreferencePage", instanceOf.isInstance(selectedPage)); + assertTrue("Selected page is not an instance of " + instanceOf.getName() + "but instance class is " + selectedPage.getClass().getName() , instanceOf.isInstance(selectedPage)); } finally { prefDialog.close(); }