[jbosstools-commits] JBoss Tools SVN: r43417 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test: src/org/jboss/tools/portlet/ui/bot/test and 1 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Wed Sep 5 10:21:37 EDT 2012
Author: ljelinko
Date: 2012-09-05 10:21:37 -0400 (Wed, 05 Sep 2012)
New Revision: 43417
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS5vs6CompatibilityGatein.java
Removed:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5CompatibilityGatein.java
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/org/jboss/tools/portlet/ui/bot/test/compatibility/jbds-compatibility.zip
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDSCompatibilityTestSuite.java
Log:
Changed compatibility tests. Testing JBDS5<->JBDS6 compatibility instead of JBDS4<->JBDS5.
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/org/jboss/tools/portlet/ui/bot/test/compatibility/jbds-compatibility.zip
===================================================================
(Binary files differ)
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2012-09-05 14:20:00 UTC (rev 43416)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2012-09-05 14:21:37 UTC (rev 43417)
@@ -1,6 +1,6 @@
package org.jboss.tools.portlet.ui.bot.test;
-import org.jboss.tools.portlet.ui.bot.test.compatibility.JBDS4vs5CompatibilityGatein;
+import org.jboss.tools.portlet.ui.bot.test.compatibility.JBDS5vs6CompatibilityGatein;
import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject;
import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletJBPortal;
import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletGatein;
@@ -55,7 +55,7 @@
JSFPortletExampleGatein.class,
RichFacesPortletExampleGatein.class,
SeamPortletExampleGatein.class,
- JBDS4vs5CompatibilityGatein.class,
+ JBDS5vs6CompatibilityGatein.class,
RunAsLoadsPortalURLJBPortal.class,
RunAsLoadsPortalURLGatein.class
})
Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5CompatibilityGatein.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5CompatibilityGatein.java 2012-09-05 14:20:00 UTC (rev 43416)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5CompatibilityGatein.java 2012-09-05 14:21:37 UTC (rev 43417)
@@ -1,64 +0,0 @@
-package org.jboss.tools.portlet.ui.bot.test.compatibility;
-
-import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors;
-import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.isExistingProject;
-
-import org.jboss.tools.portlet.ui.bot.task.importing.project.ExistingProjectImportTask;
-import org.jboss.tools.portlet.ui.bot.task.wizard.WizardFillingTask;
-import org.jboss.tools.portlet.ui.bot.task.wizard.importing.project.ExistingProjectWizardPageFillingTask;
-import org.jboss.tools.portlet.ui.bot.test.Activator;
-import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase;
-import org.jboss.tools.ui.bot.ext.SWTUtilExt;
-import org.jboss.tools.ui.bot.ext.config.Annotations.DB;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Seam;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.junit.Test;
-
-/**
- * Tests that project from JBDS 4 can work in JBDS 5 without any problems.
- *
- * @author Lucia Jelinkova
- *
- */
- at Require(server=@Server(version="5.1", operator=">", state=ServerState.Present), db=@DB, seam=@Seam)
-public class JBDS4vs5CompatibilityGatein extends SWTTaskBasedTestCase {
-
- private static final String ZIP_FILE = "resources/org/jboss/tools/portlet/ui/bot/test/compatibility/jbds-compatibility.zip";
-
- private static final String CORE_PROJECT_NAME = "jbds-4-core";
-
- private static final String JSF_PROJECT_NAME = "jbds-4-jsf";
-
- private static final String SEAM_PROJECT_NAME = "jbds-4-seam";
-
- @Test
- public void testCompatibility(){
- doPerform(new ExistingProjectImportTask());
- doPerform(getWizardFillingTask());
-
- doAssertThatInWorkspace(CORE_PROJECT_NAME, isExistingProject());
- doAssertThatInWorkspace(JSF_PROJECT_NAME, isExistingProject());
- doAssertThatInWorkspace(SEAM_PROJECT_NAME, isExistingProject());
- doAssertThatInWorkspace(0, isNumberOfErrors());
- }
-
- private WizardFillingTask getWizardFillingTask(){
- WizardFillingTask wizard = new WizardFillingTask();
- wizard.addWizardPage(getWizardPage());
- return wizard;
- }
-
- private ExistingProjectWizardPageFillingTask getWizardPage(){
- ExistingProjectWizardPageFillingTask task = new ExistingProjectWizardPageFillingTask();
- task.setZipFilePath(getZIPFileLocation());
- task.setProjectNames(CORE_PROJECT_NAME, JSF_PROJECT_NAME, SEAM_PROJECT_NAME);
- task.setCopyProjectsIntoWorkspace(true);
- return task;
- }
-
- private String getZIPFileLocation(){
- return SWTUtilExt.getPathToFileWithinPlugin(Activator.PLUGIN_ID, ZIP_FILE);
- }
-}
Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS5vs6CompatibilityGatein.java (from rev 43246, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS4vs5CompatibilityGatein.java)
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS5vs6CompatibilityGatein.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDS5vs6CompatibilityGatein.java 2012-09-05 14:21:37 UTC (rev 43417)
@@ -0,0 +1,65 @@
+package org.jboss.tools.portlet.ui.bot.test.compatibility;
+
+import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors;
+import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.isExistingProject;
+
+import org.jboss.tools.portlet.ui.bot.task.importing.project.ExistingProjectImportTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.WizardFillingTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.importing.project.ExistingProjectWizardPageFillingTask;
+import org.jboss.tools.portlet.ui.bot.test.Activator;
+import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase;
+import org.jboss.tools.ui.bot.ext.SWTUtilExt;
+import org.jboss.tools.ui.bot.ext.config.Annotations.DB;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Seam;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.junit.Test;
+
+/**
+ * Tests that project from JBDS 5 can work in JBDS 6 without any problems. Note that the project need to have EPP-5.1.1 as
+ * its target runtime at the time of import.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+ at Require(server=@Server(version="5.1", operator=">", state=ServerState.Present), db=@DB, seam=@Seam)
+public class JBDS5vs6CompatibilityGatein extends SWTTaskBasedTestCase {
+
+ private static final String ZIP_FILE = "resources/org/jboss/tools/portlet/ui/bot/test/compatibility/jbds-compatibility.zip";
+
+ private static final String CORE_PROJECT_NAME = "jbds-5-core";
+
+ private static final String JSF_PROJECT_NAME = "jbds-5-jsf";
+
+ private static final String SEAM_PROJECT_NAME = "jbds-5-seam";
+
+ @Test
+ public void testCompatibility(){
+ doPerform(new ExistingProjectImportTask());
+ doPerform(getWizardFillingTask());
+
+ doAssertThatInWorkspace(CORE_PROJECT_NAME, isExistingProject());
+ doAssertThatInWorkspace(JSF_PROJECT_NAME, isExistingProject());
+ doAssertThatInWorkspace(SEAM_PROJECT_NAME, isExistingProject());
+ doAssertThatInWorkspace(0, isNumberOfErrors());
+ }
+
+ private WizardFillingTask getWizardFillingTask(){
+ WizardFillingTask wizard = new WizardFillingTask();
+ wizard.addWizardPage(getWizardPage());
+ return wizard;
+ }
+
+ private ExistingProjectWizardPageFillingTask getWizardPage(){
+ ExistingProjectWizardPageFillingTask task = new ExistingProjectWizardPageFillingTask();
+ task.setZipFilePath(getZIPFileLocation());
+ task.setProjectNames(CORE_PROJECT_NAME, JSF_PROJECT_NAME, SEAM_PROJECT_NAME);
+ task.setCopyProjectsIntoWorkspace(true);
+ return task;
+ }
+
+ private String getZIPFileLocation(){
+ return SWTUtilExt.getPathToFileWithinPlugin(Activator.PLUGIN_ID, ZIP_FILE);
+ }
+}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDSCompatibilityTestSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDSCompatibilityTestSuite.java 2012-09-05 14:20:00 UTC (rev 43416)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/compatibility/JBDSCompatibilityTestSuite.java 2012-09-05 14:21:37 UTC (rev 43417)
@@ -6,7 +6,7 @@
@RunWith(RequirementAwareSuite.class)
@Suite.SuiteClasses({
- JBDS4vs5CompatibilityGatein.class,
+ JBDS5vs6CompatibilityGatein.class,
})
public class JBDSCompatibilityTestSuite {
More information about the jbosstools-commits
mailing list