JBoss Tools SVN: r43606 - trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-09-11 14:59:35 -0400 (Tue, 11 Sep 2012)
New Revision: 43606
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java
Log:
JBIDE-12578 - Runtime FrameworkEvent ERROR
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java 2012-09-11 17:34:39 UTC (rev 43605)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java 2012-09-11 18:59:35 UTC (rev 43606)
@@ -91,7 +91,6 @@
plugin = this;
this.context = context;
RuntimeCoreActivator.getDefault().setDownloader(new DownloadRuntimes());
- runtimeModel = new RuntimeModel(getPreferences());
}
/*
@@ -116,6 +115,9 @@
}
public RuntimeModel getModel() {
+ if (runtimeModel == null) {
+ runtimeModel = new RuntimeModel(getPreferences());
+ }
return runtimeModel;
}
@@ -189,7 +191,7 @@
}
public List<RuntimeDefinition> getServerDefinitions() {
- return RuntimeModelUtil.getRuntimeDefinitions(runtimeModel.getRuntimePaths());
+ return RuntimeModelUtil.getRuntimeDefinitions(getModel().getRuntimePaths());
}
public Set<IRuntimeDetector> getRuntimeDetectors() {
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java 2012-09-11 17:34:39 UTC (rev 43605)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeWorkbenchUtils.java 2012-09-11 18:59:35 UTC (rev 43606)
@@ -24,7 +24,7 @@
}
public static void refreshPreferencePage(final Shell shell) {
- Display.getCurrent().asyncExec(new Runnable() {
+ Display.getDefault().asyncExec(new Runnable() {
public void run() {
refreshPreferencePageUIThread(shell);
}
13 years, 4 months
JBoss Tools SVN: r43605 - workspace/akazakov/db/org.jboss.tools.cdi.db/src/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-09-11 13:34:39 -0400 (Tue, 11 Sep 2012)
New Revision: 43605
Modified:
workspace/akazakov/db/org.jboss.tools.cdi.db/src/META-INF/persistence.xml
Log:
https://issues.jboss.org/browse/JBIDE-12446
Modified: workspace/akazakov/db/org.jboss.tools.cdi.db/src/META-INF/persistence.xml
===================================================================
--- workspace/akazakov/db/org.jboss.tools.cdi.db/src/META-INF/persistence.xml 2012-09-11 17:34:20 UTC (rev 43604)
+++ workspace/akazakov/db/org.jboss.tools.cdi.db/src/META-INF/persistence.xml 2012-09-11 17:34:39 UTC (rev 43605)
@@ -14,7 +14,7 @@
<property name="hibernate.dialect" value="org.hibernate.dialect.DerbyDialect"/>
<!--property name="hibernate.hbm2ddl.auto" value="update"/-->
<property name="hibernate.hbm2ddl.auto" value="create"/>
- <property name="hibernate.show_sql" value="true"/>
+ <property name="hibernate.show_sql" value="false"/>
<property name="hibernate.format_sql" value="true"/>
<!--property name="jboss.entity.manager.factory.jndi.name" value="java:/orgJbossToolsCdiDbEntityManagerFactory"/-->
</properties>
13 years, 4 months
JBoss Tools SVN: r43604 - trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-09-11 13:34:20 -0400 (Tue, 11 Sep 2012)
New Revision: 43604
Modified:
trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/StringUtil.java
Log:
JBIDE-12589
o.j.t.jsf.ui.test.* JUnit tests fail
Issue is fixed
Modified: trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/StringUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/StringUtil.java 2012-09-11 16:57:30 UTC (rev 43603)
+++ trunk/common/plugins/org.jboss.tools.common.core/src/org/jboss/tools/common/util/StringUtil.java 2012-09-11 17:34:20 UTC (rev 43604)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
+ * Copyright (c) 2011 - 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,
@@ -29,7 +29,8 @@
* @return Non-quoted text value
*/
public static String trimQuotes(String result) {
-
+ if (result == null || result.length() == 0)
+ return result;
int start = 0, end = result.length();
char first = result.charAt(start);
char last = result.charAt(end - 1);
13 years, 4 months
JBoss Tools SVN: r43603 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-09-11 12:57:30 -0400 (Tue, 11 Sep 2012)
New Revision: 43603
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/local.target
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
Fix m2e-wtp version in TP.
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2012-09-11 16:05:10 UTC (rev 43602)
+++ trunk/build/target-platform/jbds.target 2012-09-11 16:57:30 UTC (rev 43603)
@@ -43,7 +43,7 @@
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/>
- <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120906-1800"/>
+ <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120910-0913"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125"/>
<unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
<unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
Modified: trunk/build/target-platform/local.target
===================================================================
--- trunk/build/target-platform/local.target 2012-09-11 16:05:10 UTC (rev 43602)
+++ trunk/build/target-platform/local.target 2012-09-11 16:57:30 UTC (rev 43603)
@@ -44,7 +44,7 @@
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/>
- <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120830-0951"/>
+ <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120910-0913"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125"/>
<unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
<unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2012-09-11 16:05:10 UTC (rev 43602)
+++ trunk/build/target-platform/multiple.target 2012-09-11 16:57:30 UTC (rev 43603)
@@ -43,7 +43,7 @@
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/>
- <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120906-1800"/>
+ <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120910-0913"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125"/>
<unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
<unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2012-09-11 16:05:10 UTC (rev 43602)
+++ trunk/build/target-platform/unified.target 2012-09-11 16:57:30 UTC (rev 43603)
@@ -43,7 +43,7 @@
<!-- m2e, m2e-wtp + deps -->
<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="1.2.0.20120903-1050"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="1.2.0.20120903-1050"/>
- <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120906-1800"/>
+ <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="0.16.0.20120910-0913"/>
<unit id="org.sonatype.m2e.mavenarchiver.feature.feature.group" version="0.15.0.201207090125"/>
<unit id="ch.qos.logback.classic" version="1.0.0.v20111214-2030"/>
<unit id="ch.qos.logback.core" version="1.0.0.v20111214-2030"/>
13 years, 4 months
JBoss Tools SVN: r43602 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-09-11 12:05:10 -0400 (Tue, 11 Sep 2012)
New Revision: 43602
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
Log:
Reverted back
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2012-09-11 15:54:46 UTC (rev 43601)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2012-09-11 16:05:10 UTC (rev 43602)
@@ -143,13 +143,12 @@
* @return
*/
public SWTBot preferenceOpen(IPreference pref) {
- // ljelinko: debugging why shortcuts do not work on Mac with JDK 1.7
-// if (SWTJBTExt.isRunningOnMacOs()){
-// bot.shells()[0].pressShortcut(SWT.COMMAND, ',');
-// }
-// else{
+ if (SWTJBTExt.isRunningOnMacOs()){
+ bot.shells()[0].pressShortcut(SWT.COMMAND, ',');
+ }
+ else{
bot.menu("Window").menu("Preferences").click();
-// }
+ }
SWTBotShell shell = bot.shell("Preferences");
shell.activate();
try{
13 years, 4 months
JBoss Tools SVN: r43601 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-09-11 11:54:46 -0400 (Tue, 11 Sep 2012)
New Revision: 43601
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
Log:
debugging why shortcuts do not work on Mac with JDK 1.7
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2012-09-11 14:37:26 UTC (rev 43600)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTOpenExt.java 2012-09-11 15:54:46 UTC (rev 43601)
@@ -143,12 +143,13 @@
* @return
*/
public SWTBot preferenceOpen(IPreference pref) {
- if (SWTJBTExt.isRunningOnMacOs()){
- bot.shells()[0].pressShortcut(SWT.COMMAND, ',');
- }
- else{
+ // ljelinko: debugging why shortcuts do not work on Mac with JDK 1.7
+// if (SWTJBTExt.isRunningOnMacOs()){
+// bot.shells()[0].pressShortcut(SWT.COMMAND, ',');
+// }
+// else{
bot.menu("Window").menu("Preferences").click();
- }
+// }
SWTBotShell shell = bot.shell("Preferences");
shell.activate();
try{
13 years, 4 months
JBoss Tools SVN: r43600 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test: beansxml and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-09-11 10:37:26 -0400 (Tue, 11 Sep 2012)
New Revision: 43600
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CDISupportTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java
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/beansxml/BeansXMLCompletionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.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/editor/BeansEditorTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/named/NamedComponentsSearchingTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/named/NamedRefactoringTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/FindObserverForEventTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.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/injection/ProblemEligibleInjectionTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeanValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/DecoratorValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/IBindingValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/InterceptorValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QualifierValidationQuickFixTest.java
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/ScopeValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/StereotypeValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/QuickFixHelper.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIRefactorWizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/WizardTest.java
Log:
fixing CDI test against 4.0.0 Alpha1 + stabilizing CDI tests
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -30,7 +30,6 @@
import org.jboss.tools.cdi.bot.test.quickfix.test.QuickFixProposalsDescriptionTest;
import org.jboss.tools.cdi.bot.test.quickfix.test.ScopeValidationQuickFixTest;
import org.jboss.tools.cdi.bot.test.quickfix.test.StereotypeValidationQuickFixTest;
-import org.jboss.tools.cdi.bot.test.wizard.CDISupportTest;
import org.jboss.tools.cdi.bot.test.wizard.CDIWebProjectWizardTest;
import org.jboss.tools.cdi.bot.test.wizard.ConfigurationPresetTest;
import org.jboss.tools.cdi.bot.test.wizard.DynamicWebProjectWithCDITest;
@@ -41,23 +40,7 @@
import org.junit.runners.Suite.SuiteClasses;
/**
- * This test suite requires JBoss AS 6 or newer
- *
- * System properties:
- * -Dswtbot.test.properties.file=$PATH
- * -Dusage_reporting_enabled=$BOOLEAN
- *
- * Format of swtbot.properties file:
- * SERVER=EAP|JBOSS_AS,<server version>,<jre version to run with>|default,<server home>
- *
- * Sample swtbot.properties file:
*
- * SERVER=JBOSS_AS,6.0,default,/home/jjankovi/Dokumenty/Red_Hat_Stuff/Runtimes/jboss-6.0.0.Final
- * JAVA=1.6,/space/java/sdk/jdk1.6.0_22
- *
- *
- * Suite duration: aprox. 30min
- *
* @author Lukas Jungmann
* @author Jaroslav Jankovic
*/
@@ -68,7 +51,6 @@
ConfigurationPresetTest.class,
FacetTest.class,
- CDISupportTest.class,
CDIWebProjectWizardTest.class,
DynamicWebProjectWithCDITest.class,
WizardTest.class,
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISmokeBotTests.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -13,8 +13,9 @@
import org.jboss.tools.cdi.bot.test.beansxml.BeansXMLValidationTest;
import org.jboss.tools.cdi.bot.test.editor.BeansEditorTest;
import org.jboss.tools.cdi.bot.test.quickfix.injection.ProblemEligibleInjectionTest;
-import org.jboss.tools.cdi.bot.test.wizard.CDISupportTest;
+import org.jboss.tools.cdi.bot.test.wizard.CDIWebProjectWizardTest;
import org.jboss.tools.cdi.bot.test.wizard.ConfigurationPresetTest;
+import org.jboss.tools.cdi.bot.test.wizard.DynamicWebProjectWithCDITest;
import org.jboss.tools.cdi.bot.test.wizard.FacetTest;
import org.jboss.tools.cdi.bot.test.wizard.WizardTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
@@ -22,31 +23,17 @@
import org.junit.runners.Suite.SuiteClasses;
/**
- * This test suite requires JBoss AS 6 or newer
- *
- * System properties:
- * -Dswtbot.test.properties.file=$PATH
- * -Dusage_reporting_enabled=$BOOLEAN
- *
- * Format of swtbot.properties file:
- * SERVER=EAP|JBOSS_AS,<server version>,<jre version to run with>|default,<server home>
- *
- * Sample swtbot.properties file:
- *
- * SERVER=JBOSS_AS,6.0,default,/home/jjankovi/Dokumenty/Red_Hat_Stuff/Runtimes/jboss-6.0.0.Final
- * JAVA=1.6,/space/java/sdk/jdk1.6.0_22
- *
- *
- * Suite duration: aprox. 3min
- *
- * @author Jaroslav Jankovic
- */
+*
+* @author Lukas Jungmann
+* @author Jaroslav Jankovic
+*/
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
// PerspectiveTest.class,
ConfigurationPresetTest.class,
FacetTest.class,
- CDISupportTest.class,
+ CDIWebProjectWizardTest.class,
+ DynamicWebProjectWithCDITest.class,
WizardTest.class,
BeansEditorTest.class,
ProblemEligibleInjectionTest.class,
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-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -44,13 +44,13 @@
private static SWTBotEclipseEditor ed;
protected static final Logger LOGGER = Logger.getLogger(CDITestBase.class.getName());
- public static final CDIProjectHelper projectHelper = new CDIProjectHelper();
- public static final BeansXMLHelper beansHelper = new BeansXMLHelper();
- public static final CDIWizardHelper wizard = new CDIWizardHelper();
- public static final CDIWizardBaseExt wizardExt = new CDIWizardBaseExt();
- public static final OpenOnHelper openOnUtil = new OpenOnHelper();
- public static final EditorResourceHelper editResourceUtil = new EditorResourceHelper();
- public static final QuickFixHelper quickFixHelper = new QuickFixHelper();
+ protected static final CDIProjectHelper projectHelper = new CDIProjectHelper();
+ protected static final BeansXMLHelper beansHelper = new BeansXMLHelper();
+ protected static final CDIWizardHelper wizard = new CDIWizardHelper();
+ protected static final CDIWizardBaseExt wizardExt = new CDIWizardBaseExt();
+ protected static final OpenOnHelper openOnUtil = new OpenOnHelper();
+ protected static final EditorResourceHelper editResourceUtil = new EditorResourceHelper();
+ protected static final QuickFixHelper quickFixHelper = new QuickFixHelper();
public SWTBotEclipseEditor getEd() {
return ed;
@@ -63,7 +63,8 @@
@Before
public void prepareWorkspace() {
if (!projectHelper.projectExists(getProjectName())) {
- projectHelper.createCDIProjectWithDynamicWizard(getProjectName());
+// projectHelper.createCDIProjectWithDynamicWizard(getProjectName());
+ importCDITestProject(getProjectName());
}
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLCompletionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLCompletionTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLCompletionTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -41,11 +41,6 @@
private static final List<String> BEANS_XML_TAGS = Arrays.asList(
"alternatives", "decorators", "interceptors");
- @Override
- public String getProjectName() {
- return "CDIBeansCodeCompletion";
- }
-
@Test
public void testPossibleCompletionInBeansXML() {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -30,11 +30,6 @@
private static final String someBean = "Bean1";
private static final String nonExistingPackage = "somePackage";
- @Override
- public String getProjectName() {
- return "CDIBeansValidation";
- }
-
@BeforeClass
public static void setup() {
problems.show();
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-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/decorator/DecoratorFromWebBeanTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -19,7 +19,6 @@
import org.jboss.tools.cdi.bot.test.uiutils.actions.NewCDIFileWizard;
import org.jboss.tools.cdi.bot.test.uiutils.wizards.CDIWizardBase;
import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
/**
@@ -44,12 +43,7 @@
public String getProjectName() {
return "DecoratorFromWebBean";
}
-
- @Before
- public void prepareWorkspace() {
-
- }
-
+
@After
public void cleanUp() {
projectExplorer.deleteAllProjects();
@@ -58,8 +52,6 @@
@Test
public void testCreatingDecoratorWithMenu() {
- importCDITestProject(getProjectName());
-
String[] path = (getProjectName() + "/" + CDIConstants.SRC
+ "/" + getPackageName()).split("/");
@@ -108,8 +100,6 @@
@Test
public void testCreatingDecoratorWithWizard() {
- importCDITestProject(getProjectName());
-
CDIWizardBase decoratorWizard = new NewCDIFileWizard(
CDIWizardType.DECORATOR).run();
decoratorWizard.setName(ACCOUNT_DECORATOR).
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -69,7 +69,7 @@
* project should be located in workspace after previous test
*/
try {
- projectExplorer.selectProject("CDIWizardTest");
+ projectExplorer.selectProject("CDIProject");
} catch (WidgetNotFoundException wnfe) {
fail("project should be located in workspace");
}
@@ -79,11 +79,6 @@
public void prepareWorkspace() {
new ProjectExplorer().openFile(getProjectName(), descPath.split("/"));
}
-
- @Override
- public String getProjectName() {
- return "CDIWizardTest";
- }
@Test
public void testClasses() {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/named/NamedComponentsSearchingTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/named/NamedComponentsSearchingTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/named/NamedComponentsSearchingTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -38,12 +38,7 @@
private SearchNamedDialogWizard namedDialog = null;
private static final String BEAN_STEREOTYPE_PATH = "/resources/named/BeanWithStereotype.java.cdi";
private static final String BEAN_STEREOTYPE_NAMED_PATH = "/resources/named/BeanWithStereotypeAndNamed.java.cdi";
-
- @Override
- public String getProjectName() {
- return "CDINamedSearching";
- }
-
+
@After
public void waitForJobs() {
editResourceUtil.deletePackage(getProjectName(), getPackageName());
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/named/NamedRefactoringTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/named/NamedRefactoringTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/named/NamedRefactoringTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -35,12 +35,7 @@
private static final String INDEX_XHTML_2= "index2.xhtml";
private static final String INDEX_XHTML_3= "index3.xhtml";
private static final String NEW_NAMED_PARAM = "bean2";
-
- @Override
- public String getProjectName() {
- return "CDIRefactoring";
- }
-
+
@After
public void waitForJobs() {
editResourceUtil.deletePackage(getProjectName(), getPackageName());
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/FindObserverForEventTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/FindObserverForEventTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/FindObserverForEventTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -24,11 +24,6 @@
public class FindObserverForEventTest extends OpenOnBase {
- @Override
- public String getProjectName() {
- return "CDIObserverTest";
- }
-
@Test
public void testSimpleCaseObserverFinding() {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -26,11 +26,6 @@
public class OpenOnTest extends OpenOnBase {
- @Override
- public String getProjectName() {
- return "CDIOpenOnTest";
- }
-
@Test
public void testBeanInjectOpenOn() {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/base/BeansXMLQuickFixTestBase.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -160,7 +160,7 @@
quickFixHelper.openQuickFix(validationProblem);
QuickFixDialogWizard qfWizard = new QuickFixDialogWizard();
- qfWizard.setFix(qfWizard.getAvailableFixes().get(0));
+ qfWizard.setFix(qfWizard.getDefaultCDIQuickFix());
qfWizard.setResource(qfWizard.getResources().get(0));
qfWizard.finishWithWait();
}
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-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AllAssignableDialogTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -14,7 +14,6 @@
import org.jboss.tools.cdi.bot.test.CDIConstants;
import org.jboss.tools.cdi.bot.test.CDITestBase;
import org.jboss.tools.cdi.bot.test.uiutils.wizards.AssignableBeansDialog;
-import org.junit.BeforeClass;
import org.junit.Test;
public class AllAssignableDialogTest extends CDITestBase {
@@ -25,12 +24,7 @@
public String getProjectName() {
return "CDIAssignableDialogTest";
}
-
- @BeforeClass
- public static void prepareWS() {
- importCDITestProject("CDIAssignableDialogTest");
- }
-
+
@Test
public void testDecorator() {
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-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/dialog/AssignableDialogFilterTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -14,7 +14,6 @@
import org.jboss.tools.cdi.bot.test.CDIConstants;
import org.jboss.tools.cdi.bot.test.CDITestBase;
import org.jboss.tools.cdi.bot.test.uiutils.wizards.AssignableBeansDialog;
-import org.junit.BeforeClass;
import org.junit.Test;
public class AssignableDialogFilterTest extends CDITestBase {
@@ -25,12 +24,7 @@
public String getProjectName() {
return "AssignableDialogFilterTest";
}
-
- @BeforeClass
- public static void prepareWS() {
- importCDITestProject("AssignableDialogFilterTest");
- }
-
+
@Test
public void testFilterAssignableBeans() {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -31,11 +31,6 @@
private static final String BROKEN_FARM = "BrokenFarm";
private static final String QUALIFIER = "Q1";
- @Override
- public String getProjectName() {
- return "CDIMultipleInjections";
- }
-
@After
public void waitForJobs() {
editResourceUtil.deletePackage(getProjectName(), getPackageName());
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeanValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeanValidationQuickFixTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeanValidationQuickFixTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -28,12 +28,7 @@
public class BeanValidationQuickFixTest extends CDITestBase {
private static IValidationProvider validationProvider = new BeanValidationProvider();
-
- @Override
- public String getProjectName() {
- return "CDIQuickFixBeanTest";
- }
-
+
public IValidationProvider validationProvider() {
return validationProvider;
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -24,11 +24,6 @@
public class BeansXMLValidationQuickFixTest extends BeansXMLQuickFixTestBase {
- @Override
- public String getProjectName() {
- return "CDIQuickFixBeanXMLTest";
- }
-
@Test
public void testNoBeanComponent() {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/DecoratorValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/DecoratorValidationQuickFixTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/DecoratorValidationQuickFixTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -29,11 +29,6 @@
private static IValidationProvider validationProvider = new DecoratorValidationProvider();
- @Override
- public String getProjectName() {
- return "CDIQuickFixDecoratorTest";
- }
-
public IValidationProvider validationProvider() {
return validationProvider;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/IBindingValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/IBindingValidationQuickFixTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/IBindingValidationQuickFixTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -29,11 +29,6 @@
private static IValidationProvider validationProvider = new InterceptorBindingValidationProvider();
- @Override
- public String getProjectName() {
- return "CDIQuickFixIBindingTest";
- }
-
public IValidationProvider validationProvider() {
return validationProvider;
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/InterceptorValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/InterceptorValidationQuickFixTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/InterceptorValidationQuickFixTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -29,11 +29,6 @@
private static IValidationProvider validationProvider = new InterceptorValidationProvider();
- @Override
- public String getProjectName() {
- return "CDIQuickFixInterceptorTest";
- }
-
public IValidationProvider validationProvider() {
return validationProvider;
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QualifierValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QualifierValidationQuickFixTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QualifierValidationQuickFixTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -28,12 +28,7 @@
public class QualifierValidationQuickFixTest extends CDITestBase {
private static IValidationProvider validationProvider = new QualifierValidationProvider();
-
- @Override
- public String getProjectName() {
- return "CDIQuickFixQualifierTest";
- }
-
+
public IValidationProvider validationProvider() {
return validationProvider;
}
@@ -49,7 +44,8 @@
editResourceUtil.replaceInEditor("@Target({ TYPE, METHOD, PARAMETER, FIELD })",
"@Target({ TYPE, FIELD })");
- quickFixHelper.checkQuickFix(ValidationType.TARGET, getProjectName(), validationProvider());
+ quickFixHelper.checkQuickFix(ValidationType.TARGET,
+ "@Target({TYPE, METHOD, FIELD, PARAMETER})", getProjectName(), validationProvider());
editResourceUtil.replaceInEditor("@Target({TYPE, METHOD, FIELD, PARAMETER})", "");
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-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QuickFixProposalsDescriptionTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -18,7 +18,6 @@
import org.jboss.tools.cdi.bot.test.CDIConstants;
import org.jboss.tools.cdi.bot.test.CDITestBase;
import org.jboss.tools.cdi.bot.test.uiutils.wizards.OpenOnOptionsDialog;
-import org.junit.BeforeClass;
import org.junit.Test;
public class QuickFixProposalsDescriptionTest extends CDITestBase {
@@ -27,12 +26,7 @@
public String getProjectName() {
return "CDIQuickFixProposals";
}
-
- @BeforeClass
- public static void prepareWS() {
- importCDITestProject("CDIQuickFixProposals");
- }
-
+
@Test
public void testAddedCode() {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/ScopeValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/ScopeValidationQuickFixTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/ScopeValidationQuickFixTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -28,12 +28,7 @@
public class ScopeValidationQuickFixTest extends CDITestBase {
private static IValidationProvider validationProvider = new ScopeValidationProvider();
-
- @Override
- public String getProjectName() {
- return "CDIQuickFixScopeTest";
- }
-
+
public IValidationProvider validationProvider() {
return validationProvider;
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/StereotypeValidationQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/StereotypeValidationQuickFixTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/StereotypeValidationQuickFixTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -28,12 +28,7 @@
public class StereotypeValidationQuickFixTest extends CDITestBase {
private static IValidationProvider validationProvider = new StereotypeValidationProvider();
-
- @Override
- public String getProjectName() {
- return "CDIQuickFixStereotypeTest";
- }
-
+
public IValidationProvider validationProvider() {
return validationProvider;
}
@@ -49,7 +44,8 @@
editResourceUtil.replaceInEditor("@Target({ TYPE, METHOD, FIELD })",
"@Target({ TYPE, FIELD })");
- quickFixHelper.checkQuickFix(ValidationType.TARGET, getProjectName(), validationProvider());
+ quickFixHelper.checkQuickFix(ValidationType.TARGET, "@Target({TYPE, METHOD, FIELD})",
+ getProjectName(), validationProvider());
editResourceUtil.replaceInEditor("@Target({TYPE, METHOD, FIELD})", "");
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/QuickFixHelper.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/QuickFixHelper.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/QuickFixHelper.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -40,6 +40,12 @@
private SWTUtilExt util = SWTBotFactory.getUtil();
private SWTBotExt bot = SWTBotFactory.getBot();
+
+ public void checkQuickFix(ValidationType validationType, String projectName,
+ IValidationProvider validationProvider) {
+ checkQuickFix(validationType, null, projectName, validationProvider);
+ }
+
/**
* checkQuickFix is the most important method in this class. It
* gets validation error prior to component type and annotation type,
@@ -49,12 +55,12 @@
* @param validationType
* @param compType
*/
- public void checkQuickFix(ValidationType validationType, String projectName,
+ public void checkQuickFix(ValidationType validationType, String text, String projectName,
IValidationProvider validationProvider) {
SWTBotTreeItem validationProblem = getProblem(
validationType, projectName, validationProvider);
assertNotNull(validationProblem);
- resolveQuickFix(validationProblem);
+ resolveQuickFix(validationProblem, text);
validationProblem = getProblem(
validationType, projectName, validationProvider);
assertNull(validationProblem);
@@ -95,12 +101,22 @@
* chooses first option and confirms it (resolve it)
* @param ti
*/
- private void resolveQuickFix(SWTBotTreeItem ti) {
+ private void resolveQuickFix(SWTBotTreeItem ti, String text) {
openQuickFix(ti);
QuickFixDialogWizard qfWizard = new QuickFixDialogWizard();
- String firstFix = qfWizard.getAvailableFixes().get(0);
+ /**
+ * if text is not specified, choose the first CDI
+ * quickfix available proposal. Otherwise choose
+ * the one contains entered text
+ */
+ String firstFix = null;
+ if (text == null) {
+ firstFix = qfWizard.getDefaultCDIQuickFix();
+ } else {
+ firstFix = qfWizard.getCDIQuickFix(text);
+ }
String firstResource = qfWizard.getResources().get(0);
qfWizard.setFix(firstFix).setResource(firstResource).finish();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIRefactorWizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIRefactorWizard.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIRefactorWizard.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -44,7 +44,7 @@
*/
public List<String> getAffectedFiles() {
for (SWTBotTreeItem ti : bot().tree().getTreeItem(RENAME_TEXT_LABEL).getItems()) {
- affectedFiles.add(ti.getText());
+ affectedFiles.add(ti.getText().split(" - ")[0]); // remove package offset
}
return affectedFiles;
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -55,5 +55,23 @@
}
return resources;
}
+
+ public String getDefaultCDIQuickFix() {
+ for (String fix : getAvailableFixes()) {
+ if (fix.contains("Configure")
+ || fix.contains("Add @Suppress")) continue;
+ return fix;
+ }
+ throw new IllegalStateException("No default CDI quick fix is provided " +
+ "for validation problem");
+ }
+ public String getCDIQuickFix(String text) {
+ for (String fix : getAvailableFixes()) {
+ if (fix.contains(text)) return fix;
+
+ }
+ throw new IllegalStateException("No CDI quick fix contains " + text);
+ }
+
}
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CDISupportTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CDISupportTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/CDISupportTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.cdi.bot.test.wizard;
-
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
-import org.jboss.tools.cdi.bot.test.CDISmokeBotTests;
-import org.jboss.tools.cdi.bot.test.CDITestBase;
-import org.junit.Test;
-import org.junit.runners.Suite.SuiteClasses;
-
-@SuiteClasses({ CDIAllBotTests.class , CDISmokeBotTests.class })
-public class CDISupportTest extends CDITestBase {
-
- @Override
- public void prepareWorkspace() {
- if (!projectHelper.projectExists(getProjectName())) {
- projectHelper.createCDIProjectWithDynamicWizard(getProjectName());
- }
- }
-
- @Override
- public String getProjectName() {
- return "CDIDynamicWizardProject";
- }
-
- @Test
- public void testDynamicWizard() {
- if (projectHelper.projectExists(getProjectName())) {
- LOGGER.info("CDI project was sucessfully created by Dynamic Web Project wizard");
- assertTrue(projectHelper.checkCDISupport(getProjectName()));
- LOGGER.info("Project has correctly set CDI support");
- } else {
- fail("CDI project was not succesfully created with Dynamic Web Project wizard");
- }
-
- }
-
-}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/WizardTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/WizardTest.java 2012-09-11 14:36:10 UTC (rev 43599)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/WizardTest.java 2012-09-11 14:37:26 UTC (rev 43600)
@@ -33,10 +33,6 @@
@SuiteClasses({ CDIAllBotTests.class, CDISmokeBotTests.class })
public class WizardTest extends CDITestBase {
- public String getProjectName() {
- return "CDIWizardTest";
- }
-
@Override
public void waitForJobs() {
util.waitForNonIgnoredJobs();
13 years, 4 months
JBoss Tools SVN: r43599 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects: CDIProject and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-09-11 10:36:10 -0400 (Tue, 11 Sep 2012)
New Revision: 43599
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.project
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/.jsdtscope
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.eclipse.wst.common.component
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.hibernate.eclipse.console.prefs
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/WebContent/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/WebContent/META-INF/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/WebContent/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/WebContent/WEB-INF/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/WebContent/WEB-INF/lib/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/build/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/src/
Log:
new default CDI project resource added
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.classpath
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.classpath
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.project
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.project
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/.jsdtscope
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/.jsdtscope
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.eclipse.wst.common.component
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.eclipse.wst.common.component
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ application/xml
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-09-11 14:36:10 UTC (rev 43599)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-09-11 14:36:10 UTC (rev 43599)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.hibernate.eclipse.console.prefs
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.hibernate.eclipse.console.prefs (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/.settings/org.hibernate.eclipse.console.prefs 2012-09-11 14:36:10 UTC (rev 43599)
@@ -0,0 +1,3 @@
+default.configuration=
+eclipse.preferences.version=1
+hibernate3.enabled=false
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/projects/CDIProject/WebContent/META-INF/MANIFEST.MF 2012-09-11 14:36:10 UTC (rev 43599)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
13 years, 4 months
JBoss Tools SVN: r43598 - trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-09-11 10:34:41 -0400 (Tue, 11 Sep 2012)
New Revision: 43598
Modified:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java
Log:
change according to TreeHelper modification
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java 2012-09-11 14:34:15 UTC (rev 43597)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/view/ProjectArchivesView.java 2012-09-11 14:34:41 UTC (rev 43598)
@@ -16,7 +16,6 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
-import org.eclipse.swtbot.swt.finder.widgets.TimeoutException;
import org.jboss.tools.archives.ui.bot.test.context.ArchiveContextMenu;
import org.jboss.tools.archives.ui.bot.test.dialog.ArchivePublishSettingsDialog;
import org.jboss.tools.archives.ui.bot.test.dialog.EditArchiveDialog;
@@ -112,7 +111,7 @@
this.bot().tree(0).getTreeItem(path[0]).collapse();
TreeHelper.expandNode(bot(), path);
return true;
- } catch (TimeoutException exc) {
+ } catch (WidgetNotFoundException exc) {
return false;
}
}
13 years, 4 months
JBoss Tools SVN: r43597 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-09-11 10:34:15 -0400 (Tue, 11 Sep 2012)
New Revision: 43597
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/TreeHelper.java
Log:
TreeHelper now throws WidgetNotFoundException as before
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/TreeHelper.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/TreeHelper.java 2012-09-11 13:35:23 UTC (rev 43596)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/TreeHelper.java 2012-09-11 14:34:15 UTC (rev 43597)
@@ -7,6 +7,7 @@
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.eclipse.swtbot.swt.finder.widgets.TimeoutException;
import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.condition.TreeContainsNode;
import org.jboss.tools.ui.bot.ext.condition.TreeItemContainsNode;
@@ -23,7 +24,11 @@
List<String> asList = new ArrayList<String>(Arrays.asList(nodes));
SWTBotTree tree = bot.tree(0);
- bot.waitUntil(new TreeContainsNode(tree,asList.get(0)), Timing.time5S());
+ try {
+ bot.waitUntil(new TreeContainsNode(tree,asList.get(0)), Timing.time5S());
+ } catch (TimeoutException exc) {
+ // do nothing, WidgetNotFoundException will be thrown just after this
+ }
SWTBotTreeItem item = tree.getTreeItem(asList.get(0));
asList.remove(0);
@@ -33,7 +38,11 @@
item.getNode(0).getText().equals("Loading...")) {
bot.sleep(Timing.time1S());
}
- bot.waitUntil(new TreeItemContainsNode(item, node), Timing.time5S());
+ try {
+ bot.waitUntil(new TreeItemContainsNode(item, node), Timing.time5S());
+ } catch (TimeoutException exc) {
+ // do nothing, WidgetNotFoundException will be thrown just after this
+ }
item = item.getNode(node);
}
return item;
13 years, 4 months