Author: apodhrad Date: 2012-09-14 08:34:25 -0400 (Fri, 14 Sep 2012) New Revision: 43690 Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/pom.xml trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/Properties.java trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/Publishing.java Log: JBIDE-11714: ModeShape Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/pom.xml =================================================================== --- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/pom.xml 2012-09-14 10:48:48 UTC (rev 43689) +++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/pom.xml 2012-09-14 12:34:25 UTC (rev 43690) @@ -14,10 +14,42 @@ <properties> <coverage.filter>org.jboss.tools.modeshape.rest.ui*</coverage.filter> <emma.instrument.bundles>org.jboss.tools.modeshape.rest</emma.instrument.bundles> + <systemProperties>-Dswtbot.test.properties.file=./swtbot.properties</systemProperties> </properties> - + <build> <plugins> + <plugin> + <groupId>com.googlecode.maven-download-plugin</groupId> + <artifactId>maven-download-plugin</artifactId> + <executions> + <execution> + <id>install-as</id> + <phase>pre-integration-test</phase> + <goals> + <goal>wget</goal> + </goals> + <configuration> + <url>http://repository.jboss.org/sourceforge/jboss-5.1.0.GA.zip</url... + <md5>78322c75ca0c13002a04418b4a8bc920</md5> + <unpack>true</unpack> + </configuration> + </execution> + <execution> + <id>get-modeshape</id> + <phase>pre-integration-test</phase> + <goals> + <goal>wget</goal> + </goals> + <configuration> + <url>http://downloads.jboss.org/modeshape/2.8.3.Final/modeshape-2.8.3.F... + <unpack>true</unpack> + <md5>4b279bf46ae3247376f55f0dadd729f6</md5> + <outputDirectory>${requirementsDirectory}/jboss-5.1.0.GA/server/default</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/Properties.java =================================================================== --- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/Properties.java 2012-09-14 10:48:48 UTC (rev 43689) +++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/Properties.java 2012-09-14 12:34:25 UTC (rev 43690) @@ -14,7 +14,8 @@ public static final String URL = "http://localhost:8080/modeshape-rest"; public static final String WEBDAV_URL = "http://localhost:8080/modeshape-webdav"; - public static final String REPOSITORY = "eds"; + // TODO: The default repository in SOA-P is 'eds', we should create our own repo + public static final String REPOSITORY = "repository"; public static final String WORKSPACE = "default"; public static final String USER = "admin"; Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/Publishing.java =================================================================== --- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/Publishing.java 2012-09-14 10:48:48 UTC (rev 43689) +++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/src/org/jboss/tools/modeshape/rest/ui/bot/tests/Publishing.java 2012-09-14 12:34:25 UTC (rev 43690) @@ -20,6 +20,7 @@ import org.jboss.tools.ui.bot.ext.SWTUtilExt; 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.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.GeneralProject; @@ -35,7 +36,7 @@ * @author psrna * */ -@Require(server=(a)Server(type=ServerType.SOA,version=&quot;5.1&quot;),perspective=&quot;Java EE") +@Require(server=(a)Server(type=ServerType.ALL, state=ServerState.Running),perspective="Java EE") public class Publishing extends SWTTestExt{ private static final String CONNERR_MSG = "Unable to connect using the specified server properties." + @@ -225,9 +226,9 @@ public static void afterClass(){ bot.viewByTitle("ModeShape").show(); - SWTBot mbot = bot.viewByTitle("ModeShape").bot(); - mbot.tree().select(Properties.URL); - bot.toolbarButtonWithTooltip("Delete server from the server registry").click(); + SWTBotView botView = bot.viewByTitle("ModeShape"); + botView.bot().tree().select(Properties.URL); + botView.toolbarButton("Delete server from the server registry").click(); SWTBotShell shell = bot.shell("Confirm Delete Server"); open.finish(shell.bot(),IDELabel.Button.OK);