JBoss Tools SVN: r38094 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources: product_config_files and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-01-24 09:40:21 -0500 (Tue, 24 Jan 2012)
New Revision: 38094
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/product_config_files/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/product_config_files/epp-4.3.properties
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/product_config_files/epp-5.1.1.properties
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/gatein-3.1.0.properties
Log:
Created separate template config files for products and projects
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/product_config_files/epp-4.3.properties
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/product_config_files/epp-4.3.properties (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/product_config_files/epp-4.3.properties 2012-01-24 14:40:21 UTC (rev 38094)
@@ -0,0 +1,4 @@
+SERVER=EPP,4.3,default,${jbosstools.test.jboss-epp-4.3.home}/jboss-as
+SEAM=2.0,${jbosstools.test.jboss-epp-4.3.home}/seam2
+DB=hsqldb18,internal, , , , ,
+PORTLET_BRIDGE=${jbosstools.test.jboss-epp-4.3.home}/jboss-as/server/default/deploy/jboss-portal.sar/portal-identity.sar/portal-identity.war/WEB-INF/lib
\ No newline at end of file
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/product_config_files/epp-5.1.1.properties
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/product_config_files/epp-5.1.1.properties (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/product_config_files/epp-5.1.1.properties 2012-01-24 14:40:21 UTC (rev 38094)
@@ -0,0 +1,4 @@
+SERVER=EPP,5.1.1,default,${jbosstools.test.jboss-epp-5.1.home}/jboss-as
+SEAM=2.2,${jbosstools.test.jboss-epp-5.1.home}/seam
+DB=hsqldb18,internal, , , , ,
+PORTLET_BRIDGE=
\ No newline at end of file
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/gatein-3.1.0.properties
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/gatein-3.1.0.properties (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/resources/project_config_files/gatein-3.1.0.properties 2012-01-24 14:40:21 UTC (rev 38094)
@@ -0,0 +1,4 @@
+SERVER=EPP,5.1.0,default,${jbosstools.test.jboss-gatein.home}
+SEAM=2.2,${jbosstools.test.jboss-seam.home}
+DB=hsqldb18,internal, , , , ,
+PORTLET_BRIDGE=${jbosstools.test.jboss-gatein.home}/server/default/deploy/gatein.ear/lib/
\ No newline at end of file
12 years, 11 months
JBoss Tools SVN: r38093 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test: core and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-01-24 09:40:10 -0500 (Tue, 24 Jan 2012)
New Revision: 38093
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/GateinStartupFix.java
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/JavaPortletTestSuite.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/JSFPortletTestSuite.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/SeamPortletTestSuite.java
Log:
Created fix for Gatein startup
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/GateinStartupFix.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/GateinStartupFix.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/GateinStartupFix.java 2012-01-24 14:40:10 UTC (rev 38093)
@@ -0,0 +1,34 @@
+package org.jboss.tools.portlet.ui.bot.test;
+
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+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.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+@Require(server=@Server(version="5.1.0", state=ServerState.Present), seam=@Seam)
+public class GateinStartupFix extends SWTTaskBasedTestCase {
+
+ @Test
+ public void testFix(){
+ ServersView serversView = SWTBotFactory.getServers();
+ serversView.show();
+
+ SWTBotTreeItem server = serversView.findServerByName(bot.tree(), configuredState.getServer().name);
+ server.doubleClick();
+
+ bot.hyperlink("Open launch configuration").click();
+
+ SWTBotText vmArgumetsText = bot.textInGroup("VM arguments:");
+ String vmArgs = vmArgumetsText.getText();
+ vmArgumetsText.setText(vmArgs + " -Dexo.conf.dir.name=gatein ");
+
+ bot.button("OK").click();
+ System.out.println();
+ }
+}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/JavaPortletTestSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/JavaPortletTestSuite.java 2012-01-24 14:39:51 UTC (rev 38092)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/JavaPortletTestSuite.java 2012-01-24 14:40:10 UTC (rev 38093)
@@ -1,11 +1,13 @@
package org.jboss.tools.portlet.ui.bot.test.core;
+import org.jboss.tools.portlet.ui.bot.test.GateinStartupFix;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(RequirementAwareSuite.class)
@Suite.SuiteClasses({
+ GateinStartupFix.class,
CreateJavaPortletProject.class,
CreateJavaPortlet.class,
RunJavaPortletOnServer.class,
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java 2012-01-24 14:39:51 UTC (rev 38092)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/ExamplesSuite.java 2012-01-24 14:40:10 UTC (rev 38093)
@@ -1,11 +1,13 @@
package org.jboss.tools.portlet.ui.bot.test.example;
+import org.jboss.tools.portlet.ui.bot.test.GateinStartupFix;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(RequirementAwareSuite.class)
@Suite.SuiteClasses({
+ GateinStartupFix.class,
JavaPortletExampleRuntime4x.class,
JSFPortletExampleRuntime4x.class,
SeamPortletExampleRuntime4x.class,
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java 2012-01-24 14:39:51 UTC (rev 38092)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleRuntime5x.java 2012-01-24 14:40:10 UTC (rev 38093)
@@ -14,7 +14,7 @@
* @author Lucia Jelinkova
*
*/
-@Require(db=@DB, seam=@Seam, server=@Server(version="5.0", operator=">", state=ServerState.Present, type=ServerType.EPP))
+@Require(db=@DB, seam=@Seam, server=@Server(version="5.0", operator=">", state=ServerState.Running, type=ServerType.EPP))
public class SeamPortletExampleRuntime5x extends AbstractPortletExampleRuntime5xTest {
private static final String PROJECT_NAME_IN_WIZARD = "SeamPortlet";
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/JSFPortletTestSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/JSFPortletTestSuite.java 2012-01-24 14:39:51 UTC (rev 38092)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/JSFPortletTestSuite.java 2012-01-24 14:40:10 UTC (rev 38093)
@@ -1,11 +1,13 @@
package org.jboss.tools.portlet.ui.bot.test.jsf;
+import org.jboss.tools.portlet.ui.bot.test.GateinStartupFix;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(RequirementAwareSuite.class)
@Suite.SuiteClasses({
+ GateinStartupFix.class,
CreateJSFPortletProject.class,
CreateJSFPortletRuntime4x.class,
CreateJSFPortletRuntime5x.class,
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/SeamPortletTestSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/SeamPortletTestSuite.java 2012-01-24 14:39:51 UTC (rev 38092)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/SeamPortletTestSuite.java 2012-01-24 14:40:10 UTC (rev 38093)
@@ -1,11 +1,13 @@
package org.jboss.tools.portlet.ui.bot.test.seam;
+import org.jboss.tools.portlet.ui.bot.test.GateinStartupFix;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(RequirementAwareSuite.class)
@Suite.SuiteClasses({
+ GateinStartupFix.class,
CreateSeamPortletProject.class,
CreateSeamPortletRuntime4x.class,
CreateSeamPortletRuntime5x.class,
12 years, 11 months
JBoss Tools SVN: r38092 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-01-24 09:39:51 -0500 (Tue, 24 Jan 2012)
New Revision: 38092
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml
Log:
added seam property
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml 2012-01-24 14:39:21 UTC (rev 38091)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/pom.xml 2012-01-24 14:39:51 UTC (rev 38092)
@@ -14,6 +14,7 @@
<properties>
<jbosstools.test.jboss-gatein.home></jbosstools.test.jboss-gatein.home> <!--TODO setup default path -->
+ <jbosstools.test.jboss-seam.home></jbosstools.test.jboss-seam.home> <!--TODO setup default path -->
<configurations.dir></configurations.dir> <!-- TODO setup default path -->
<systemProperties>-Djbosstools.test.jboss-gatein.home=${jbosstools.test.jboss-gatein.home} -Dtest.configurations.dir=${configurations.dir}</systemProperties>
</properties>
12 years, 11 months
JBoss Tools SVN: r38091 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test: seam and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-01-24 09:39:21 -0500 (Tue, 24 Jan 2012)
New Revision: 38091
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java
Log:
Changed portletbridge location configuration
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java 2012-01-24 14:38:16 UTC (rev 38090)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java 2012-01-24 14:39:21 UTC (rev 38091)
@@ -10,6 +10,7 @@
import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JBossJSFPortletCapabilitiesWizardPageFillingTask;
import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JBossPortletCapabilitiesWizardPageFillingTask;
import org.jboss.tools.portlet.ui.bot.test.template.CreatePortletProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.TestConfigurator;
/**
@@ -44,7 +45,9 @@
tasks.add(new WizardPageDefaultsFillingTask());
tasks.add(new JBossPortletCapabilitiesWizardPageFillingTask(JBossPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER));
tasks.add(new WizardPageDefaultsFillingTask());
- tasks.add(new JBossJSFPortletCapabilitiesWizardPageFillingTask(JBossJSFPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER, "/home/ljelinko/programs/jboss/EPP/jboss-epp-5.1/portletbridge"));
+ tasks.add(new JBossJSFPortletCapabilitiesWizardPageFillingTask(
+ JBossJSFPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER,
+ TestConfigurator.currentConfig.getPortletBridge().getLocation()));
return tasks;
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java 2012-01-24 14:38:16 UTC (rev 38090)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java 2012-01-24 14:39:21 UTC (rev 38091)
@@ -33,8 +33,6 @@
public static final String PROJECT_NAME = "seam-portlet";
- private static final String PORTLET_BRIDGE_AS_RELATIVE_PATH = "/server/default/deploy/jboss-portal.sar/portal-identity.sar/portal-identity.war/WEB-INF/lib";
-
@Override
public String getProjectName() {
return PROJECT_NAME;
@@ -63,7 +61,7 @@
tasks.add(getSeamFacetPageFillingTask());
tasks.add(new JBossJSFPortletCapabilitiesWizardPageFillingTask(
JBossJSFPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER,
- TestConfigurator.currentConfig.getServer().runtimeHome + PORTLET_BRIDGE_AS_RELATIVE_PATH));
+ TestConfigurator.currentConfig.getPortletBridge().getLocation()));
return tasks;
}
12 years, 11 months
JBoss Tools SVN: r38090 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-01-24 09:38:16 -0500 (Tue, 24 Jan 2012)
New Revision: 38090
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java
Log:
Created separate wizard filling task
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2012-01-24 14:37:00 UTC (rev 38089)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2012-01-24 14:38:16 UTC (rev 38090)
@@ -12,7 +12,7 @@
import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition;
import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile;
import org.jboss.tools.portlet.ui.bot.task.facet.FacetsSelectionTask;
-import org.jboss.tools.portlet.ui.bot.task.wizard.WizardFillingTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.WizardOpeningAndFillingTask;
import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageFillingTask;
import org.jboss.tools.portlet.ui.bot.task.wizard.web.DynamicWebProjectCreationTask;
import org.jboss.tools.portlet.ui.bot.task.wizard.web.DynamicWebProjectWizardPageFillingTask;
@@ -87,7 +87,7 @@
}
}
- protected WizardFillingTask getCreateDynamicWebProjectTask() {
+ protected WizardOpeningAndFillingTask getCreateDynamicWebProjectTask() {
DynamicWebProjectWizardPageFillingTask task = new DynamicWebProjectWizardPageFillingTask();
task.setProjectName(getProjectName());
task.setWebModuleVersion("2.5");
12 years, 11 months
JBoss Tools SVN: r38089 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-01-24 09:37:00 -0500 (Tue, 24 Jan 2012)
New Revision: 38089
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/AbstractPortletCreationTask.java
Log:
Created separate wizard filling task
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/AbstractPortletCreationTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/AbstractPortletCreationTask.java 2012-01-24 14:36:43 UTC (rev 38088)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/AbstractPortletCreationTask.java 2012-01-24 14:37:00 UTC (rev 38089)
@@ -1,6 +1,6 @@
package org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss;
-import org.jboss.tools.portlet.ui.bot.task.wizard.WizardFillingTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.WizardOpeningAndFillingTask;
/**
*
@@ -9,7 +9,7 @@
* @author Lucia Jelinkova
*
*/
-public abstract class AbstractPortletCreationTask extends WizardFillingTask {
+public abstract class AbstractPortletCreationTask extends WizardOpeningAndFillingTask {
private static final String PORTLET_WIZARD_PATH = "JBoss Tools Web/Portlet";
12 years, 11 months
JBoss Tools SVN: r38088 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-01-24 09:36:43 -0500 (Tue, 24 Jan 2012)
New Revision: 38088
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/DynamicWebProjectCreationTask.java
Log:
Created separate wizard filling task
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/DynamicWebProjectCreationTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/DynamicWebProjectCreationTask.java 2012-01-24 14:36:07 UTC (rev 38087)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/DynamicWebProjectCreationTask.java 2012-01-24 14:36:43 UTC (rev 38088)
@@ -1,7 +1,7 @@
package org.jboss.tools.portlet.ui.bot.task.wizard.web;
import org.jboss.tools.portlet.ui.bot.task.dialog.AssociatedPerspectiveDialogClosingTask;
-import org.jboss.tools.portlet.ui.bot.task.wizard.WizardFillingTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.WizardOpeningAndFillingTask;
/**
* Create a new dynamic web project using the wizard.
@@ -9,7 +9,7 @@
* @author ljelinko
*
*/
-public class DynamicWebProjectCreationTask extends WizardFillingTask {
+public class DynamicWebProjectCreationTask extends WizardOpeningAndFillingTask {
public DynamicWebProjectCreationTask() {
super("Dynamic Web Project", "Web");
12 years, 11 months
JBoss Tools SVN: r38087 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-01-24 09:36:07 -0500 (Tue, 24 Jan 2012)
New Revision: 38087
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardOpeningAndFillingTask.java
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java
Log:
Created separate wizard filling task
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java 2012-01-24 14:34:35 UTC (rev 38086)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java 2012-01-24 14:36:07 UTC (rev 38087)
@@ -12,35 +12,23 @@
/**
*
- * Provides the functionality of opening wizard and navigating between its pages. The data
- * should fill every wizard page itself.
+ * Provides the functionality of navigating between pages of open wizard. The data
+ * should fill every wizard page itself.
*
- * @author ljelinko
+ * @author Lucia Jelinkova
*
*/
public class WizardFillingTask extends CompositeSWTTask<WizardPageFillingTask>{
private List<WizardPageFillingTask> wizardPages;
- private String wizardName;
-
- private String wizardPath;
-
- public WizardFillingTask(String name) {
- this(name, null);
- }
-
- public WizardFillingTask(String name, String path) {
+ public WizardFillingTask() {
super();
- this.wizardName = name;
- this.wizardPath = path;
wizardPages = new ArrayList<WizardPageFillingTask>();
}
-
+
@Override
public void perform() {
- performInnerTask(new WizardOpeningTask(wizardName, wizardPath));
-
SWTBotShell activeShell = getActiveShell();
super.setTasks(wizardPages);
@@ -79,4 +67,4 @@
throw new IllegalStateException("No active shell found");
}
-}
+}
\ No newline at end of file
Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardOpeningAndFillingTask.java (from rev 37820, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java)
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardOpeningAndFillingTask.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardOpeningAndFillingTask.java 2012-01-24 14:36:07 UTC (rev 38087)
@@ -0,0 +1,33 @@
+package org.jboss.tools.portlet.ui.bot.task.wizard;
+
+
+/**
+ *
+ * Provides the functionality of opening wizard and navigating between its pages. The data
+ * should fill every wizard page itself.
+ *
+ * @author ljelinko
+ *
+ */
+public class WizardOpeningAndFillingTask extends WizardFillingTask {
+
+ private String wizardName;
+
+ private String wizardPath;
+
+ public WizardOpeningAndFillingTask(String name) {
+ this(name, null);
+ }
+
+ public WizardOpeningAndFillingTask(String name, String path) {
+ super();
+ this.wizardName = name;
+ this.wizardPath = path;
+ }
+
+ @Override
+ public void perform() {
+ performInnerTask(new WizardOpeningTask(wizardName, wizardPath));
+ super.perform();
+ }
+}
12 years, 11 months
JBoss Tools SVN: r38086 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-01-24 09:34:35 -0500 (Tue, 24 Jan 2012)
New Revision: 38086
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug/PrintWidgetsTask.java
Log:
Print also tree's items
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug/PrintWidgetsTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug/PrintWidgetsTask.java 2012-01-24 14:33:57 UTC (rev 38085)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/debug/PrintWidgetsTask.java 2012-01-24 14:34:35 UTC (rev 38086)
@@ -32,6 +32,8 @@
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.swt.widgets.Widget;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.eclipse.ui.forms.widgets.Hyperlink;
import org.hamcrest.Matcher;
import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
@@ -222,7 +224,12 @@
protected void visitTree(Tree widget) {
stream.print("Tree {");
stream.print(widget.getItemCount() + " item(s), ");
- stream.print(widget.getColumnCount() + " columns(s)");
+ stream.print(widget.getColumnCount() + " columns(s), ");
+ stream.print("items = {");
+ for (SWTBotTreeItem item : new SWTBotTree(widget).getAllItems()){
+ stream.print(item.getText() + ", ");
+ }
+ stream.print("}");
stream.println("}");
}
12 years, 11 months
JBoss Tools SVN: r38085 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/console.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-01-24 09:33:57 -0500 (Tue, 24 Jan 2012)
New Revision: 38085
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/console/ConsoleClearingTask.java
Log:
click the clear button only if it is enabled
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/console/ConsoleClearingTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/console/ConsoleClearingTask.java 2012-01-24 13:31:13 UTC (rev 38084)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/console/ConsoleClearingTask.java 2012-01-24 14:33:57 UTC (rev 38085)
@@ -20,7 +20,7 @@
SWTBotView view = SWTBotFactory.getConsole().show();
for (SWTBotToolbarButton button : view.getToolbarButtons()){
- if (IDELabel.ConsoleView.BUTTON_CLEAR_CONSOLE_TOOLTIP.equals(button.getToolTipText())){
+ if (button.isEnabled() && IDELabel.ConsoleView.BUTTON_CLEAR_CONSOLE_TOOLTIP.equals(button.getToolTipText())){
button.click();
}
}
12 years, 11 months