[jbosstools-commits] JBoss Tools SVN: r41882 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test: resources and 4 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Tue Jun 12 05:16:15 EDT 2012
Author: ljelinko
Date: 2012-06-12 05:16:15 -0400 (Tue, 12 Jun 2012)
New Revision: 41882
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Test.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeleteAS7Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/entity/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/entity/XMLConfiguration.java
Removed:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/CreateServerTest.java
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
Log:
Created first test
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch 2012-06-12 08:59:35 UTC (rev 41881)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch 2012-06-12 09:16:15 UTC (rev 41882)
@@ -30,7 +30,7 @@
<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.ide.eclipse.as.ui.bot.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024m -XX:MaxPermSize=256m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=/home/ljelinko/work/workspaces/jboss-tools/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties -Xmx1024m -XX:MaxPermSize=256m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="show_selected_only" value="false"/>
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties 2012-06-12 09:16:15 UTC (rev 41882)
@@ -0,0 +1 @@
+SERVER=EAP,6.0,default,/home/ljelinko/programs/jboss/EAP/jboss-eap-6.0
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-06-12 08:59:35 UTC (rev 41881)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-06-12 09:16:15 UTC (rev 41882)
@@ -1,12 +1,17 @@
package org.jboss.ide.eclipse.as.ui.bot.test;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Test;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeleteAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@RunWith(RequirementAwareSuite.class)
@Suite.SuiteClasses({
- CreateServerTest.class
+ CreateAS7Test.class,
+ OperateAS7Server.class,
+ DeleteAS7Server.class
})
public class AllTestsSuite {
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/CreateServerTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/CreateServerTest.java 2012-06-12 08:59:35 UTC (rev 41881)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/CreateServerTest.java 2012-06-12 09:16:15 UTC (rev 41882)
@@ -1,12 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test;
-
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.junit.Test;
-
-public class CreateServerTest extends SWTTestExt {
-
- @Test
- public void test(){
- System.out.println("TEST");
- }
-}
Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Test.java (from rev 41816, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/CreateServerTest.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Test.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Test.java 2012-06-12 09:16:15 UTC (rev 41882)
@@ -0,0 +1,39 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as7;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.editor.ServerEditor;
+import org.jboss.ide.eclipse.as.ui.bot.test.entity.XMLConfiguration;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+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.config.Annotations.ServerType;
+import org.junit.Test;
+
+/**
+ * Creates server and checks its ports (in both the server view and server editor)
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+ at Require(server=@Server(type=ServerType.EAP, state=ServerState.Present))
+public class CreateAS7Test extends SWTTestExt {
+
+ @Test
+ public void createServer(){
+ ServerEditor editor = new ServerEditor(configuredState.getServer().name);
+ editor.open();
+
+ assertThat("8080", is(editor.getWebPort()));
+ assertThat("9999", is(editor.getManagementPort()));
+
+ List<XMLConfiguration> configurations = editor.getXMLConfiguration("Ports");
+ assertThat(configurations, hasItem(new XMLConfiguration("JBoss Management", "${jboss.management.native.port:9999}")));
+ assertThat(configurations, hasItem(new XMLConfiguration("JBoss Web", "8080")));
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeleteAS7Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeleteAS7Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeleteAS7Server.java 2012-06-12 09:16:15 UTC (rev 41882)
@@ -0,0 +1,23 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as7;
+
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+/**
+ * Deletes the server.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class DeleteAS7Server extends SWTTestExt {
+
+ private ServersView serversView = new ServersView();
+
+ @Test
+ public void deleteServer(){
+ serversView.deleteServer(configuredState.getServer().name);
+
+ assertFalse(serversView.serverExists(configuredState.getServer().name));
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java 2012-06-12 09:16:15 UTC (rev 41882)
@@ -0,0 +1,56 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as7;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+public class OperateAS7Server extends SWTTestExt {
+
+ private ServersView serversView = new ServersView();
+
+ protected String getServerName(){
+ return configuredState.getServer().name;
+ }
+
+ @Test
+ public void operateServer(){
+ startServer();
+ restartServer();
+ stopServer();
+ }
+
+ public void startServer(){
+ serversView.startServer(getServerName());
+
+ assertNoException("Starting server");
+ assertServerState("Starting server", "Started");
+
+ }
+
+ public void restartServer(){
+ serversView.restartServer(getServerName());
+
+ assertNoException("Restarting server");
+ assertServerState("Restarting server", "Started");
+ }
+
+ public void stopServer(){
+ serversView.stopServer(getServerName());
+
+ assertNoException("Stopping server");
+ assertServerState("Stopping server", "Stopped");
+ }
+
+ protected void assertNoException(String message) {
+ assertThat(message, "Exception:", not(new ConsoleOutputMatcher()));
+ }
+
+ protected void assertServerState(String message, String state) {
+ assertThat(message, serversView.getServerStatus(getServerName()), is(state));
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java 2012-06-12 09:16:15 UTC (rev 41882)
@@ -0,0 +1,83 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.editor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.waits.ICondition;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.ide.eclipse.as.ui.bot.test.entity.XMLConfiguration;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+
+public class ServerEditor {
+
+ private ServersView serversView = new ServersView();
+
+ private String name;
+
+ public ServerEditor(String name) {
+ super();
+ this.name = name;
+ }
+
+ public void open(){
+ serversView.openServerEditor(name);
+ }
+
+ public ServerLaunchConfiguration openLaunchConfiguration(){
+ SWTBotFactory.getBot().hyperlink("Open launch configuration").click();
+ SWTBotFactory.getBot().shell("Edit Configuration").activate();
+ return new ServerLaunchConfiguration();
+ }
+
+ public String getWebPort(){
+ return SWTBotFactory.getBot().textWithLabel("Web").getText();
+ }
+
+ public String getManagementPort(){
+ return SWTBotFactory.getBot().textWithLabel("Management").getText();
+ }
+
+ public List<XMLConfiguration> getXMLConfiguration(String categoryName){
+ SWTBotTreeItem server = serversView.findServerByName(name);
+ server.expand();
+ final SWTBotTreeItem category = server.expandNode("XML Configuration", categoryName);
+
+ SWTBotFactory.getBot().waitUntil(new TreeItemLabelChangedCondition(category.getNode(0)));
+
+ List<XMLConfiguration> configurations = new ArrayList<XMLConfiguration>();
+ for (SWTBotTreeItem item : category.getItems()){
+ String[] columns = item.getText().split(" ");
+ configurations.add(new XMLConfiguration(columns[0].trim(), columns[1].trim()));
+ }
+ return configurations;
+ }
+
+ private static class TreeItemLabelChangedCondition implements ICondition {
+
+ private String firstTimeText;
+
+ private SWTBotTreeItem item;
+
+ public TreeItemLabelChangedCondition(SWTBotTreeItem item) {
+ super();
+ this.item = item;
+ }
+
+ @Override
+ public void init(SWTBot bot) {
+ firstTimeText = item.getText();
+ }
+
+ @Override
+ public boolean test() throws Exception {
+ return !firstTimeText.equals(item.getText());
+ }
+
+ @Override
+ public String getFailureMessage() {
+ return "Expected the tree item's text to change";
+ }
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java 2012-06-12 09:16:15 UTC (rev 41882)
@@ -0,0 +1,14 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.editor;
+
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+
+public class ServerLaunchConfiguration {
+
+ public String getProgramArguments(){
+ return SWTBotFactory.getBot().textInGroup("Program arguments:").getText();
+ }
+
+ public String getVMArguments(){
+ return SWTBotFactory.getBot().textInGroup("VM arguments:").getText();
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/entity/XMLConfiguration.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/entity/XMLConfiguration.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/entity/XMLConfiguration.java 2012-06-12 09:16:15 UTC (rev 41882)
@@ -0,0 +1,70 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.entity;
+
+public class XMLConfiguration {
+
+ private String key;
+
+ private String value;
+
+ public XMLConfiguration() {
+ // default
+ }
+
+ public XMLConfiguration(String key, String value) {
+ super();
+ this.key = key;
+ this.value = value;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return getKey() + "=" + getValue();
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((key == null) ? 0 : key.hashCode());
+ result = prime * result + ((value == null) ? 0 : value.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ XMLConfiguration other = (XMLConfiguration) obj;
+ if (key == null) {
+ if (other.key != null)
+ return false;
+ } else if (!key.equals(other.key))
+ return false;
+ if (value == null) {
+ if (other.value != null)
+ return false;
+ } else if (!value.equals(other.value))
+ return false;
+ return true;
+ }
+}
More information about the jbosstools-commits
mailing list