Author: vpakan(a)redhat.com Date: 2010-11-30 15:00:50 -0500 (Tue, 30 Nov 2010) New Revision: 27035 Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsProject.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java Log: Fixes for JBDS 4.0.0.Beta2 Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java 2010-11-30 19:25:57 UTC (rev 27034) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java 2010-11-30 20:00:50 UTC (rev 27035) @@ -306,7 +306,7 @@ SWTEclipseExt.getTreeItemOnPath( bot, bot.tree(), - Timing.time3S(), + Timing.time5S(), importFileName, new String[] { IDELabel.GuvnorRepositories.GUVNOR_REPOSITORY_ROOT_TREE_ITEM, @@ -352,7 +352,7 @@ SWTBotView guvnorReposioryView = guvnorRepositories.show(); SWTBotTreeItem tiRoot = guvnorRepositories.selectTreeItem(IDELabel.GuvnorRepositories.GUVNOR_REPOSITORY_ROOT_TREE_ITEM,null) .doubleClick(); - bot.sleep(Timing.time2S()); + bot.sleep(Timing.time5S()); SWTBot dialogBot = bot.shell("").activate().bot(); dialogBot.textWithLabel(IDELabel.GuvnorConsoleLoginDialog.USER_NAME).setText( GuvnorRepositoriesTest.GUVNOR_USER_NAME); @@ -413,7 +413,7 @@ SWTEclipseExt.getTreeItemOnPath( bot, bot.tree(), - Timing.time3S(), + Timing.time5S(), testFileName, new String[] { IDELabel.GuvnorRepositories.GUVNOR_REPOSITORY_ROOT_TREE_ITEM, Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsProject.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsProject.java 2010-11-30 19:25:57 UTC (rev 27034) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/ManageDroolsProject.java 2010-11-30 20:00:50 UTC (rev 27035) @@ -75,7 +75,7 @@ bot.button(IDELabel.Button.NEXT).click(); bot.button(IDELabel.Button.FINISH).click(); SWTTestExt.util.waitForAll(30*1000L); - bot.sleep(Timing.time5S()); + bot.sleep(Timing.time10S()); assertTrue("Project " + droolsProjectName + " was not created properly.",SWTEclipseExt.isProjectInPackageExplorer(bot,droolsProjectName)); Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2010-11-30 19:25:57 UTC (rev 27034) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2010-11-30 20:00:50 UTC (rev 27035) @@ -11,13 +11,13 @@ import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS51; import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS60; import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43; -import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50; +import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x; import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss42Runtime; import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss50Runtime; import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss51Runtime; import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss60Runtime; import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43Runtime; -import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50Runtime; +import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime; /** * adds server (version and type depends on {@link TestConfigurator#server}) * @author lzoubek @@ -96,13 +96,13 @@ JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43.LABEL ); } - if ("5.0".equals(version)) { - return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50Runtime.LABEL, - JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50.LABEL); + if ("5.0".equals(version) || "5.x".equals(version)) { + return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime.LABEL, + JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x.LABEL); } if ("5.1".equals(version)) { - return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50Runtime.LABEL, - JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50.LABEL); + return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime.LABEL, + JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x.LABEL); } } @@ -112,9 +112,9 @@ JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43.LABEL ); } - if ("5.0".equals(version)) { - return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50Runtime.LABEL, - JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50.LABEL); + if ("5.0".equals(version) || "5.x".equals(version)) { + return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime.LABEL, + JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x.LABEL); } } @@ -125,12 +125,12 @@ ); } if ("5.0".equals(version)) { - return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50Runtime.LABEL, - JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50.LABEL); + return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime.LABEL, + JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x.LABEL); } - if ("5.1".equals(version)) { - return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50Runtime.LABEL, - JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50.LABEL); + if ("5.1".equals(version) || "5.x".equals(version)) { + return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime.LABEL, + JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x.LABEL); } } Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2010-11-30 19:25:57 UTC (rev 27034) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2010-11-30 20:00:50 UTC (rev 27035) @@ -1676,12 +1676,12 @@ */ public static final String TEXT_DIRECTORY = "Directory:"; } - public static class JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50 { + public static class JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x { /** - * represents item : JBoss Enterprise Middleware->JBoss Enterprise Application Platform 5.0 + * represents item : JBoss Enterprise Middleware->JBoss Enterprise Application Platform 5.x */ public static final IServer LABEL = new IServer() { - public String getName() { return "JBoss Enterprise Application Platform 5.0";} + public String getName() { return "JBoss Enterprise Application Platform 5.x";} public List<String> getGroupPath() { List<String> l = new Vector<String>(); l.add("JBoss Enterprise Middleware"); @@ -10382,12 +10382,12 @@ */ public static final String TEXT_DIRECTORY = "Directory:"; } - public static class JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50Runtime { + public static class JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime { /** - * represents item : JBoss Enterprise Middleware->JBoss Enterprise Application Platform 5.0 Runtime + * represents item : JBoss Enterprise Middleware->JBoss Enterprise Application Platform 5.x Runtime */ public static final IServerRuntime LABEL = new IServerRuntime() { - public String getName() { return "JBoss Enterprise Application Platform 5.0 Runtime";} + public String getName() { return "JBoss Enterprise Application Platform 5.x Runtime";} public List<String> getGroupPath() { List<String> l = new Vector<String>(); l.add("JBoss Enterprise Middleware");