May 2012 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r41213 - in trunk/central/tests/org.jboss.tools.central.test.ui.bot: resources and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rhopp Date: 2012-05-21 10:29:39 -0400 (Mon, 21 May 2012) New Revision: 41213 Added: trunk/central/tests/org.jboss.tools.central.test.ui.bot/README trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/MavenTest.launch trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/MavenTestDebug.launch trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/RunTest.launch trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/server_properties/ trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/server_properties/as7.swtbot.test.properties trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/server_properties/eap6.swtbot.test.properties Removed: trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/as7.swtbot.test.properties Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/settings.xml trunk/central/tests/org.jboss.tools.central.test.ui.bot/screenshots/ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java Log: Added: trunk/central/tests/org.jboss.tools.central.test.ui.bot/README =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/README (rev 0) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/README 2012-05-21 14:29:39 UTC (rev 41213) @@ -0,0 +1,2 @@ +First import Launch configuration (RunTest for running locally via Eclipse. MavenTest for running with maven(not working right now because of EAP)) +Specify arguments test.configurations.dir and eap.maven.config.file (should be in /resources/server_properties and /resources/settings.xml) Added: trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/MavenTest.launch =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/MavenTest.launch (rev 0) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/MavenTest.launch 2012-05-21 14:29:39 UTC (rev 41213) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType"> +<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/> +<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"/> +<listAttribute key="M2_PROPERTIES"> +<listEntry value="swtbot.test.skip=false"/> +<listEntry value="swtbot.properties=/home/rhopp/RedHatStuff/svn/tools1/trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/as7.swtbot.test.properties"/> +</listAttribute> +<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/> +<booleanAttribute key="M2_SKIP_TESTS" value="false"/> +<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/> +<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> +<mapAttribute key="org.eclipse.debug.core.environmentVariables"> +<mapEntry key="DISPLAY" value=":1.0"/> +</mapAttribute> +<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/home/rhopp/RedHatStuff/svn/tools1/trunk/central/tests/org.jboss.tools.central.test.ui.bot"/> +</launchConfiguration> Added: trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/MavenTestDebug.launch =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/MavenTestDebug.launch (rev 0) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/MavenTestDebug.launch 2012-05-21 14:29:39 UTC (rev 41213) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType"> +<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/> +<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 debug"/> +<listAttribute key="M2_PROPERTIES"> +<listEntry value="swtbot.test.skip=false"/> +<listEntry value="swtbot.properties=/home/rhopp/RedHatStuff/svn/tools1/trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/as7.swtbot.test.properties"/> +</listAttribute> +<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/> +<booleanAttribute key="M2_SKIP_TESTS" value="false"/> +<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/> +<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/> +<mapAttribute key="org.eclipse.debug.core.environmentVariables"> +<mapEntry key="DISPLAY" value=":1.0"/> +</mapAttribute> +<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/home/rhopp/RedHatStuff/svn/tools1/trunk/central/tests/org.jboss.tools.central.test.ui.bot"/> +</launchConfiguration> Added: trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/RunTest.launch =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/RunTest.launch (rev 0) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/RunTest.launch 2012-05-21 14:29:39 UTC (rev 41213) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig"> +<booleanAttribute key="append.args" value="true"/> +<booleanAttribute key="askclear" value="false"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="bootstrap" value=""/> +<stringAttribute key="checked" value="[NONE]"/> +<booleanAttribute key="clearConfig" value="true"/> +<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearwslog" value="false"/> +<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> +<booleanAttribute key="default" value="true"/> +<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.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<mapAttribute key="org.eclipse.debug.core.environmentVariables"> +<mapEntry key="DISPLAY" value=":1.0"/> +</mapAttribute> +<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> +<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> +<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.MAIN_TYPE" value="org.jboss.tools.central.test.ui.bot.CentralAllBotTests"/> +<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.central.test.ui.bot"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dtest.configurations.dir=${project_loc}/resources/server_properties -Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx512m"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="false"/> +<booleanAttribute key="useProduct" value="true"/> +</launchConfiguration> Deleted: trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/as7.swtbot.test.properties =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/as7.swtbot.test.properties 2012-05-21 14:26:31 UTC (rev 41212) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/as7.swtbot.test.properties 2012-05-21 14:29:39 UTC (rev 41213) @@ -1 +0,0 @@ -SERVER=AS,7.1,default,${jbosstools.test.jbossas.home} Added: trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/server_properties/as7.swtbot.test.properties =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/server_properties/as7.swtbot.test.properties (rev 0) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/server_properties/as7.swtbot.test.properties 2012-05-21 14:29:39 UTC (rev 41213) @@ -0,0 +1 @@ +SERVER=AS,7.1,default,/home/rhopp/Runtimes/jboss-as-7.1.1.Final \ No newline at end of file Added: trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/server_properties/eap6.swtbot.test.properties =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/server_properties/eap6.swtbot.test.properties (rev 0) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/server_properties/eap6.swtbot.test.properties 2012-05-21 14:29:39 UTC (rev 41213) @@ -0,0 +1 @@ +SERVER=EAP,6.0,default,/home/rhopp/Runtimes/jboss-eap-6.0-ER6/jboss-eap-6.0 \ No newline at end of file Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/settings.xml =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/settings.xml 2012-05-21 14:26:31 UTC (rev 41212) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/resources/settings.xml 2012-05-21 14:29:39 UTC (rev 41213) @@ -1,83 +1,187 @@ <?xml version="1.0" encoding="UTF-8"?> -<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> - - <profiles> +<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> + <localRepository>${user.home}/.m2/clean-repository</localRepository> + <profiles> -  -  - <profile> - <id>jboss-eap-maven-repository</id> - <repositories> - <repository> - <id>jboss-eap</id> - <url>file:///home/rhopp/repositories/jboss-eap-6.0.0.ER3-maven-repository</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>jboss-eap-maven-plugin-repository</id> - <url>file:///home/rhopp/repositories/jboss-eap-6.0.0.ER3-maven-repository</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - </pluginRepositories> - </profile> +  +  + <profile> + <id>jboss-public-repository</id> + <repositories> + <repository> + <id>jboss-public-repository-group</id> + <name>JBoss Public Maven Repository Group</name> + <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>jboss-public-repository-group</id> + <name>JBoss Public Maven Repository Group</name> + <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> - <profile> - <id>jboss-wfk-repository</id> - <repositories> - <repository> - <id>jboss-wfk-repository</id> - <name>JBoss WFK Maven Repository</name> - <url>file:///home/rhopp/repositories/jboss-wfk-2.0.0.ER3-maven-repository</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>jboss-wfk-repository-group</id> - <name>JBoss WFK Maven Repository</name> - <url>file:///home/rhopp/repositories/jboss-wfk-2.0.0.ER3-maven-repository</url> - <layout>default</layout> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </pluginRepository> - </pluginRepositories> - </profile> + <profile> + <id>jboss-eap-maven-online-repository</id> + <repositories> + <repository> + <id>jboss-eap</id> + <url>http://download.lab.bos.redhat.com/rel-eng/repos/jb-eap-6-rhel-6-build/JB...</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>jboss-eap-maven-plugin-repository</id> + <url>http://download.lab.bos.redhat.com/rel-eng/repos/jb-eap-6-rhel-6-build/JB...</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> - </profiles> + <profile> + <id>jboss-eap-maven-repository</id> + <repositories> + <repository> + <id>jboss-eap</id> + <url>file:///home/rhopp/repositories/jboss-eap-6.0.0.ER5-maven-repository</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>jboss-eap-maven-plugin-repository</id> + <url>file:///home/rhopp/repositories/jboss-eap-6.0.0.ER5-maven-repository</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> - <activeProfiles> -  - <activeProfile>jboss-eap-maven-repository</activeProfile> - <activeProfile>jboss-wfk-repository</activeProfile> - </activeProfiles> + <profile> + <id>jboss-wfk-repository</id> + <repositories> + <repository> + <id>jboss-wfk-repository</id> + <name>JBoss WFK Maven Repository</name> + <url>file:///home/rhopp/repositories/jboss-wfk-2.0.0.ER5-maven-repository</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>jboss-wfk-repository-group</id> + <name>JBoss WFK Maven Repository</name> + <url>file:///home/rhopp/repositories/jboss-wfk-2.0.0.ER5-maven-repository</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> + + <profile> + <id>jboss-wfk-online-repository</id> + <repositories> + <repository> + <id>jboss-wfk-repository</id> + <name>JBoss WFK Maven Repository</name> + <url>http://maven.repository.redhat.com/jboss-wfk/2.0.0-beta1/maven-repository/</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>jboss-wfk-repository-group</id> + <name>JBoss WFK Maven Repository</name> + <url>http://maven.repository.redhat.com/jboss-wfk/2.0.0-beta1/maven-repository/</url> + <layout>default</layout> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </pluginRepository> + </pluginRepositories> + </profile> + </profiles> + + <activeProfiles> +  +  + + <activeProfile>jboss-wfk-repository</activeProfile> + <activeProfile>jboss-eap-maven-online-repository</activeProfile> +  + </activeProfiles> + </settings> \ No newline at end of file Property changes on: trunk/central/tests/org.jboss.tools.central.test.ui.bot/screenshots ___________________________________________________________________ Modified: svn:ignore - default - projectExamplesSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg Default - projectExamplesSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg org.jboss.tools.central.test.ui.bot.CreateProjectsTest.jpeg Default - createProjectsSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg as7.swtbot.test - createProjectsSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg default - createProjectsSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg as7.swtbot.test - projectExamplesSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg + default - projectExamplesSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg Default - projectExamplesSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg org.jboss.tools.central.test.ui.bot.CreateProjectsTest.jpeg Default - createProjectsSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg as7.swtbot.test - createProjectsSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg default - createProjectsSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg as7.swtbot.test - projectExamplesSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg Default - createProjectsSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsWithServerTest).jpeg Default - projectExamplesSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsWithServerTest).jpeg Default - canBeDeployedTest(org.jboss.tools.central.test.ui.bot.CreateProjectsWithServerTest).jpeg org.jboss.tools.central.test.ui.bot.CreateProjectsWithServerTest.jpeg eap6.swtbot.test - createProjectsSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsWithServerTest).jpeg default - createProjectsSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsWithoutServerTest).jpeg Default - createProjectsSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsWithoutServerTest).jpeg Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-05-21 14:26:31 UTC (rev 41212) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-05-21 14:29:39 UTC (rev 41213) @@ -1,5 +1,11 @@ package org.jboss.tools.central.test.ui.bot; +import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType; + +import java.io.File; +import java.io.FileNotFoundException; + +import org.eclipse.swt.widgets.Link; import org.eclipse.swtbot.eclipse.finder.waits.Conditions; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.utils.Traverse; @@ -21,11 +27,11 @@ import org.junit.BeforeClass; import org.junit.Test; -@Require(server=(a)org.jboss.tools.ui.bot.ext.config.Annotations.Server(type=ServerType.JbossAS)) +@Require(server=(a)org.jboss.tools.ui.bot.ext.config.Annotations.Server(type=ServerType.EAP)) public class CreateProjectsWithServerTest extends SWTTestExt{ @BeforeClass - public static void setup(){ + public static void setup() throws FileNotFoundException{ bot.menu("Window").menu("Preferences").click(); bot.waitForShell("Preferences"); bot.tree().getTreeItem("Maven").select(); @@ -33,8 +39,58 @@ bot.clickButton("OK"); bot.menu("Help").menu(IDELabel.JBossCentralEditor.JBOSS_CENTRAL).click(); util.waitForAll(); + if (configuredState.getServer().type.equalsIgnoreCase("EAP")){ + setupEAP(); + } + } + /** + * Sets up maven configuration file with configured EAP and WFK repository and clears ~/.m2/clean-repository + * Clears ~/.m2/clean-repository if exists + * @throws FileNotFoundException + */ + private static void setupEAP() throws FileNotFoundException{ + log.info("A mame tady EAPcko !!!!!!"); + String mvnConfigFileName = System.getProperty("eap.maven.config.file"); + File mvnConfigFile; + try { + mvnConfigFile = new File(mvnConfigFileName); + } catch (NullPointerException e) { + throw new NullPointerException("eap.maven.config.file wasn't set"); + } + if (!mvnConfigFile.exists()) throw new FileNotFoundException("File configured in eap.maven.config.file " + + "property does not exist"); + File mvnLocalRepo = new File(System.getProperty("user.home")+"/.m2/clean-repository"); + if (mvnLocalRepo.exists()){ + deleteDirectory(mvnLocalRepo); + } + //Now is ~/.m2/clean-repository deleted and settings.xml exists. Next step is to tell eclipse to use our settings.xml + bot.menu("Window").menu("Preferences").click(); + bot.waitForShell("Preferences"); + bot.tree().expandNode("Maven").select("User Settings"); + bot.text(1).setText(mvnConfigFileName); + bot.clickButton("Update Settings"); + util.waitForNonIgnoredJobs(); + bot.clickButton("Apply"); + bot.clickButton("OK"); + util.waitForNonIgnoredJobs(); + } + private static boolean deleteDirectory(File path) { + if( path.exists() ) { + File[] files = path.listFiles(); + for(int i=0; i<files.length; i++) { + if(files[i].isDirectory()) { + deleteDirectory(files[i]); + } + else { + files[i].delete(); + } + } + } + return( path.delete() ); + } + @After public void teardown(){ servers.removeAllProjectsFromServer("AS-7.0"); @@ -45,6 +101,11 @@ } @Test + public void dummyTest(){ + + } + + @Test public void createProjectsSectionTest(){ //waitForAWhile(); // SWTFormsBotExt formsBot = SWTBotFactory.getFormsBot(); @@ -118,11 +179,11 @@ projectExampleShell.close(); //check the rest of project examples - checkExample(null, IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT, true); - checkExample(null, IDELabel.JBossCentralEditor.JAVA_EE_PROJECT, true); - checkExample(null, IDELabel.JBossCentralEditor.HTML5_PROJECT, true); - checkExample(null, IDELabel.JBossCentralEditor.RICHFACES_PROJECT, true); - checkExample(null, IDELabel.JBossCentralEditor.SPRING_MVC_PROJECT, false); + checkExample(null, IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT, false); +// checkExample(null, IDELabel.JBossCentralEditor.JAVA_EE_PROJECT, true); +// checkExample(null, IDELabel.JBossCentralEditor.HTML5_PROJECT, true); +// checkExample(null, IDELabel.JBossCentralEditor.RICHFACES_PROJECT, true); +// checkExample(null, IDELabel.JBossCentralEditor.SPRING_MVC_PROJECT, false); /*checkCreateProject(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT); checkCreateProject(IDELabel.JBossCentralEditor.JAVA_EE_PROJECT); @@ -137,7 +198,7 @@ projectExplorer.deleteAllProjects(); } - @Test +// @Test public void projectExamplesSectionTest(){ SWTBotTwistie twistieBot = bot.twistieByLabel("JBoss Quickstarts"); while (!twistieBot.isExpanded()){ @@ -159,8 +220,6 @@ /** * Tries to deploy all projects */ - - //@Test public void canBeDeployedTest(){ servers.show(); String serverName = bot.tree().getAllItems()[0].getText().substring(0, bot.tree().getAllItems()[0].getText().indexOf(' ')); @@ -228,7 +287,16 @@ bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE); SWTBotWizard wizard = new SWTBotWizard(bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).widget); wizard.next(); - if (wizard.canNext()) wizard.next(); + if (wizard.canNext()){ + bot.comboBox(2).setSelection(1); + try{ + bot.link(); + fail("There is something wrong with maven repo. Message: \n"+bot.link().getText()); + }catch (WidgetNotFoundException ex){ + //everything fine + } + wizard.next(); + } wizard.finishWithWait(); String readmeText = bot.checkBox(1).getText(); assertFalse("Quick fix should not be enabled (Everything should be fine)", bot.checkBox(0).isEnabled());

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41212 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards.

by jbosstools-commits＠lists.jboss.org

Author: rhopp Date: 2012-05-21 10:26:31 -0400 (Mon, 21 May 2012) New Revision: 41212 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java Log: Extending waiting time because of failing Central tests (importing examples take too much time to download all the maven dependencies) Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java 2012-05-21 13:27:44 UTC (rev 41211) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java 2012-05-21 14:26:31 UTC (rev 41212) @@ -65,7 +65,7 @@ SWTBotShell activeShell = getActiveShell(); finish(); log.info("Waiting until active shell is active"); - bot().waitWhile(new ShellIsActiveCondition(activeShell), TaskDuration.LONG.getTimeout()); + bot().waitWhile(new ShellIsActiveCondition(activeShell), TaskDuration.VERY_LONG.getTimeout()); log.info("Waiting until Progress Information Shell is active"); bot().waitWhile(new ProgressInformationShellIsActiveCondition(), TaskDuration.LONG.getTimeout()); log.info("Waiting until Non System Jobs run started");

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41211 - trunk/download.jboss.org/jbosstools/updates/m2e-extensions/discovery.

by jbosstools-commits＠lists.jboss.org

Author: fbricon Date: 2012-05-21 09:27:44 -0400 (Mon, 21 May 2012) New Revision: 41211 Modified: trunk/download.jboss.org/jbosstools/updates/m2e-extensions/discovery/org.... trunk/download.jboss.org/jbosstools/updates/m2e-extensions/discovery/org.... Log: Adding m2e-jdt-compiler to custom m2e discovery catalog Modified: trunk/download.jboss.org/jbosstools/updates/m2e-extensions/discovery/org.... =================================================================== (Binary files differ) Modified: trunk/download.jboss.org/jbosstools/updates/m2e-extensions/discovery/org.... =================================================================== (Binary files differ)

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41210 - in trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test: seam/seam23 and 10 other directories.

by jbosstools-commits＠lists.jboss.org

Author: ljelinko Date: 2012-05-21 09:11:13 -0400 (Mon, 21 May 2012) New Revision: 41210 Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam22/DetectSeam22.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam23/DetectSeam23.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/DetectEAP4.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/DetectEAP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/DetectEAP6.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/DetectEPP4.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/DetectEPP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/DetectEWP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/DetectJBoss7.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/DetectSOAP5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/DetectSOAPStandalone5.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java Log: Renamed method in DetectRuntimeTemplate Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam22/DetectSeam22.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam22/DetectSeam22.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam22/DetectSeam22.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -11,17 +11,17 @@ public static final String VERSION = "2.2.2.Final"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SEAM_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime server = new Runtime(); - server.setName(getRuntimeID()); + server.setName(getServerRuntimeID()); server.setType("SEAM"); server.setVersion(VERSION); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam23/DetectSeam23.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam23/DetectSeam23.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/seam/seam23/DetectSeam23.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -11,17 +11,17 @@ public static final String VERSION = "2.3.0.Beta1"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SEAM_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime server = new Runtime(); - server.setName(getRuntimeID()); + server.setName(getServerRuntimeID()); server.setType("SEAM"); server.setVersion(VERSION); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/DetectEAP4.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/DetectEAP4.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/DetectEAP4.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,17 +9,17 @@ public static final String SERVER_ID = "jboss-eap-4.3"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime server = new Runtime(); - server.setName(getRuntimeID()); + server.setName(getServerRuntimeID()); server.setType("EAP"); server.setVersion("4.3"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/DetectEAP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/DetectEAP5.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/DetectEAP5.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,17 +9,17 @@ public static final String SERVER_ID = "jboss-eap-5.1"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime server = new Runtime(); - server.setName(getRuntimeID()); + server.setName(getServerRuntimeID()); server.setType("EAP"); server.setVersion("5.1"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/DetectEAP6.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/DetectEAP6.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap6/DetectEAP6.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,17 +9,17 @@ public static final String SERVER_ID = "jboss-eap-6.0"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime server = new Runtime(); - server.setName(getRuntimeID()); + server.setName(getServerRuntimeID()); server.setType("EAP"); server.setVersion("6.0"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/DetectEPP4.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/DetectEPP4.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/DetectEPP4.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,17 +9,17 @@ public static final String SERVER_ID = "jboss-epp-4.3"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime server = new Runtime(); - server.setName(getRuntimeID()); + server.setName(getServerRuntimeID()); server.setType("EPP"); server.setVersion("4.3"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/DetectEPP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/DetectEPP5.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/DetectEPP5.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,17 +9,17 @@ public static final String SERVER_ID = "jboss-epp-5.2"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime server = new Runtime(); - server.setName(getRuntimeID()); + server.setName(getServerRuntimeID()); server.setType("EPP"); server.setVersion("5.2"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/DetectEWP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/DetectEWP5.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/DetectEWP5.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,17 +9,17 @@ public static final String SERVER_ID = "jboss-ewp-5.1"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime server = new Runtime(); - server.setName(getRuntimeID()); + server.setName(getServerRuntimeID()); server.setType("EWP"); server.setVersion("5.1"); - server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); return server; } } Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/DetectJBoss7.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/DetectJBoss7.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/jboss7/DetectJBoss7.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,12 +9,12 @@ public static final String SERVER_ID = "jboss-as-7.1.1.Final"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime expectedServer = new Runtime(); expectedServer.setName(SERVER_ID); expectedServer.setVersion("7.1"); Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/DetectSOAP5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/DetectSOAP5.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/DetectSOAP5.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,12 +9,12 @@ public static final String SERVER_ID = "jboss-soa-p-5"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime expectedServer = new Runtime(); expectedServer.setName(SERVER_ID); expectedServer.setVersion("5.2"); Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/DetectSOAPStandalone5.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/DetectSOAPStandalone5.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/standalone/DetectSOAPStandalone5.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -9,12 +9,12 @@ public static final String SERVER_ID = "jboss-soa-p-standalone-5"; @Override - protected String getRuntimeID() { + protected String getServerRuntimeID() { return SERVER_ID; } @Override - protected Runtime getExpectedRuntime() { + protected Runtime getExpectedServerRuntime() { Runtime expectedServer = new Runtime(); expectedServer.setName(SERVER_ID); expectedServer.setVersion("5.2"); Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java 2012-05-21 12:57:12 UTC (rev 41209) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/template/DetectRuntimeTemplate.java 2012-05-21 13:11:13 UTC (rev 41210) @@ -25,25 +25,25 @@ private SearchingForRuntimesDialog searchingForRuntimesDialog; - protected abstract String getRuntimeID(); + protected abstract String getServerRuntimeID(); - protected abstract Runtime getExpectedRuntime(); + protected abstract Runtime getExpectedServerRuntime(); @Test public void detectRuntime(){ preferences = new RuntimeDetectionPreferencesDialog(); preferences.open(); - preferences.addPath(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + preferences.addPath(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); searchingForRuntimesDialog = preferences.search(); assertThat(searchingForRuntimesDialog.getRuntimes().size(), is(1)); - assertThat(searchingForRuntimesDialog.getRuntimes().get(0), new RuntimeMatcher(getExpectedRuntime())); + assertThat(searchingForRuntimesDialog.getRuntimes().get(0), new RuntimeMatcher(getExpectedServerRuntime())); } @After public void closePreferences(){ searchingForRuntimesDialog.ok(); - preferences.removePath(RuntimeProperties.getInstance().getRuntimePath(getRuntimeID())); + preferences.removePath(RuntimeProperties.getInstance().getRuntimePath(getServerRuntimeID())); preferences.ok(); } }

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41209 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test.

by jbosstools-commits＠lists.jboss.org

Author: ldimaggio Date: 2012-05-21 08:57:12 -0400 (Mon, 21 May 2012) New Revision: 41209 Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml Log: Added: <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> To avoid timeouts atthe 30-40 min mark. Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2012-05-21 12:46:36 UTC (rev 41208) +++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/pom.xml 2012-05-21 12:57:12 UTC (rev 41209) @@ -29,6 +29,7 @@ <skip>${swtbot.test.skip}</skip> <testSuite>org.jboss.tools.esb.ui.bot.test</testSuite> <testClass>org.jboss.tools.esb.ui.bot.tests.ESBAllBotTests</testClass> + <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> </configuration> </plugin> </plugins>

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41208 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2012-05-21 08:46:36 -0400 (Mon, 21 May 2012) New Revision: 41208 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/Logger.java Log: removed unneeded 2nd class header Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/Logger.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/Logger.java 2012-05-21 12:24:20 UTC (rev 41207) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/Logger.java 2012-05-21 12:46:36 UTC (rev 41208) @@ -5,8 +5,8 @@ * Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Xavier Coulon - Initial API and implementation + * Contributors: + * Red Hat Incorporated - initial API and implementation ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.utils; @@ -19,19 +19,10 @@ import org.eclipse.core.runtime.Status; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -/******************************************************************************* - * Copyright (c) 2008 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xavier Coulon - Initial API and implementation - ******************************************************************************/ - /** * A logger wrapper utility for classes in the current bundle only. + * + * @author Xavier Coulon */ public final class Logger {

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41207 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2012-05-21 08:24:20 -0400 (Mon, 21 May 2012) New Revision: 41207 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java Log: added javadoc header Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java 2012-05-21 12:15:52 UTC (rev 41206) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java 2012-05-21 12:24:20 UTC (rev 41207) @@ -1,6 +1,13 @@ -/** - * - */ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.wizard; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41206 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui: action and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2012-05-21 08:15:52 -0400 (Mon, 21 May 2012) New Revision: 41206 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftImages.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenInWebBrowserAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshElementAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java Log: replaced image creation by image descriptor repo Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftImages.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftImages.java 2012-05-21 12:15:10 UTC (rev 41205) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftImages.java 2012-05-21 12:15:52 UTC (rev 41206) @@ -14,15 +14,34 @@ import org.eclipse.swt.graphics.Image; import org.jboss.tools.openshift.express.internal.ui.utils.ImageRepository; +/** + * @author Andre Dietisheim + */ public class OpenShiftImages { private static final String ICONS_FOLDER = "icons/"; - private static final ImageRepository repo = - new ImageRepository(ICONS_FOLDER, OpenShiftUIActivator.getDefault(), OpenShiftUIActivator.getDefault().getImageRegistry()); + private static final ImageRepository repo = + new ImageRepository(ICONS_FOLDER, OpenShiftUIActivator.getDefault(), OpenShiftUIActivator.getDefault() + .getImageRegistry()); public static final ImageDescriptor OPENSHIFT_LOGO_DARK = repo.create("openshift-logo-dark.png"); //$NON-NLS-1$ public static final ImageDescriptor OPENSHIFT_LOGO_WHITE = repo.create("openshift-logo-white.png"); //$NON-NLS-1$ public static final ImageDescriptor OPENSHIFT_LOGO_WHITE_MEDIUM = repo.create("openshift-logo-white-medium.png"); //$NON-NLS-1$ public static final Image OPENSHIFT_LOGO_WHITE_MEDIUM_IMG = repo.getImage("openshift-logo-white-medium.png"); //$NON-NLS-1$ + + public static final ImageDescriptor OPEN_BROWSER = repo.create("open-browser.gif"); + public static final ImageDescriptor REFRESH = repo.create("refresh.gif"); + public static final ImageDescriptor GO_INTO = repo.create("go-into.gif"); + public static final ImageDescriptor TASK_REPO_NEW = repo.create("task-repository-new.gif"); + public static final ImageDescriptor EDIT = repo.create("edit.gif"); + public static final ImageDescriptor QUERY_NEW = repo.create("query-new.gif"); + public static final ImageDescriptor REPO_MIDDLE = repo.create("repository-middle.gif"); + public static final Image REPO_MIDDLE_IMG = repo.getImage("repository-middle.gif"); + public static final ImageDescriptor QUERY = repo.create("query.gif"); + public static final Image QUERY_IMG = repo.getImage("query.gif"); + public static final ImageDescriptor TASK_REPO = repo.create("task-repository.gif"); + public static final Image TASK_REPO_IMG = repo.getImage("task-repository.gif"); + public static final ImageDescriptor SYSTEM_PROCESS = repo.create("systemprocess.gif"); + public static final Image SYSTEM_PROCESS_IMG = repo.getImage("systemprocess.gif"); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java 2012-05-21 12:15:10 UTC (rev 41205) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java 2012-05-21 12:15:52 UTC (rev 41206) @@ -92,30 +92,4 @@ public static IStatus createErrorStatus(String message, Throwable throwable, Object... arguments) { return createErrorStatus(NLS.bind(message, arguments), throwable); } - - - /** - * Creates an image by loading it from a file in the plugin's images - * directory. - * - * @param imagePath path to the image, relative to the /icons directory of the plugin - * @return The image object loaded from the image file - */ - public final Image createImage(final String imagePath) { - return createImageDescriptor(imagePath).createImage(); - } - - /** - * Creates an image descriptor by loading it from a file in the plugin's images - * directory. - * - * @param imagePath path to the image, relative to the /icons directory of the plugin - * @return The image object loaded from the image file - */ - public final ImageDescriptor createImageDescriptor(final String imagePath) { - IPath imageFilePath = new Path("/icons/" + imagePath); - URL imageFileUrl = FileLocator.find(this.getBundle(), imageFilePath, null); - return ImageDescriptor.createFromURL(imageFileUrl); - } - } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java 2012-05-21 12:15:10 UTC (rev 41205) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java 2012-05-21 12:15:52 UTC (rev 41206) @@ -17,9 +17,8 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.navigator.CommonViewer; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; import org.jboss.tools.openshift.express.internal.ui.wizard.NewOpenShiftExpressApplicationWizard; @@ -38,7 +37,7 @@ */ public CreateApplicationAction() { super(OpenShiftExpressUIMessages.CREATE_APPLICATION_ACTION); - setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("query-new.gif")); + setImageDescriptor(OpenShiftImages.QUERY_NEW); } /** Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java 2012-05-21 12:15:10 UTC (rev 41205) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java 2012-05-21 12:15:52 UTC (rev 41206) @@ -17,7 +17,7 @@ import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Display; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; import org.jboss.tools.openshift.express.internal.ui.wizard.EditDomainDialog; @@ -32,7 +32,7 @@ public CreateOrEditDomainAction() { super(OpenShiftExpressUIMessages.CREATE_OR_EDIT_DOMAIN_ACTION); - setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("edit.gif")); + setImageDescriptor(OpenShiftImages.EDIT); } @Override Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-05-21 12:15:10 UTC (rev 41205) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-05-21 12:15:52 UTC (rev 41206) @@ -31,6 +31,7 @@ import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; import org.jboss.tools.openshift.express.internal.core.console.UserModel; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; @@ -48,7 +49,7 @@ public CreateServerAdapterAction() { super(OpenShiftExpressUIMessages.CREATE_SERVER_ADAPTER_ACTION, true); - setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("edit.gif")); + setImageDescriptor(OpenShiftImages.EDIT); } @Override Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java 2012-05-21 12:15:10 UTC (rev 41205) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java 2012-05-21 12:15:52 UTC (rev 41206) @@ -16,7 +16,7 @@ import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; import org.jboss.tools.openshift.express.internal.core.console.UserModel; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; import org.jboss.tools.openshift.express.internal.ui.wizard.EmbedCartridgeWizard; @@ -29,7 +29,7 @@ public EditCartridgesAction() { super(OpenShiftExpressUIMessages.EDIT_CARTRIDGES_ACTION, true); - setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("task-repository-new.gif")); + setImageDescriptor(OpenShiftImages.TASK_REPO_NEW); } @Override Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java 2012-05-21 12:15:10 UTC (rev 41205) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java 2012-05-21 12:15:52 UTC (rev 41206) @@ -17,7 +17,7 @@ import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Display; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; import org.jboss.tools.openshift.express.internal.ui.wizard.ImportOpenShiftExpressApplicationWizard; import org.jboss.tools.openshift.express.internal.ui.wizard.OpenShiftExpressApplicationWizard; @@ -31,7 +31,7 @@ public ImportApplicationAction() { super(OpenShiftExpressUIMessages.IMPORT_APPLICATION_ACTION, true); - setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("go-into.gif")); + setImageDescriptor(OpenShiftImages.GO_INTO); } @Override Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenInWebBrowserAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenInWebBrowserAction.java 2012-05-21 12:15:10 UTC (rev 41205) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenInWebBrowserAction.java 2012-05-21 12:15:52 UTC (rev 41206) @@ -12,6 +12,7 @@ import org.eclipse.jface.viewers.ITreeSelection; import org.jboss.tools.common.ui.BrowserUtil; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; @@ -24,7 +25,7 @@ public OpenInWebBrowserAction() { super(OpenShiftExpressUIMessages.SHOW_IN_BROWSER_ACTION, true); - setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("open-browser.gif")); + setImageDescriptor(OpenShiftImages.OPEN_BROWSER); } /** Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshElementAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshElementAction.java 2012-05-21 12:15:10 UTC (rev 41205) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshElementAction.java 2012-05-21 12:15:52 UTC (rev 41206) @@ -19,7 +19,7 @@ import org.eclipse.jface.viewers.ITreeSelection; import org.eclipse.swt.widgets.Display; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; @@ -33,7 +33,7 @@ public RefreshElementAction() { super(OpenShiftExpressUIMessages.REFRESH_USER_ACTION, true); - setImageDescriptor(OpenShiftUIActivator.getDefault().createImageDescriptor("refresh.gif")); + setImageDescriptor(OpenShiftImages.REFRESH); } /* Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java 2012-05-21 12:15:10 UTC (rev 41205) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java 2012-05-21 12:15:52 UTC (rev 41206) @@ -18,7 +18,7 @@ import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; import org.jboss.tools.openshift.express.internal.core.console.UserDelegate; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; import org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleContentProvider.LoadingStub; import org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleContentProvider.NotConnectedUserStub; @@ -59,16 +59,16 @@ @Override public Image getImage(Object element) { if (element instanceof UserDelegate) { - return OpenShiftUIActivator.getDefault().createImage("repository-middle.gif"); + return OpenShiftImages.REPO_MIDDLE_IMG; } if (element instanceof IApplication) { - return OpenShiftUIActivator.getDefault().createImage("query.gif"); + return OpenShiftImages.QUERY_IMG; } if (element instanceof IEmbeddedCartridge) { - return OpenShiftUIActivator.getDefault().createImage("task-repository.gif"); + return OpenShiftImages.TASK_REPO_IMG; } if (element instanceof LoadingStub) { - return OpenShiftUIActivator.getDefault().createImage("systemprocess.gif"); + return OpenShiftImages.SYSTEM_PROCESS_IMG; } if (element instanceof OpenShiftException ) { return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41205 - in trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test: server/eap4 and 5 other directories.

by jbosstools-commits＠lists.jboss.org

Author: ljelinko Date: 2012-05-21 08:15:10 -0400 (Mon, 21 May 2012) New Revision: 41205 Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/CheckEAP4Seam.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/CheckEAP5Seam.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/CheckEPP4Seam.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/CheckEPP5Seam.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/CheckEWP5Seam.java trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/CheckSOAP5Seam.java Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java Log: Added check for Seam runtimes in AS folders Modified: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java 2012-05-21 11:58:14 UTC (rev 41204) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/AllTestsSuite.java 2012-05-21 12:15:10 UTC (rev 41205) @@ -4,20 +4,26 @@ import org.jboss.tools.runtime.as.ui.bot.test.seam.seam22.DetectSeam22; import org.jboss.tools.runtime.as.ui.bot.test.seam.seam23.CheckSeam23; import org.jboss.tools.runtime.as.ui.bot.test.seam.seam23.DetectSeam23; +import org.jboss.tools.runtime.as.ui.bot.test.server.eap4.CheckEAP4Seam; import org.jboss.tools.runtime.as.ui.bot.test.server.eap4.DetectEAP4; import org.jboss.tools.runtime.as.ui.bot.test.server.eap4.OperateEAP4; +import org.jboss.tools.runtime.as.ui.bot.test.server.eap5.CheckEAP5Seam; import org.jboss.tools.runtime.as.ui.bot.test.server.eap5.DetectEAP5; import org.jboss.tools.runtime.as.ui.bot.test.server.eap5.OperateEAP5; import org.jboss.tools.runtime.as.ui.bot.test.server.eap6.DetectEAP6; import org.jboss.tools.runtime.as.ui.bot.test.server.eap6.OperateEAP6; +import org.jboss.tools.runtime.as.ui.bot.test.server.epp4.CheckEPP4Seam; import org.jboss.tools.runtime.as.ui.bot.test.server.epp4.DetectEPP4; import org.jboss.tools.runtime.as.ui.bot.test.server.epp4.OperateEPP4; +import org.jboss.tools.runtime.as.ui.bot.test.server.epp5.CheckEPP5Seam; import org.jboss.tools.runtime.as.ui.bot.test.server.epp5.DetectEPP5; import org.jboss.tools.runtime.as.ui.bot.test.server.epp5.OperateEPP5; +import org.jboss.tools.runtime.as.ui.bot.test.server.ewp5.CheckEWP5Seam; import org.jboss.tools.runtime.as.ui.bot.test.server.ewp5.DetectEWP5; import org.jboss.tools.runtime.as.ui.bot.test.server.ewp5.OperateEWP5; import org.jboss.tools.runtime.as.ui.bot.test.server.jboss7.DetectJBoss7; import org.jboss.tools.runtime.as.ui.bot.test.server.jboss7.OperateJBoss7; +import org.jboss.tools.runtime.as.ui.bot.test.server.soap5.CheckSOAP5Seam; import org.jboss.tools.runtime.as.ui.bot.test.server.soap5.DetectSOAP5; import org.jboss.tools.runtime.as.ui.bot.test.server.soap5.OperateSOAP5; import org.jboss.tools.runtime.as.ui.bot.test.server.soap5.standalone.DetectSOAPStandalone5; @@ -33,16 +39,22 @@ DetectEAP6.class, OperateEAP6.class, DetectEAP5.class, + CheckEAP5Seam.class, OperateEAP5.class, DetectEAP4.class, + CheckEAP4Seam.class, OperateEAP4.class, DetectEPP4.class, + CheckEPP4Seam.class, OperateEPP4.class, DetectEPP5.class, + CheckEPP5Seam.class, OperateEPP5.class, DetectEWP5.class, + CheckEWP5Seam.class, OperateEWP5.class, DetectSOAP5.class, + CheckSOAP5Seam.class, OperateSOAP5.class, DetectSOAPStandalone5.class, OperateSOAPStandalone5.class, Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/CheckEAP4Seam.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/CheckEAP4Seam.java (rev 0) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap4/CheckEAP4Seam.java 2012-05-21 12:15:10 UTC (rev 41205) @@ -0,0 +1,17 @@ +package org.jboss.tools.runtime.as.ui.bot.test.server.eap4; + +import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.CheckSeamRuntimeTemplate; + +public class CheckEAP4Seam extends CheckSeamRuntimeTemplate { + + @Override + protected Runtime getExpectedRuntime() { + Runtime server = new Runtime(); + server.setName("Seam seam2 2.0"); + server.setVersion("2.0"); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(DetectEAP4.SERVER_ID) + "/seam2"); + return server; + } +} Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/CheckEAP5Seam.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/CheckEAP5Seam.java (rev 0) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/eap5/CheckEAP5Seam.java 2012-05-21 12:15:10 UTC (rev 41205) @@ -0,0 +1,17 @@ +package org.jboss.tools.runtime.as.ui.bot.test.server.eap5; + +import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.CheckSeamRuntimeTemplate; + +public class CheckEAP5Seam extends CheckSeamRuntimeTemplate { + + @Override + protected Runtime getExpectedRuntime() { + Runtime server = new Runtime(); + server.setName("Seam seam 2.2"); + server.setVersion("2.2"); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(DetectEAP5.SERVER_ID) + "/seam"); + return server; + } +} Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/CheckEPP4Seam.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/CheckEPP4Seam.java (rev 0) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp4/CheckEPP4Seam.java 2012-05-21 12:15:10 UTC (rev 41205) @@ -0,0 +1,17 @@ +package org.jboss.tools.runtime.as.ui.bot.test.server.epp4; + +import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.CheckSeamRuntimeTemplate; + +public class CheckEPP4Seam extends CheckSeamRuntimeTemplate { + + @Override + protected Runtime getExpectedRuntime() { + Runtime server = new Runtime(); + server.setName("Seam seam2 2.0"); + server.setVersion("2.0"); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(DetectEPP4.SERVER_ID) + "/seam2"); + return server; + } +} Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/CheckEPP5Seam.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/CheckEPP5Seam.java (rev 0) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/epp5/CheckEPP5Seam.java 2012-05-21 12:15:10 UTC (rev 41205) @@ -0,0 +1,17 @@ +package org.jboss.tools.runtime.as.ui.bot.test.server.epp5; + +import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.CheckSeamRuntimeTemplate; + +public class CheckEPP5Seam extends CheckSeamRuntimeTemplate { + + @Override + protected Runtime getExpectedRuntime() { + Runtime server = new Runtime(); + server.setName("Seam seam 2.2"); + server.setVersion("2.2"); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(DetectEPP5.SERVER_ID) + "/seam"); + return server; + } +} Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/CheckEWP5Seam.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/CheckEWP5Seam.java (rev 0) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/ewp5/CheckEWP5Seam.java 2012-05-21 12:15:10 UTC (rev 41205) @@ -0,0 +1,17 @@ +package org.jboss.tools.runtime.as.ui.bot.test.server.ewp5; + +import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.CheckSeamRuntimeTemplate; + +public class CheckEWP5Seam extends CheckSeamRuntimeTemplate { + + @Override + protected Runtime getExpectedRuntime() { + Runtime server = new Runtime(); + server.setName("Seam seam 2.2"); + server.setVersion("2.2"); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(DetectEWP5.SERVER_ID) + "/seam"); + return server; + } +} Added: trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/CheckSOAP5Seam.java =================================================================== --- trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/CheckSOAP5Seam.java (rev 0) +++ trunk/runtime/tests/org.jboss.tools.runtime.as.ui.bot.test/src/org/jboss/tools/runtime/as/ui/bot/test/server/soap5/CheckSOAP5Seam.java 2012-05-21 12:15:10 UTC (rev 41205) @@ -0,0 +1,17 @@ +package org.jboss.tools.runtime.as.ui.bot.test.server.soap5; + +import org.jboss.tools.runtime.as.ui.bot.test.RuntimeProperties; +import org.jboss.tools.runtime.as.ui.bot.test.entity.Runtime; +import org.jboss.tools.runtime.as.ui.bot.test.template.CheckSeamRuntimeTemplate; + +public class CheckSOAP5Seam extends CheckSeamRuntimeTemplate { + + @Override + protected Runtime getExpectedRuntime() { + Runtime server = new Runtime(); + server.setName("Seam seam 2.2"); + server.setVersion("2.2"); + server.setLocation(RuntimeProperties.getInstance().getRuntimePath(DetectSOAP5.SERVER_ID) + "/seam"); + return server; + } +}

12 years, 7 months

1
0
0 / 0

JBoss Tools SVN: r41204 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2012-05-21 07:58:14 -0400 (Mon, 21 May 2012) New Revision: 41204 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ImageRepository.java Log: added author Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ImageRepository.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ImageRepository.java 2012-05-21 11:45:55 UTC (rev 41203) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ImageRepository.java 2012-05-21 11:58:14 UTC (rev 41204) @@ -22,6 +22,9 @@ import org.eclipse.swt.graphics.Image; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +/** + * @author Andre Dietisheim + */ public class ImageRepository { private ImageRegistry imageRegistry;

12 years, 7 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits May 2012