Author: sbunciak
Date: 2012-10-16 09:48:21 -0400 (Tue, 16 Oct 2012)
New Revision: 44525
Modified:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/META-INF/MANIFEST.MF
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/OpenShiftBotTests.launch
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/OpenShiftBotTestsMaven.launch
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/resources/openshift.ui.bot.test.properties
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/OpenShiftJenkinsBotTests.java
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/explorer/Connection.java
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/explorer/CreateDomain.java
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/explorer/DeleteDomain.java
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/explorer/RenameDomain.java
Log:
Added 3 cases to automated Jenkins suite compatible with JBT 4.0.0.Beta1
Modified:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
---
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/META-INF/MANIFEST.MF 2012-10-16
12:29:30 UTC (rev 44524)
+++
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/META-INF/MANIFEST.MF 2012-10-16
13:48:21 UTC (rev 44525)
@@ -8,7 +8,7 @@
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.apache.log4j;bundle-version="1.2.15",
- org.jboss.tools.ui.bot.ext,
+ org.jboss.tools.ui.bot.ext;bundle-version="3.4.0",
org.junit;bundle-version="4.8.1",
org.eclipse.swtbot.eclipse.core;bundle-version="2.0.5",
org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.5",
Modified:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/OpenShiftBotTests.launch
===================================================================
---
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/OpenShiftBotTests.launch 2012-10-16
12:29:30 UTC (rev 44524)
+++
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/OpenShiftBotTests.launch 2012-10-16
13:48:21 UTC (rev 44525)
@@ -14,7 +14,7 @@
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location"
value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry
value="/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/OpenShiftAllBotTests.java"/>
+<listEntry
value="/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/OpenShiftJenkinsBotTests.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -27,7 +27,7 @@
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME"
value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND"
value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER"
value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.jboss.tools.openshift.ui.bot.test.OpenShiftAllBotTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.jboss.tools.openshift.ui.bot.test.OpenShiftJenkinsBotTests"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}
-consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="org.jboss.tools.openshift.ui.bot.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER"
value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
Modified:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/OpenShiftBotTestsMaven.launch
===================================================================
---
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/OpenShiftBotTestsMaven.launch 2012-10-16
12:29:30 UTC (rev 44524)
+++
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/OpenShiftBotTestsMaven.launch 2012-10-16
13:48:21 UTC (rev 44525)
@@ -4,7 +4,7 @@
<stringAttribute key="M2_GOALS" value="clean install"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value="default"/>
+<stringAttribute key="M2_PROFILES"
value="maximum.target,jbosstools-staging-aggregate"/>
<listAttribute key="M2_PROPERTIES">
<listEntry value="swtbot.test.skip=false"/>
<listEntry value="configurations.dir=${project_loc}/resources"/>
@@ -17,5 +17,5 @@
<mapAttribute key="org.eclipse.debug.core.environmentVariables">
<mapEntry key="DISPLAY" value=":${string_prompt}"/>
</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY"
value="${workspace_loc:/org.jboss.tools.openshift.ui.bot.test}"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY"
value="${workspace_loc:/openshift/tests/org.jboss.tools.openshift.ui.bot.test}"/>
</launchConfiguration>
Modified:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/resources/openshift.ui.bot.test.properties
===================================================================
---
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/resources/openshift.ui.bot.test.properties 2012-10-16
12:29:30 UTC (rev 44524)
+++
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/resources/openshift.ui.bot.test.properties 2012-10-16
13:48:21 UTC (rev 44525)
@@ -5,3 +5,5 @@
openshift.user.wrongpwd=rhtest
openshift.domain=rhtestdomain
openshift.domain.new=rhtest
+openshift.server.prod=openshift.redhat.com
+openshift.server.stg=stg.openshift.redhat.com
\ No newline at end of file
Modified:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/OpenShiftJenkinsBotTests.java
===================================================================
---
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/OpenShiftJenkinsBotTests.java 2012-10-16
12:29:30 UTC (rev 44524)
+++
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/OpenShiftJenkinsBotTests.java 2012-10-16
13:48:21 UTC (rev 44525)
@@ -1,12 +1,18 @@
package org.jboss.tools.openshift.ui.bot.test;
import org.jboss.tools.openshift.ui.bot.test.explorer.Connection;
+import org.jboss.tools.openshift.ui.bot.test.explorer.CreateDomain;
+import org.jboss.tools.openshift.ui.bot.test.explorer.DeleteDomain;
+import org.jboss.tools.openshift.ui.bot.test.explorer.RenameDomain;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
@SuiteClasses({
-Connection.class
+Connection.class,
+CreateDomain.class,
+RenameDomain.class,
+DeleteDomain.class
})
@RunWith(RequirementAwareSuite.class)
public class OpenShiftJenkinsBotTests {
Modified:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/explorer/Connection.java
===================================================================
---
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/explorer/Connection.java 2012-10-16
12:29:30 UTC (rev 44524)
+++
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/explorer/Connection.java 2012-10-16
13:48:21 UTC (rev 44525)
@@ -28,14 +28,14 @@
// set wrong user credentials
bot.text(0).setText(TestProperties.get("openshift.user.name"));
bot.text(1).setText(TestProperties.get("openshift.user.wrongpwd"));
- bot.checkBox(0).deselect();
+ bot.checkBox(1).deselect();
SWTBotButton finishButton = bot.button(IDELabel.Button.FINISH);
// try to move forward
finishButton.click();
// wait for credentials validation
- bot.waitWhile(new NonSystemJobRunsCondition(), TIME_20S);
+ bot.waitWhile(new NonSystemJobRunsCondition(), TIME_60S);
assertFalse("Finish button shouldn't be enabled.",
finishButton.isEnabled());
@@ -43,7 +43,7 @@
// set correct user credentials and save it to secure storage
bot.text(0).setText(TestProperties.get("openshift.user.name"));
bot.text(1).setText(TestProperties.get("openshift.user.pwd"));
-
+ bot.checkBox(1).deselect();
// create connection to OpenShift account
finishButton.click();
Modified:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/explorer/CreateDomain.java
===================================================================
---
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/explorer/CreateDomain.java 2012-10-16
12:29:30 UTC (rev 44524)
+++
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/explorer/CreateDomain.java 2012-10-16
13:48:21 UTC (rev 44525)
@@ -1,8 +1,5 @@
package org.jboss.tools.openshift.ui.bot.test.explorer;
-import java.io.File;
-import java.util.Date;
-
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.waits.Conditions;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton;
@@ -12,7 +9,6 @@
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
-import org.junit.Before;
import org.junit.Test;
/**
@@ -24,34 +20,18 @@
*/
public class CreateDomain extends SWTTestExt {
- private boolean keyAvailable = false;
-
- @Before
- public void prepareSSHPrefs() {
- // clear dir from libra stuff so wizard can create new
- File sshDir = new File(System.getProperty("user.home") + "/.ssh");
-
- if (sshDir.exists() && sshDir.isDirectory()
- && sshDir.listFiles().length > 0) {
- for (File file : sshDir.listFiles()) {
- if (file.getName().contains("id_rsa"))
- //keyAvailable = true;
- file.delete();
- if (file.getName().contains("known_hosts"))
- file.delete();
- }
- }
-
- }
-
@Test
public void canCreateDomain() throws InterruptedException {
// open OpenShift Explorer
SWTBotView openshiftExplorer = open
.viewOpen(OpenShiftUI.Explorer.iView);
- openshiftExplorer.bot().tree()
- .getTreeItem(TestProperties.get("openshift.user.name"))
+ openshiftExplorer
+ .bot()
+ .tree()
+ .getTreeItem(
+ TestProperties.get("openshift.user.name") + " "
+ + TestProperties.get("openshift.server.prod"))
.contextMenu(OpenShiftUI.Labels.EXPLORER_CREATE_EDIT_DOMAIN)
.click();
@@ -66,39 +46,14 @@
log.info("*** OpenShift SWTBot Tests: Domain name set. ***");
SWTBotButton finishBtn = bot.button(IDELabel.Button.FINISH);
-
-
- bot.link(0).click();
-
- if (keyAvailable) {
-// TODO: add them to the list
- bot.waitForShell(OpenShiftUI.Shell.SSH_WIZARD);
- assertTrue("SSH key should be set!", bot.table().columnCount() > 0);
- } else {
-
- bot.waitForShell(OpenShiftUI.Shell.SSH_WIZARD);
- bot.buttonInGroup("New...", "SSH Public Keys").click();
- bot.waitForShell(OpenShiftUI.Shell.NEW_SSH);
-
- bot.textInGroup("New SSH Key", 0).setText("jbtkey" + new Date());
- bot.textInGroup("New SSH Key", 2).setText("id_rsa");
- bot.button(IDELabel.Button.FINISH).click();
-
- bot.waitWhile(new NonSystemJobRunsCondition(), TIME_20S, TIME_1S);
- bot.waitForShell(OpenShiftUI.Shell.SSH_WIZARD);
-
- bot.button(IDELabel.Button.OK).click();
- bot.waitForShell(OpenShiftUI.Shell.CREATE_DOMAIN);
-
- log.info("*** OpenShift SWTBot Tests: SSH Keys created. ***");
- }
-
bot.waitUntil(Conditions.widgetIsEnabled(finishBtn));
finishBtn.click();
// wait while the domain is being created
- bot.waitUntil(Conditions.shellCloses(bot.activeShell()), TIME_60S);
+ bot.waitUntil(Conditions.shellCloses(bot.activeShell()), TIME_60S * 3,
+ TIME_1S);
+ bot.waitWhile(new NonSystemJobRunsCondition(), TIME_20S, TIME_1S);
log.info("*** OpenShift SWTBot Tests: Domain created. ***");
}
Modified:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/explorer/DeleteDomain.java
===================================================================
---
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/explorer/DeleteDomain.java 2012-10-16
12:29:30 UTC (rev 44524)
+++
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/explorer/DeleteDomain.java 2012-10-16
13:48:21 UTC (rev 44525)
@@ -16,19 +16,23 @@
// refresh first
explorer.bot().tree()
- .getTreeItem(TestProperties.get("openshift.user.name"))
+ .getTreeItem(
+ TestProperties.get("openshift.user.name") + " "
+ + TestProperties.get("openshift.server.prod"))
.contextMenu(OpenShiftUI.Labels.REFRESH).click();
bot.waitWhile(new NonSystemJobRunsCondition(), TIME_60S * 3, TIME_1S);
// delete
explorer.bot().tree()
- .getTreeItem(TestProperties.get("openshift.user.name"))
+ .getTreeItem(
+ TestProperties.get("openshift.user.name") + " "
+ + TestProperties.get("openshift.server.prod"))
.contextMenu(OpenShiftUI.Labels.EXPLORER_DELETE_DOMAIN).click();
bot.checkBox().select();
bot.button("OK").click();
- bot.waitWhile(new NonSystemJobRunsCondition(), TIME_60S * 3, TIME_1S);
+ bot.waitWhile(new NonSystemJobRunsCondition(), TIME_60S * 4, TIME_1S);
}
}
Modified:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/explorer/RenameDomain.java
===================================================================
---
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/explorer/RenameDomain.java 2012-10-16
12:29:30 UTC (rev 44524)
+++
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/explorer/RenameDomain.java 2012-10-16
13:48:21 UTC (rev 44525)
@@ -6,6 +6,7 @@
import org.jboss.tools.openshift.ui.bot.util.OpenShiftUI;
import org.jboss.tools.openshift.ui.bot.util.TestProperties;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.junit.Test;
@@ -17,11 +18,13 @@
SWTBotView explorer = open.viewOpen(OpenShiftUI.Explorer.iView);
explorer.bot().tree()
- .getTreeItem(TestProperties.get("openshift.user.name"))
+ .getTreeItem(
+ TestProperties.get("openshift.user.name") + " "
+ + TestProperties.get("openshift.server.prod"))
.contextMenu(OpenShiftUI.Labels.EXPLORER_CREATE_EDIT_DOMAIN)
.click();
- bot.waitForShell("");
+ bot.waitForShell(OpenShiftUI.Shell.EDIT_DOMAIN);
SWTBotText domainText = bot.text(0);
@@ -32,9 +35,14 @@
domainText.setText(TestProperties.get("openshift.domain.new"));
+ log.info("*** OpenShift SWTBot Tests: Domain name re-set. ***");
+
bot.button(IDELabel.Button.FINISH).click();
bot.waitUntil(Conditions.shellCloses(bot.activeShell()), TIME_60S + TIME_30S);
-
+
+ log.info("*** OpenShift SWTBot Tests: Domain renamed. ***");
+
+ bot.waitWhile(new NonSystemJobRunsCondition(), TIME_20S, TIME_1S);
}
}