Author: lzoubek(a)redhat.com Date: 2011-03-01 04:54:58 -0500 (Tue, 01 Mar 2011) New Revision: 29404 Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ConfigBeanTest.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ServerUtil.java Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/Suite.java Log: swtbotext: several tests for remote server configurations Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java 2011-03-01 09:52:50 UTC (rev 29403) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedDefaultServer.java 2011-03-01 09:54:58 UTC (rev 29404) @@ -1,13 +1,8 @@ package org.jboss.tools.ui.bot.ext.test.config; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; -import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; @@ -26,30 +21,12 @@ @Test public void serverExists() { - boolean found=false; - for (SWTBotTreeItem item : servers.show().bot().tree().getAllItems()) { - if (item.getText().startsWith(configuredState.getServer().name)) { - found = true; - break; - } - } - assertTrue(found); + ServerUtil.serverExists(); } @Test public void serverRunning() { - SWTBotTreeItem server =null; - SWTBotTree tree = servers.show().bot().tree(); - for (SWTBotTreeItem item : tree.getAllItems()) { - if (item.getText().startsWith(configuredState.getServer().name)) { - server = item; - break; - } - } - if (server!=null) { - ContextMenuHelper.prepareTreeItemForContextMenu(tree, server); - assertTrue(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.STOP, false)).isEnabled()); - } + ServerUtil.serverRunning(); } } Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java 2011-03-01 09:52:50 UTC (rev 29403) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedEPPServer.java 2011-03-01 09:54:58 UTC (rev 29404) @@ -1,14 +1,9 @@ package org.jboss.tools.ui.bot.ext.test.config; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; -import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; -import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; @@ -27,30 +22,12 @@ @Test public void serverExists() { - boolean found=false; - for (SWTBotTreeItem item : servers.show().bot().tree().getAllItems()) { - if (item.getText().startsWith(configuredState.getServer().name)) { - found = true; - break; - } - } - assertTrue(found); + ServerUtil.serverExists(); } @Test public void serverRunning() { - SWTBotTreeItem server =null; - SWTBotTree tree = servers.show().bot().tree(); - for (SWTBotTreeItem item : tree.getAllItems()) { - if (item.getText().startsWith(configuredState.getServer().name)) { - server = item; - break; - } - } - if (server!=null) { - ContextMenuHelper.prepareTreeItemForContextMenu(tree, server); - assertTrue(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.STOP, false)).isEnabled()); - } + ServerUtil.serverRunning(); } } Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java 2011-03-01 09:52:50 UTC (rev 29403) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedJbossASServer.java 2011-03-01 09:54:58 UTC (rev 29404) @@ -1,14 +1,9 @@ package org.jboss.tools.ui.bot.ext.test.config; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; -import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; -import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; @@ -27,30 +22,12 @@ @Test public void serverExists() { - boolean found=false; - for (SWTBotTreeItem item : servers.show().bot().tree().getAllItems()) { - if (item.getText().startsWith(configuredState.getServer().name)) { - found = true; - break; - } - } - assertTrue(found); + ServerUtil.serverExists(); } @Test public void serverRunning() { - SWTBotTreeItem server =null; - SWTBotTree tree = servers.show().bot().tree(); - for (SWTBotTreeItem item : tree.getAllItems()) { - if (item.getText().startsWith(configuredState.getServer().name)) { - server = item; - break; - } - } - if (server!=null) { - ContextMenuHelper.prepareTreeItemForContextMenu(tree, server); - assertTrue(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.STOP, false)).isEnabled()); - } + ServerUtil.serverRunning(); } } Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java (rev 0) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedLocalServer.java 2011-03-01 09:54:58 UTC (rev 29404) @@ -0,0 +1,30 @@ +package org.jboss.tools.ui.bot.ext.test.config; + +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerLocation; +import org.junit.Test; +@SWTBotTestRequires(server=(a)Server(location=ServerLocation.Local),perspective="Java EE") +public class AnnotatedLocalServer extends SWTTestExt{ + @Test + public void configuredState() { + assertTrue(configuredState.getServer().isRunning); + assertTrue(configuredState.getServer().isConfigured); + assertNotNull(configuredState.getServer().version); + assertNotNull(configuredState.getServer().type); + assertNotNull(configuredState.getServer().name); + assertNotNull(configuredState.getServer().withJavaVersion); + assertTrue(configuredState.getServer().isLocal); + } + + @Test + public void serverExists() { + ServerUtil.serverExists(); + } + + @Test + public void serverRunning() { + ServerUtil.serverRunning(); + } +} Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java 2011-03-01 09:52:50 UTC (rev 29403) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedNotRunningServer.java 2011-03-01 09:54:58 UTC (rev 29404) @@ -27,14 +27,7 @@ @Test public void serverExists() { - boolean found=false; - for (SWTBotTreeItem item : servers.show().bot().tree().getAllItems()) { - if (item.getText().startsWith(configuredState.getServer().name)) { - found = true; - break; - } - } - assertTrue(found); + ServerUtil.serverExists(); } @Test Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java (rev 0) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnnotatedRemoteServer.java 2011-03-01 09:54:58 UTC (rev 29404) @@ -0,0 +1,25 @@ +package org.jboss.tools.ui.bot.ext.test.config; + +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerLocation; +import org.junit.Test; +@SWTBotTestRequires(server=(a)Server(location=ServerLocation.Remote),perspective="Java EE") +public class AnnotatedRemoteServer extends SWTTestExt{ + @Test + public void configuredState() { + assertTrue(configuredState.getServer().isRunning); + assertTrue(configuredState.getServer().isConfigured); + assertNotNull(configuredState.getServer().version); + assertNotNull(configuredState.getServer().type); + assertNotNull(configuredState.getServer().name); + assertNotNull(configuredState.getServer().withJavaVersion); + assertFalse(configuredState.getServer().isLocal); + } + + @Test + public void serverExists() { + ServerUtil.serverExists(); + } +} Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java 2011-03-01 09:52:50 UTC (rev 29403) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/AnonatedRunningServer.java 2011-03-01 09:54:58 UTC (rev 29404) @@ -1,14 +1,9 @@ package org.jboss.tools.ui.bot.ext.test.config; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; 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.helper.ContextMenuHelper; -import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; @@ -27,30 +22,12 @@ @Test public void serverExists() { - boolean found=false; - for (SWTBotTreeItem item : servers.show().bot().tree().getAllItems()) { - if (item.getText().startsWith(configuredState.getServer().name)) { - found = true; - break; - } - } - assertTrue(found); + ServerUtil.serverExists(); } @Test public void serverRunning() { - SWTBotTreeItem server =null; - SWTBotTree tree = servers.show().bot().tree(); - for (SWTBotTreeItem item : tree.getAllItems()) { - if (item.getText().startsWith(configuredState.getServer().name)) { - server = item; - break; - } - } - if (server!=null) { - ContextMenuHelper.prepareTreeItemForContextMenu(tree, server); - assertTrue(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.STOP, false)).isEnabled()); - } + ServerUtil.serverRunning(); } } Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ConfigBeanTest.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ConfigBeanTest.java (rev 0) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ConfigBeanTest.java 2011-03-01 09:54:58 UTC (rev 29404) @@ -0,0 +1,38 @@ +package org.jboss.tools.ui.bot.ext.test.config; + +import static org.junit.Assert.*; + +import org.jboss.tools.ui.bot.ext.config.RemoteSystemBean; +import org.jboss.tools.ui.bot.ext.config.ServerBean; +import org.junit.Test; + +public class ConfigBeanTest { + + @Test + public void serverBeanRemote() throws Exception{ + ServerBean bean = ServerBean.fromString("EAP,5.0,1.6,/data/jboss/jboss-eap-5.0/jboss-as,jawa23.mw.lab.eng.brq.redhat.com,/opt/jboss-as"); + assertEquals(bean.type,"EAP"); + assertEquals(bean.version,"5.0"); + assertEquals(bean.withJavaVersion,"1.6"); + assertEquals(bean.runtimeHome,"/data/jboss/jboss-eap-5.0/jboss-as"); + assertEquals(bean.remoteSystem,"jawa23.mw.lab.eng.brq.redhat.com"); + assertEquals(bean.remoteHome, "/opt/jboss-as"); + } + @Test + public void serverBeanLocal() throws Exception{ + ServerBean bean = ServerBean.fromString("EAP,5.0,1.6,/data/jboss/jboss-eap-5.0/jboss-as"); + assertEquals(bean.type,"EAP"); + assertEquals(bean.version,"5.0"); + assertEquals(bean.withJavaVersion,"1.6"); + assertEquals(bean.runtimeHome,"/data/jboss/jboss-eap-5.0/jboss-as"); + assertNull(bean.remoteSystem); + assertNull(bean.remoteHome); + } + @Test + public void remoteSystem() throws Exception { + RemoteSystemBean bean = RemoteSystemBean.fromString("lzoubek,jawa23.mw.lab.eng.brq.redhat.com,/home/lzoubek/.ssh/id_rsa"); + assertEquals(bean.user,"lzoubek"); + assertEquals(bean.host,"jawa23.mw.lab.eng.brq.redhat.com"); + assertEquals(bean.key,"/home/lzoubek/.ssh/id_rsa"); + } +} Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ServerUtil.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ServerUtil.java (rev 0) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/ServerUtil.java 2011-03-01 09:54:58 UTC (rev 29404) @@ -0,0 +1,39 @@ +package org.jboss.tools.ui.bot.ext.test.config; + +import static org.junit.Assert.*; + +import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; + +public class ServerUtil { + + public static void serverExists() { + boolean found=false; + for (SWTBotTreeItem item : SWTTestExt.servers.show().bot().tree().getAllItems()) { + if (item.getText().startsWith(SWTTestExt.configuredState.getServer().name)) { + found = true; + break; + } + } + assertTrue(found); + } + + public static void serverRunning() { + SWTBotTreeItem server =null; + SWTBotTree tree = SWTTestExt.servers.show().bot().tree(); + for (SWTBotTreeItem item : tree.getAllItems()) { + if (item.getText().startsWith(SWTTestExt.configuredState.getServer().name)) { + server = item; + break; + } + } + if (server!=null) { + ContextMenuHelper.prepareTreeItemForContextMenu(tree, server); + assertTrue(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.STOP, false)).isEnabled()); + } + } +} Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/Suite.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/Suite.java 2011-03-01 09:52:50 UTC (rev 29403) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/bot/ext/test/config/Suite.java 2011-03-01 09:54:58 UTC (rev 29404) @@ -15,6 +15,7 @@ import org.junit.runners.Suite.SuiteClasses; @SuiteClasses( { + ConfigBeanTest.class, NotAnnotated.class, //ClassWithoutTests.class, AnnotatedDefaultServer.class, @@ -26,6 +27,8 @@ AnnotatedDisabledServer.class, AnonatedRunningServer.class, AnnotatedWithSeam.class, + AnnotatedRemoteServer.class, + AnnotatedLocalServer.class }) @RunWith(RequirementAwareSuite.class) public class Suite {