JBoss Tools SVN: r40447 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-04-24 07:25:34 -0400 (Tue, 24 Apr 2012)
New Revision: 40447
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ImportHelper.java
Log:
Condition added into ImportHelper and default timeout increased for project import
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ImportHelper.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ImportHelper.java 2012-04-24 09:49:21 UTC (rev 40446)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ImportHelper.java 2012-04-24 11:25:34 UTC (rev 40447)
@@ -1,6 +1,7 @@
package org.jboss.tools.ui.bot.ext.helper;
import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellCloses;
+import static org.eclipse.swtbot.swt.finder.waits.Conditions.widgetIsEnabled;
import static org.junit.Assert.fail;
import java.io.File;
@@ -36,6 +37,7 @@
dlgBot.radio(0).click();
dlgBot.button("Select All").click();
SWTBotShell s = dlgBot.activeShell();
+ bot.waitUntil(widgetIsEnabled(dlgBot.button(IDELabel.Button.FINISH)),timeout);
dlgBot.button(IDELabel.Button.FINISH).click();
bot.waitUntil(shellCloses(s),timeout);
}
13 years, 8 months
JBoss Tools SVN: r40446 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-04-24 05:49:21 -0400 (Tue, 24 Apr 2012)
New Revision: 40446
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java
Log:
JBIDE-11593 - null protections
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java 2012-04-24 09:42:39 UTC (rev 40445)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java 2012-04-24 09:49:21 UTC (rev 40446)
@@ -209,25 +209,23 @@
* include and exclude patterns in the virtual component metadata?
*
* Return the includes / excludes pattern if yes.
- * If no, return null
+ * If no, return a two-length array of null objects
*
* @param module
* @return
*/
private static String[] getProjectIncludesExcludes(IModule module) {
IProject p = module.getProject();
- if( p == null )
- return new String[]{null, null};
-
- IVirtualComponent vc = ComponentCore.createComponent(p);
- Properties props = vc.getMetaProperties();
- String exclusionPatterns = getPatternValue(props, COMPONENT_EXCLUSIONS_PATTERN);
- String inclusionPatterns = getPatternValue(props, COMPONENT_INCLUSIONS_PATTERN);
-
- return new String[]{
- inclusionPatterns,
- exclusionPatterns
- };
+ if( p != null ) {
+ IVirtualComponent vc = ComponentCore.createComponent(p);
+ if( vc != null ) {
+ Properties props = vc.getMetaProperties();
+ String exclusionPatterns = getPatternValue(props, COMPONENT_EXCLUSIONS_PATTERN);
+ String inclusionPatterns = getPatternValue(props, COMPONENT_INCLUSIONS_PATTERN);
+ return new String[]{ inclusionPatterns, exclusionPatterns };
+ }
+ }
+ return new String[]{null, null};
}
/**
13 years, 8 months
JBoss Tools SVN: r40445 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-04-24 05:42:39 -0400 (Tue, 24 Apr 2012)
New Revision: 40445
Modified:
trunk/build/aggregate/site/site.xml
Log:
JBIDE-11533
Aggregated missing features.
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2012-04-24 09:41:46 UTC (rev 40444)
+++ trunk/build/aggregate/site/site.xml 2012-04-24 09:42:39 UTC (rev 40445)
@@ -345,6 +345,18 @@
</feature>
<feature url="features/org.jboss.tools.maven.profiles.feature.source_0.0.0.jar" id="org.jboss.tools.maven.profiles.feature.source" version="0.0.0">
<category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.runtime.core.featur.source_0.0.0.jar" id="org.jboss.tools.runtime.core.feature.source" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.runtime.as.detector.feature.source_0.0.0.jar" id="org.jboss.tools.runtime.as.detector.feature.source" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.runtime.seam.detector.feature.source_0.0.0.jar" id="org.jboss.tools.runtime.seam.detector.feature.source" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.usage.feature.source_0.0.0.jar" id="org.jboss.tools.usage.feature.source" version="0.0.0">
+ <category name="AllSources" />
</feature>
<!-- only in JBT and JBDS Extras -->
<feature url="features/org.jboss.tools.maven.jbosspackaging.feature.source_0.0.0.jar" id="org.jboss.tools.maven.jbosspackaging.feature.source" version="0.0.0">
@@ -363,6 +375,22 @@
<feature url="features/org.jboss.tools.common.jdt.feature.source_0.0.0.jar" id="org.jboss.tools.common.jdt.feature.source" version="0.0.0">
<category name="AllSources" />
</feature>
+ <feature url="features/org.jboss.tools.common.feature.source_0.0.0.jar" id="org.jboss.tools.common.feature.source" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <!-- Not categorize -->
+ <feature url="features/org.jboss.tools.common.core.feature.source_0.0.0.jar" id="org.jboss.tools.common.core.feature.source" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.common.text.ext.feature.source_0.0.0.jar" id="org.jboss.tools.common.text.ext.feature.source" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.common.ui.feature.source_0.0.0.jar" id="org.jboss.tools.common.ui.feature.source" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.common.verification.feature.source_0.0.0.jar" id="org.jboss.tools.common.verification.feature.source" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
<!-- ########## -->
<!-- CATEGORIES -->
13 years, 8 months
JBoss Tools SVN: r40444 - in trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test: console and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-04-24 05:41:46 -0400 (Tue, 24 Apr 2012)
New Revision: 40444
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/CreateConfigurationFileTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/criteria/CriteriaEditorTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/diagram/MappingDiagramTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/hql/HQLEditorTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/CreateJPAEntityTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/CreateJPAProjectTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/validation/AnnotationValidationTest.java
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/view/PackageInfoTest.java
Log:
Tests @require section fixed in hb ui bot test
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/CreateConfigurationFileTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/CreateConfigurationFileTest.java 2012-04-24 09:39:33 UTC (rev 40443)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/configuration/CreateConfigurationFileTest.java 2012-04-24 09:41:46 UTC (rev 40444)
@@ -11,7 +11,7 @@
* @author jpeterka
*
*/
-@Require
+@Require(clearProjects = true)
public class CreateConfigurationFileTest extends HibernateBaseTest {
@Test
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java 2012-04-24 09:39:33 UTC (rev 40443)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/CreateConsoleConfigurationTest.java 2012-04-24 09:41:46 UTC (rev 40444)
@@ -35,6 +35,7 @@
importTestProject("/resources/prj/" + prjName);
createConfigurationFile();
createHibernateConsole();
+ expandDatabaseInConsole();
checkErrorLog();
}
@@ -57,9 +58,7 @@
bot.button(IDELabel.Button.FINISH).click();
bot.waitUntil(shellCloses(shell));
- util.waitForNonIgnoredJobs();
-
- expandDatabaseInConsole();
+ util.waitForNonIgnoredJobs();
}
private void createMainTab(SWTBotShell shell) {
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/criteria/CriteriaEditorTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/criteria/CriteriaEditorTest.java 2012-04-24 09:39:33 UTC (rev 40443)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/criteria/CriteriaEditorTest.java 2012-04-24 09:41:46 UTC (rev 40444)
@@ -8,12 +8,15 @@
import org.jboss.tools.hb.ui.bot.common.ConfigurationFile;
import org.jboss.tools.hb.ui.bot.common.ConsoleConfiguration;
import org.jboss.tools.hb.ui.bot.test.HibernateBaseTest;
+import org.jboss.tools.ui.bot.ext.config.Annotations.DB;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.junit.Test;
/*
* Criteria editor hb ui bot test
*/
+@Require(db = @DB, clearProjects = true)
public class CriteriaEditorTest extends HibernateBaseTest {
final String console = "pre-hibernate40";
final String clazz = "Customers";
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/diagram/MappingDiagramTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/diagram/MappingDiagramTest.java 2012-04-24 09:39:33 UTC (rev 40443)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/diagram/MappingDiagramTest.java 2012-04-24 09:41:46 UTC (rev 40444)
@@ -14,7 +14,7 @@
* @author jpeterka
*
*/
-@Require(clearProjects = false, perspective = "Hibernate")
+@Require(clearProjects = true, perspective = "Hibernate")
public class MappingDiagramTest extends HibernateBaseTest {
final String hc = "hibernate35";
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/hql/HQLEditorTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/hql/HQLEditorTest.java 2012-04-24 09:39:33 UTC (rev 40443)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/hql/HQLEditorTest.java 2012-04-24 09:41:46 UTC (rev 40444)
@@ -8,9 +8,12 @@
import org.jboss.tools.hb.ui.bot.common.ConfigurationFile;
import org.jboss.tools.hb.ui.bot.common.ConsoleConfiguration;
import org.jboss.tools.hb.ui.bot.test.HibernateBaseTest;
+import org.jboss.tools.ui.bot.ext.config.Annotations.DB;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.junit.Test;
+@Require(db = @DB, clearProjects = true)
public class HQLEditorTest extends HibernateBaseTest {
final String console = "pre-hibernate40";
final String clazz = "Customer";
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/CreateJPAEntityTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/CreateJPAEntityTest.java 2012-04-24 09:39:33 UTC (rev 40443)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/CreateJPAEntityTest.java 2012-04-24 09:41:46 UTC (rev 40444)
@@ -6,6 +6,8 @@
import org.jboss.tools.hb.ui.bot.common.JPAEntity;
import org.jboss.tools.hb.ui.bot.common.Tree;
import org.jboss.tools.hb.ui.bot.test.HibernateBaseTest;
+import org.jboss.tools.ui.bot.ext.config.Annotations.DB;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.helper.StringHelper;
import org.junit.Test;
@@ -13,6 +15,7 @@
/**
* Create JPA Entity ui bot test
*/
+@Require(db = @DB, clearProjects = true)
public class CreateJPAEntityTest extends HibernateBaseTest {
final String prj = "jpatest35";
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/CreateJPAProjectTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/CreateJPAProjectTest.java 2012-04-24 09:39:33 UTC (rev 40443)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/jpa/CreateJPAProjectTest.java 2012-04-24 09:41:46 UTC (rev 40444)
@@ -13,7 +13,7 @@
* @author jpeterka
*
*/
-@Require(clearProjects = false, perspective="JPA")
+@Require(clearProjects = true, perspective="JPA")
public class CreateJPAProjectTest extends HibernateBaseTest {
final String prj = "jpa35test";
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/validation/AnnotationValidationTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/validation/AnnotationValidationTest.java 2012-04-24 09:39:33 UTC (rev 40443)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/validation/AnnotationValidationTest.java 2012-04-24 09:41:46 UTC (rev 40444)
@@ -16,7 +16,7 @@
* @author jpeterka
*
*/
-@Require(clearProjects = false, perspective = "JPA")
+@Require(clearProjects = true, perspective = "JPA")
public class AnnotationValidationTest extends HibernateBaseTest {
final String prj = "jpatest40";
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/view/PackageInfoTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/view/PackageInfoTest.java 2012-04-24 09:39:33 UTC (rev 40443)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/view/PackageInfoTest.java 2012-04-24 09:41:46 UTC (rev 40444)
@@ -9,11 +9,13 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
import org.jboss.tools.hb.ui.bot.common.ProjectExplorer;
import org.jboss.tools.hb.ui.bot.test.HibernateBaseTest;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.helper.StringHelper;
import org.jboss.tools.ui.bot.ext.parts.SWTBotTwistie;
import org.junit.Test;
+@Require(clearProjects = true, perspective = "JPA")
public class PackageInfoTest extends HibernateBaseTest {
final String prj = "jpatest40";
final String pkg = "org.packageinfo";
13 years, 8 months
JBoss Tools SVN: r40443 - trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-04-24 05:39:33 -0400 (Tue, 24 Apr 2012)
New Revision: 40443
Removed:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/EditConsoleConfigurationTest.java
Log:
EditConsoleConfigurationTest class removed from hb ui bot test
Deleted: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/EditConsoleConfigurationTest.java
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/EditConsoleConfigurationTest.java 2012-04-24 08:56:22 UTC (rev 40442)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hb/ui/bot/test/console/EditConsoleConfigurationTest.java 2012-04-24 09:39:33 UTC (rev 40443)
@@ -1,9 +0,0 @@
-package org.jboss.tools.hb.ui.bot.test.console;
-
-import org.jboss.tools.hb.ui.bot.test.HibernateBaseTest;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-
-@Require(clearProjects = true)
-public class EditConsoleConfigurationTest extends HibernateBaseTest {
-
-}
13 years, 8 months
JBoss Tools SVN: r40442 - trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-24 04:56:22 -0400 (Tue, 24 Apr 2012)
New Revision: 40442
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java
Log:
fixing importing test project
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java 2012-04-24 08:55:58 UTC (rev 40441)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java 2012-04-24 08:56:22 UTC (rev 40442)
@@ -50,23 +50,32 @@
@Override
public void prepareWorkspace() {
if (!projectHelper.projectExists(getProjectName())) {
- importSeam3TestProject("/resources/projects/" +
+ importSeam3TestProject(getProjectName(), "/resources/projects/" +
getProjectName(), getProjectName());
}
}
- protected void importSeam3TestProject(String projectLocation, String dir) {
+ protected void importSeam3TestProject(String projectName,
+ String projectLocation, String dir) {
ImportHelper.importProject(projectLocation, dir, Activator.PLUGIN_ID);
+
+ /** configure JDK and required runtime */
+ projectHelper.addDefaultJDKIntoProject(projectName);
+ projectHelper.addConfiguredRuntimeIntoProject(projectName,
+ configuredState.getServer().name);
}
- protected void addAndCheckLibraryInProject(String projectName, SeamLibraries library) {
+ protected void addAndCheckLibraryInProject(String projectName,
+ SeamLibraries library) {
addLibraryIntoProject(projectName, library.getName());
checkLibraryInProject(projectName, library.getName());
}
- protected void importSeam3ProjectWithLibrary(String projectName, SeamLibraries library) {
- importSeam3TestProject("/resources/projects/" + projectName, projectName);
+ protected void importSeam3ProjectWithLibrary(String projectName,
+ SeamLibraries library) {
+ importSeam3TestProject(projectName,
+ "/resources/projects/" + projectName, projectName);
addAndCheckLibraryInProject(projectName, library);
eclipse.cleanAllProjects();
}
13 years, 8 months
JBoss Tools SVN: r40441 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: decorator and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-24 04:55:58 -0400 (Tue, 24 Apr 2012)
New Revision: 40441
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QuickFixProposalsDescriptionTest.java
Log:
fixing importing test project
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2012-04-24 08:35:56 UTC (rev 40440)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2012-04-24 08:55:58 UTC (rev 40441)
@@ -80,11 +80,14 @@
return packageName;
}
- protected void importCDITestProject(String projectLocation, String dir) {
+ protected void importCDITestProject(String projectName,
+ String projectLocation, String dir) {
+
ImportHelper.importProject(projectLocation, dir, PluginActivator.PLUGIN_ID);
+
/** configure JDK and required runtime */
- projectHelper.addDefaultJDKIntoProject(getProjectName());
- projectHelper.addConfiguredRuntimeIntoProject(getProjectName(),
+ projectHelper.addDefaultJDKIntoProject(projectName);
+ projectHelper.addConfiguredRuntimeIntoProject(projectName,
configuredState.getServer().name);
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java 2012-04-24 08:35:56 UTC (rev 40440)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java 2012-04-24 08:55:58 UTC (rev 40441)
@@ -48,7 +48,8 @@
@Before
public void prepareWorkspace() {
if (!projectHelper.projectExists(getProjectName())) {
- importCDITestProject("/resources/projects/" +
+ importCDITestProject(getProjectName(),
+ "/resources/projects/" +
getProjectName(), getProjectName());
eclipse.cleanAllProjects();
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java 2012-04-24 08:35:56 UTC (rev 40440)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java 2012-04-24 08:55:58 UTC (rev 40441)
@@ -29,7 +29,8 @@
@Before
public void prepareWorkspace() {
if (!projectHelper.projectExists(getProjectName())) {
- importCDITestProject("/resources/projects/" +
+ importCDITestProject(getProjectName(),
+ "/resources/projects/" +
getProjectName(), getProjectName());
eclipse.cleanAllProjects();
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java 2012-04-24 08:35:56 UTC (rev 40440)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java 2012-04-24 08:55:58 UTC (rev 40441)
@@ -29,7 +29,8 @@
@Before
public void prepareWorkspace() {
if (!projectHelper.projectExists(getProjectName())) {
- importCDITestProject("/resources/projects/" +
+ importCDITestProject(getProjectName(),
+ "/resources/projects/" +
getProjectName(), getProjectName());
eclipse.cleanAllProjects();
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QuickFixProposalsDescriptionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QuickFixProposalsDescriptionTest.java 2012-04-24 08:35:56 UTC (rev 40440)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QuickFixProposalsDescriptionTest.java 2012-04-24 08:55:58 UTC (rev 40441)
@@ -31,7 +31,8 @@
@Before
public void prepareWorkspace() {
if (!projectHelper.projectExists(getProjectName())) {
- importCDITestProject("/resources/projects/" +
+ importCDITestProject(getProjectName(),
+ "/resources/projects/" +
getProjectName(), getProjectName());
eclipse.cleanAllProjects();
}
13 years, 8 months
JBoss Tools SVN: r40440 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-24 04:35:56 -0400 (Tue, 24 Apr 2012)
New Revision: 40440
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java
Log:
importing ws project now includes configuration default runtime and jdk
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-04-24 08:35:18 UTC (rev 40439)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-04-24 08:35:56 UTC (rev 40440)
@@ -121,6 +121,10 @@
protected void importWSTestProject(String projectLocation, String dir) {
ImportHelper.importProject(projectLocation, dir, Activator.PLUGIN_ID);
+ /** configure JDK and required runtime */
+ projectHelper.addDefaultJDKIntoProject(getWsProjectName());
+ projectHelper.addConfiguredRuntimeIntoProject(getWsProjectName(),
+ configuredState.getServer().name);
}
}
13 years, 8 months
JBoss Tools SVN: r40439 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-24 04:35:18 -0400 (Tue, 24 Apr 2012)
New Revision: 40439
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java
Log:
method for configuration default runtime and jdk for project
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java 2012-04-24 08:34:11 UTC (rev 40438)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java 2012-04-24 08:35:18 UTC (rev 40439)
@@ -169,4 +169,55 @@
}
+ /**
+ * Set system default jdk in the project
+ * @param projectName
+ */
+ public void addDefaultJDKIntoProject(String projectName) {
+
+ projectExplorer.selectProject(projectName);
+ bot.menu(IDELabel.Menu.FILE).menu(
+ IDELabel.Menu.PROPERTIES).click();
+ bot.waitForShell(IDELabel.Shell.PROPERTIES_FOR + " " + projectName);
+ SWTBotShell propertiesShell = bot.shell(
+ IDELabel.Shell.PROPERTIES_FOR + " " + projectName);
+ propertiesShell.activate();
+ SWTBotTreeItem item = bot.tree().getTreeItem(
+ IDELabel.JavaBuildPathPropertiesEditor.
+ JAVA_BUILD_PATH_TREE_ITEM_LABEL);
+ item.select();
+ bot.tabItem(IDELabel.JavaBuildPathPropertiesEditor.
+ LIBRARIES_TAB_LABEL).activate();
+ SWTBotTree librariesTree = bot.treeWithLabel(
+ "JARs and class folders on the build path:");
+ /** remove jdk currently configured on project */
+ for (int i = 0; i < librariesTree.rowCount(); i++) {
+ SWTBotTreeItem libraryItem = librariesTree.
+ getAllItems()[i];
+ if (libraryItem.getText().contains("JRE") ||
+ libraryItem.getText().contains("jdk")) {
+ libraryItem.select();
+ break;
+ }
+ }
+ bot.button(IDELabel.Button.REMOVE).click();
+
+ /** add default jdk of system */
+ bot.button(IDELabel.Button.ADD_LIBRARY).click();
+ bot.waitForShell(IDELabel.Shell.ADD_LIBRARY);
+ SWTBotShell libraryShell = bot.shell(
+ IDELabel.Shell.ADD_LIBRARY);
+ libraryShell.activate();
+ bot.list().select("JRE System Library");
+ bot.button(IDELabel.Button.NEXT).click();
+ bot.radio(2).click();
+ bot.button(IDELabel.Button.FINISH).click();
+ bot.waitWhile(new ShellIsActiveCondition(libraryShell),
+ TaskDuration.LONG.getTimeout());
+ bot.button(IDELabel.Button.OK).click();
+ bot.waitWhile(new ShellIsActiveCondition(propertiesShell),
+ TaskDuration.LONG.getTimeout());
+
+ }
+
}
13 years, 8 months
JBoss Tools SVN: r40438 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-24 04:34:11 -0400 (Tue, 24 Apr 2012)
New Revision: 40438
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java
Log:
importing cdi project now includes configuration default runtime and jdk
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2012-04-24 08:33:33 UTC (rev 40437)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2012-04-24 08:34:11 UTC (rev 40438)
@@ -82,6 +82,10 @@
protected void importCDITestProject(String projectLocation, String dir) {
ImportHelper.importProject(projectLocation, dir, PluginActivator.PLUGIN_ID);
+ /** configure JDK and required runtime */
+ projectHelper.addDefaultJDKIntoProject(getProjectName());
+ projectHelper.addConfiguredRuntimeIntoProject(getProjectName(),
+ configuredState.getServer().name);
}
}
\ No newline at end of file
13 years, 8 months