Author: jjankovi
Date: 2011-12-09 05:09:43 -0500 (Fri, 09 Dec 2011)
New Revision: 37150
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyBean.java.cdi
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyBeanInjections.java.cdi
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyConfigProd.java.cdi
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyExtendConfig.java.cdi
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyGenericBean.java.cdi
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyGenericBean2.java.cdi
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyGenericType.java.cdi
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/openon/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/openon/BeanWithResourceAnnotation.java.cdi
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISeam3AllBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3GenericOpenOnTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3ResourceOpenOnTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3TestBase.java
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/generic/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/Bean.java.cdi
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3Test.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/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/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/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/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/wizard/ConfigurationPresetTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/FacetTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/PerspectiveTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/WizardTest.java
Log:
Huge refactoring Seam3 tests + CDISeam3AllBotTests added + seam3 resources refactoring
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/Bean.java.cdi
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/Bean.java.cdi 2011-12-09
10:01:34 UTC (rev 37149)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/Bean.java.cdi 2011-12-09
10:09:43 UTC (rev 37150)
@@ -1,19 +0,0 @@
-package cdi;
-
-import java.net.URL;
-
-import javax.inject.Inject;
-
-import org.jboss.seam.solder.resourceLoader.Resource;
-
-public class BeanComponent {
-
- @Inject
- @Resource("WEB-INF/beans.xml")
- URL beansXml;
-
- public ResourceBean() {
- // TODO Auto-generated constructor stub
- }
-
-}
\ No newline at end of file
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyBean.java.cdi
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyBean.java.cdi
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyBean.java.cdi 2011-12-09
10:09:43 UTC (rev 37150)
@@ -0,0 +1,7 @@
+package cdi.seam;
+
+public class MyBeanX {
+
+ public MyBeanX(String s) {}
+
+}
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyBeanInjections.java.cdi
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyBeanInjections.java.cdi
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyBeanInjections.java.cdi 2011-12-09
10:09:43 UTC (rev 37150)
@@ -0,0 +1,82 @@
+package cdi.seam;
+
+import javax.inject.Inject;
+
+public class MyBeanInjections {
+
+ /**
+ * Injected method producer MyGenericBean.createMyFirstBean()
+ * Configuration produced by MyConfigurationProducer.getOneConfig()
+ */
+ @Inject
+ MyBean first1;
+
+ /**
+ * Injected method producer MyGenericBean.createMyFirstBean()
+ * Configuration produced by MyConfigurationProducer.getSecondConfig()
+ */
+ @Inject
+ @Qualifier1
+ MyBean first2;
+
+ /**
+ * Injected method producer MyGenericBean.createMyFirstBean()
+ * Configuration produced by MyExtendedConfiguration
+ */
+ @Inject
+ @Qualifier2
+ MyBean first3;
+
+
+
+
+ /**
+ * Injected method producer MyGenericBean.createMySecondBean()
+ * Configuration produced by MyConfigurationProducer.getOneConfig()
+ */
+ @Inject
+ MyBean2 second1;
+
+ /**
+ * Injected method producer MyGenericBean.createMySecondBean()
+ * Configuration produced by MyConfigurationProducer.getSecondConfig()
+ */
+ @Inject
+ @Qualifier1
+ MyBean2 second2;
+
+ /**
+ * Injected method producer MyGenericBean.createMySecondBean()
+ * Configuration produced by MyExtendedConfiguration
+ */
+ @Inject
+ @Qualifier2
+ MyBean2 second3;
+
+
+
+
+ /**
+ * Injected field producer MyGenericBean.myThirdBean
+ * Configuration produced by MyConfigurationProducer.getOneConfig()
+ */
+ @Inject
+ MyBean3 third1;
+
+ /**
+ * Injected field producer MyGenericBean.myThirdBean
+ * Configuration produced by MyConfigurationProducer.getSecondConfig()
+ */
+ @Inject
+ @Qualifier1
+ MyBean3 third2;
+
+ /**
+ * Injected field producer MyGenericBean.myThirdBean
+ * Configuration produced by MyExtendedConfiguration
+ */
+ @Inject
+ @Qualifier2
+ MyBean3 third3;
+
+}
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyConfigProd.java.cdi
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyConfigProd.java.cdi
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyConfigProd.java.cdi 2011-12-09
10:09:43 UTC (rev 37150)
@@ -0,0 +1,29 @@
+package cdi.seam;
+
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Produces;
+
+public class MyConfigurationProducer {
+
+ /**
+ * Configuration created by field producer.
+ */
+ @Produces
+ @MyGenericType("first")
+ @Default
+ MyConfiguration getOneConfig() {
+ return null;
+ }
+
+ /**
+ * Configuration created by method producer with specified scope.
+ */
+ @Produces
+ @MyGenericType("second")
+ @Qualifier1
+ @SessionScoped
+ MyConfiguration getSecondConfig() {
+ return null;
+ }
+}
\ No newline at end of file
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyExtendConfig.java.cdi
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyExtendConfig.java.cdi
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyExtendConfig.java.cdi 2011-12-09
10:09:43 UTC (rev 37150)
@@ -0,0 +1,9 @@
+package cdi.seam;
+
+@MyGenericType("third")
+@Qualifier2
+public class MyExtendedConfiguration extends MyConfiguration {
+ public MyExtendedConfiguration() {
+ super("");
+ }
+}
\ No newline at end of file
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyGenericBean.java.cdi
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyGenericBean.java.cdi
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyGenericBean.java.cdi 2011-12-09
10:09:43 UTC (rev 37150)
@@ -0,0 +1,27 @@
+package cdi.seam;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.bean.generic.ApplyScope;
+import org.jboss.seam.solder.bean.generic.Generic;
+import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+
+(a)GenericConfiguration(MyGenericType.class)
+public class MyGenericBean {
+ @Inject
+ @Generic
+ MyConfiguration config;
+
+ @Inject
+ MyGenericType type;
+
+ @Produces @ApplyScope
+ MyBean createMyFirstBean() {
+ return new MyBean("bean1");
+ }
+
+ @Produces @ApplyScope
+ MyBean3 myThirdBean = new MyBean3("bean3");
+
+}
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyGenericBean2.java.cdi
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyGenericBean2.java.cdi
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyGenericBean2.java.cdi 2011-12-09
10:09:43 UTC (rev 37150)
@@ -0,0 +1,35 @@
+package cdi.seam;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.bean.generic.Generic;
+import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+
+(a)GenericConfiguration(MyGenericType.class)
+public class MyGenericBean2 {
+ @Inject
+ @Generic
+ MyConfiguration config;
+
+ @Inject
+ @Generic
+ MyBean c;
+
+ @Inject
+ void setMyBean(@Generic MyBean parameter1) {}
+
+ @Inject
+ @Generic
+ MyBean2 c2;
+
+ @Inject
+ @Generic
+ MyBean3 c3;
+
+ @Produces
+ MyBean2 createMySecondBean() {
+ return new MyBean2("");
+ }
+
+}
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyGenericType.java.cdi
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyGenericType.java.cdi
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/generic/MyGenericType.java.cdi 2011-12-09
10:09:43 UTC (rev 37150)
@@ -0,0 +1,8 @@
+package cdi.seam;
+
+import org.jboss.seam.solder.bean.generic.GenericType;
+
+(a)GenericType(MyConfiguration.class)
+public @interface MyGenericType {
+ String value();
+}
\ No newline at end of file
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/openon/BeanWithResourceAnnotation.java.cdi
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/openon/BeanWithResourceAnnotation.java.cdi
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/seam3/openon/BeanWithResourceAnnotation.java.cdi 2011-12-09
10:09:43 UTC (rev 37150)
@@ -0,0 +1,15 @@
+package cdi.seam;
+
+import java.net.URL;
+
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.resourceLoader.Resource;
+
+public class BeanComponent {
+
+ @Inject
+ @Resource("WEB-INF/beans.xml")
+ URL beansXml;
+
+}
\ No newline at end of file
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -26,7 +26,8 @@
import org.jboss.tools.cdi.bot.test.quickfix.test.QualifierValidationQuickFixTest;
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.seam3.Seam3Test;
+import org.jboss.tools.cdi.bot.test.seam3.Seam3GenericOpenOnTest;
+import org.jboss.tools.cdi.bot.test.seam3.Seam3ResourceOpenOnTest;
import org.jboss.tools.cdi.bot.test.uiutils.SWTEclipseCDIExtUtil;
import org.jboss.tools.cdi.bot.test.wizard.ConfigurationPresetTest;
import org.jboss.tools.cdi.bot.test.wizard.FacetTest;
@@ -53,7 +54,7 @@
* JAVA=1.6,/space/java/sdk/jdk1.6.0_22
*
*
- * Suite duration: aprox. 28min
+ * Suite duration: aprox. 29min
*
* @author Lukas Jungmann
* @author Jaroslav Jankovic
@@ -80,7 +81,8 @@
IBindingValidationQuickFixTest.class,
OpenOnTest.class,
FindObserverForEventTest.class,
- Seam3Test.class
+ Seam3ResourceOpenOnTest.class,
+ Seam3GenericOpenOnTest.class,
})
public class CDIAllBotTests extends CDITestBase {
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISeam3AllBotTests.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISeam3AllBotTests.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDISeam3AllBotTests.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2010-2011 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;
+
+import org.jboss.tools.cdi.bot.test.seam3.Seam3GenericOpenOnTest;
+import org.jboss.tools.cdi.bot.test.seam3.Seam3ResourceOpenOnTest;
+import org.jboss.tools.cdi.bot.test.seam3.Seam3TestBase;
+import org.jboss.tools.cdi.bot.test.uiutils.SWTEclipseCDIExtUtil;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.jboss.tools.ui.bot.ext.types.ViewType;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+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
+ */
+(a)RunWith(RequirementAwareSuite.class)
+@SuiteClasses({
+ Seam3ResourceOpenOnTest.class,
+ Seam3GenericOpenOnTest.class,
+ })
+public class CDISeam3AllBotTests extends Seam3TestBase {
+
+ /*
+ * init method "setup()" shows a project explorer view as default,
+ * disable folding (due to easier source code editing)
+ */
+ @BeforeClass
+ public static void setUpSuite() {
+ eclipse.showView(ViewType.PROJECT_EXPLORER);
+ SWTEclipseCDIExtUtil.disableFolding(bot, util);
+ }
+}
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -11,20 +11,34 @@
package org.jboss.tools.cdi.bot.test;
+import java.util.logging.Logger;
+
import org.jboss.tools.cdi.bot.test.uiutils.BeansXMLValidationHelper;
import org.jboss.tools.cdi.bot.test.uiutils.CDIProjectHelper;
import org.jboss.tools.cdi.bot.test.uiutils.CDIWizardHelper;
import org.jboss.tools.cdi.bot.test.uiutils.EditorResourceHelper;
import org.jboss.tools.cdi.bot.test.uiutils.LibraryHelper;
import org.jboss.tools.cdi.bot.test.uiutils.OpenOnHelper;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.After;
import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
+ @RunWith(RequirementAwareSuite.class)
+ @SuiteClasses({ CDIAllBotTests.class })
public class CDITestBase extends CDIBase {
private String projectName = "CDIProject";
private String packageName = "cdi";
protected final String LINE_SEPARATOR = System.getProperty("line.separator");
+ protected static final Logger LOGGER = Logger.getLogger(CDITestBase.class.getName());
protected static CDIProjectHelper projectHelper = new CDIProjectHelper();
protected static BeansXMLValidationHelper beansHelper = new BeansXMLValidationHelper();
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLCompletionTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -13,24 +13,16 @@
import java.util.Arrays;
import java.util.List;
-import java.util.logging.Logger;
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.CDITestBase;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.Timing;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.jboss.tools.ui.bot.ext.helper.ContentAssistHelper;
import org.jboss.tools.ui.bot.ext.parts.ContentAssistBot;
import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
/**
* Test operates on code completion in beans.xml
@@ -39,15 +31,7 @@
*
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
public class BeansXMLCompletionTest extends CDITestBase {
-
- private static final Logger LOGGER = Logger
- .getLogger(BeansXMLCompletionTest.class.getName());
private static final List<String> BEANS_XML_TAGS = Arrays.asList(
"alternatives", "decorators", "interceptors");
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -11,18 +11,11 @@
package org.jboss.tools.cdi.bot.test.beansxml;
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.CDITestBase;
import org.jboss.tools.cdi.bot.test.annotations.BeansXMLValidationErrors;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
/**
* Test operates on beans validation in beans.xml
@@ -31,11 +24,6 @@
*
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
public class BeansXMLValidationTest extends CDITestBase {
private final String someBean = "Bean1";
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -16,7 +16,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -24,6 +23,7 @@
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
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.jboss.tools.cdi.bot.test.editor.BeansEditor.Item;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
@@ -50,14 +50,13 @@
* @author jjankovi
*/
@Require(clearProjects = false, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
+server = @Server(state = ServerState.NotRunning,
+version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
+@SuiteClasses({ CDIAllBotTests.class, CDISmokeBotTests.class })
public class BeansEditorTest extends CDITestBase {
private static final String descPath = "WebContent/WEB-INF/beans.xml";
- private static final Logger LOGGER = Logger.getLogger(BeansEditorTest.class.getName());
@BeforeClass
public static void setup() {
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/named/NamedComponentsSearchingTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -15,20 +15,13 @@
import java.util.List;
import java.util.Map;
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.CDITestBase;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.uiutils.wizards.CDIWizardBaseExt;
import org.jboss.tools.cdi.bot.test.uiutils.wizards.SearchNamedDialogWizard;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.jboss.tools.ui.bot.ext.Timing;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.After;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
/**
* Test operates on @Named searching
@@ -36,11 +29,7 @@
* @author Jaroslav Jankovic
*
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
+
public class NamedComponentsSearchingTest extends CDITestBase {
private final CDIWizardBaseExt wizardExt = new CDIWizardBaseExt();
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/named/NamedRefactoringTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -14,18 +14,11 @@
import java.util.Arrays;
import java.util.Collection;
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.jsf.JSFTestBase;
import org.jboss.tools.cdi.bot.test.uiutils.CollectionsUtil;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.After;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
/**
* Test operates on @Named refactoring
@@ -33,11 +26,7 @@
* @author Jaroslav Jankovic
*
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
+
public class NamedRefactoringTest extends JSFTestBase {
private static final String MANAGED_BEAN_1 = "ManagedBean1";
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/FindObserverForEventTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -11,19 +11,10 @@
package org.jboss.tools.cdi.bot.test.openon;
-import java.util.logging.Logger;
-
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.jboss.tools.ui.bot.ext.Timing;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
/**
* Test operates on finding right observer for event and vice versa
@@ -31,15 +22,8 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
public class FindObserverForEventTest extends OpenOnBase {
- private static final Logger LOGGER =
Logger.getLogger(FindObserverForEventTest.class.getName());
-
@Override
public String getProjectName() {
return "CDIObserverTest";
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -11,19 +11,10 @@
package org.jboss.tools.cdi.bot.test.openon;
-import java.util.logging.Logger;
-
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.jboss.tools.ui.bot.ext.Timing;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
/**
* Test operates on hyperlinks-openons using CDI support
@@ -32,15 +23,8 @@
*
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
public class OpenOnTest extends OpenOnBase {
-
- private static final Logger LOGGER = Logger.getLogger(OpenOnTest.class.getName());
-
+
@Override
public String getProjectName() {
return "CDIOpenOnTest";
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/injection/ProblemEligibleInjectionTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -11,17 +11,10 @@
package org.jboss.tools.cdi.bot.test.quickfix.injection;
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.quickfix.base.EligibleInjectionQuickFixTestBase;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.After;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
/**
* Test checks if Quick Fix provides useful operations when
@@ -30,11 +23,6 @@
*
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
public class ProblemEligibleInjectionTest extends EligibleInjectionQuickFixTestBase {
private final String ANIMAL = "Animal";
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeanValidationQuickFixTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -12,17 +12,10 @@
package org.jboss.tools.cdi.bot.test.quickfix.test;
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
/**
* Test operates on quick fixes used for validation errors of CDI bean component
@@ -30,11 +23,6 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
public class BeanValidationQuickFixTest extends QuickFixTestBase {
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/BeansXMLValidationQuickFixTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -11,16 +11,9 @@
package org.jboss.tools.cdi.bot.test.quickfix.test;
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.quickfix.base.BeansXMLQuickFixTestBase;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
/**
* Test operates on quick fixes used for validation errors of beans.xml
@@ -28,11 +21,6 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
public class BeansXMLValidationQuickFixTest extends BeansXMLQuickFixTestBase {
@Override
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/DecoratorValidationQuickFixTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -12,17 +12,10 @@
package org.jboss.tools.cdi.bot.test.quickfix.test;
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
/**
* Test operates on quick fixes used for validation errors of CDI Decorator component
@@ -30,11 +23,6 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
public class DecoratorValidationQuickFixTest extends QuickFixTestBase {
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/IBindingValidationQuickFixTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -12,17 +12,10 @@
package org.jboss.tools.cdi.bot.test.quickfix.test;
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
/**
* Test operates on quick fixes used for validation errors of CDI Interceptor Binding
component
@@ -30,11 +23,6 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
public class IBindingValidationQuickFixTest extends QuickFixTestBase {
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/InterceptorValidationQuickFixTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -12,17 +12,10 @@
package org.jboss.tools.cdi.bot.test.quickfix.test;
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
/**
* Test operates on quick fixes used for validation errors of CDI Interceptor component
@@ -30,11 +23,6 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
public class InterceptorValidationQuickFixTest extends QuickFixTestBase {
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/QualifierValidationQuickFixTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -12,17 +12,10 @@
package org.jboss.tools.cdi.bot.test.quickfix.test;
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
/**
* Test operates on quick fixes used for validation errors of CDI Qualifier component
@@ -30,11 +23,6 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
public class QualifierValidationQuickFixTest extends QuickFixTestBase {
@Override
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/ScopeValidationQuickFixTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -12,17 +12,10 @@
package org.jboss.tools.cdi.bot.test.quickfix.test;
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
/**
* Test operates on quick fixes used for validation errors of CDI Scope component
@@ -30,11 +23,6 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
public class ScopeValidationQuickFixTest extends QuickFixTestBase {
@Override
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/test/StereotypeValidationQuickFixTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -12,17 +12,10 @@
package org.jboss.tools.cdi.bot.test.quickfix.test;
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.annotations.CDIAnnotationsType;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.quickfix.base.QuickFixTestBase;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
/**
* Test operates on quick fixes used for validation errors of CDI Stereotype component
@@ -30,11 +23,6 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
public class StereotypeValidationQuickFixTest extends QuickFixTestBase {
@Override
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3GenericOpenOnTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3GenericOpenOnTest.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3GenericOpenOnTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -0,0 +1,205 @@
+/*******************************************************************************
+ * 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.seam3;
+
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
+import org.jboss.tools.ui.bot.ext.Timing;
+import org.junit.Test;
+
+/**
+ * Test operates on generic points openOn in Seam3 using CDI tools
+ *
+ * @author jjankovi
+ *
+ */
+
+public class Seam3GenericOpenOnTest extends Seam3TestBase {
+
+ private final String GENERIC_POINT_1 = "MyExtendedConfiguration ";
+ private final String GENERIC_POINT_2 =
"MyConfigurationProducer.getOneConfig()";
+ private final String GENERIC_POINT_3 =
"MyConfigurationProducer.getSecondConfig()";
+
+ @Override
+ public String getProjectName() {
+ return "Seam3GenericOpenOnTest";
+ }
+
+ /**
+ *
https://issues.jboss.org/browse/JBIDE-8692
+ */
+ @Test
+ public void testGenericOpenOn() {
+
+ prepareGenericOpenOn();
+
+ checkFirstOpenOnAndGeneric();
+ checkSecondOpenOnAndGeneric();
+ checkThirdOpenOnAndGeneric();
+
+ String parameter = "MyConfiguration config";
+ String classTitle = "MyGenericBean.java";
+ checkAllGenericPointsForAtribute(parameter, classTitle);
+
+
+ classTitle = "MyGenericBean2.java";
+ String[] atributes = {"MyConfiguration config", "MyBean c",
"MyBean2 c2",
+ "MyBean3 c3", "MyBean parameter1"};
+ for (String atribute : atributes) {
+ checkAllGenericPointsForAtribute(atribute, classTitle);
+ }
+
+ }
+
+ /**
+ * wizard.create all necessary components for this test
+ */
+ private void prepareGenericOpenOn() {
+ /**
+ * injectable beans + qualifiers + generic configuration components
+ */
+ wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBean",
+ getPackageName(), null, "/resources/seam3/generic/MyBean.java.cdi");
+ editResourceUtil.replaceInEditor("MyBeanX", "MyBean");
+
+ wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBean2",
+ getPackageName(), null, "/resources/seam3/generic/MyBean.java.cdi");
+ editResourceUtil.replaceInEditor("MyBeanX", "MyBean2");
+
+ wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBean3",
+ getPackageName(), null, "/resources/seam3/generic/MyBean.java.cdi");
+ editResourceUtil.replaceInEditor("MyBeanX", "MyBean3");
+
+ wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyConfiguration",
+ getPackageName(), null, "/resources/seam3/generic/MyBean.java.cdi");
+ editResourceUtil.replaceInEditor("MyBeanX",
"MyConfiguration");
+
+ wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyGenericType",
+ getPackageName(), null,
"/resources/seam3/generic/MyGenericType.java.cdi");
+
+ wizard.createCDIComponent(CDIWizardType.QUALIFIER, "Qualifier1",
getPackageName(), null);
+ wizard.createCDIComponent(CDIWizardType.QUALIFIER, "Qualifier2",
getPackageName(), null);
+
+ wizard.createCDIComponentWithContent(CDIWizardType.BEAN,
"MyExtendedConfiguration",
+ getPackageName(), null,
"/resources/seam3/generic/MyExtendConfig.java.cdi");
+
+ wizard.createCDIComponentWithContent(CDIWizardType.BEAN,
"MyConfigurationProducer",
+ getPackageName(), null, "/resources/seam3/generic/MyConfigProd.java.cdi");
+
+ /**
+ * beans which include atributes suggesting opening all the available
+ * generic configurations
+ */
+
+ wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBeanInjections",
+ getPackageName(), null,
"/resources/seam3/generic/MyBeanInjections.java.cdi");
+
+ wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyGenericBean",
+ getPackageName(), null,
"/resources/seam3/generic/MyGenericBean.java.cdi");
+
+ wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyGenericBean2",
+ getPackageName(), null,
"/resources/seam3/generic/MyGenericBean2.java.cdi");
+ }
+
+ private void checkFirstOpenOnAndGeneric() {
+ checkOpenOnAndGeneric("first1", "MyBeanInjections.java",
"Generic Configuration Point",
+ "MyConfigurationProducer.java", "getOneConfig");
+ checkOpenOnAndGeneric("first1", "MyBeanInjections.java",
"@Inject Bean",
+ "MyGenericBean.java", "createMyFirstBean");
+
+ checkOpenOnAndGeneric("first2", "MyBeanInjections.java",
"Generic Configuration Point",
+ "MyConfigurationProducer.java", "getSecondConfig");
+ checkOpenOnAndGeneric("first2", "MyBeanInjections.java",
"@Inject Bean",
+ "MyGenericBean.java", "createMyFirstBean");
+
+ checkOpenOnAndGeneric("first3", "MyBeanInjections.java",
"Generic Configuration Point",
+ "MyExtendedConfiguration.java", "MyExtendedConfiguration");
+ checkOpenOnAndGeneric("first3", "MyBeanInjections.java",
"@Inject Bean",
+ "MyGenericBean.java", "createMyFirstBean");
+ }
+
+ private void checkSecondOpenOnAndGeneric() {
+ checkOpenOnAndGeneric("second1", "MyBeanInjections.java",
"Generic Configuration Point",
+ "MyConfigurationProducer.java", "getOneConfig");
+ checkOpenOnAndGeneric("second1", "MyBeanInjections.java",
"@Inject Bean",
+ "MyGenericBean2.java", "createMySecondBean");
+
+ checkOpenOnAndGeneric("second2", "MyBeanInjections.java",
"Generic Configuration Point",
+ "MyConfigurationProducer.java", "getSecondConfig");
+ checkOpenOnAndGeneric("second2", "MyBeanInjections.java",
"@Inject Bean",
+ "MyGenericBean2.java", "createMySecondBean");
+
+ checkOpenOnAndGeneric("second3", "MyBeanInjections.java",
"Generic Configuration Point",
+ "MyExtendedConfiguration.java", "MyExtendedConfiguration");
+ checkOpenOnAndGeneric("second3", "MyBeanInjections.java",
"@Inject Bean",
+ "MyGenericBean2.java", "createMySecondBean");
+ }
+
+ private void checkThirdOpenOnAndGeneric() {
+ checkOpenOnAndGeneric("third1", "MyBeanInjections.java",
"Generic Configuration Point",
+ "MyConfigurationProducer.java", "getOneConfig");
+ checkOpenOnAndGeneric("third1", "MyBeanInjections.java",
"@Inject Bean",
+ "MyGenericBean.java", "myThirdBean");
+
+ checkOpenOnAndGeneric("third2", "MyBeanInjections.java",
"Generic Configuration Point",
+ "MyConfigurationProducer.java", "getSecondConfig");
+ checkOpenOnAndGeneric("third2", "MyBeanInjections.java",
"@Inject Bean",
+ "MyGenericBean.java", "myThirdBean");
+
+ checkOpenOnAndGeneric("third3", "MyBeanInjections.java",
"Generic Configuration Point",
+ "MyExtendedConfiguration.java", "MyExtendedConfiguration");
+ checkOpenOnAndGeneric("third3", "MyBeanInjections.java",
"@Inject Bean",
+ "MyGenericBean.java", "myThirdBean");
+ }
+
+ private void checkOpenOnAndGeneric(String openOnString, String titleName, String
chosenOption,
+ String afterOpenOnTitleName, String injectSelectionAtribute) {
+ openOnUtil.openOnByOption(openOnString, titleName, chosenOption);
+ String activeEditor = bot.activeEditor().getTitle();
+ String selectedString = bot.activeEditor().toTextEditor().getSelection();
+ assertTrue(activeEditor, activeEditor.equals(afterOpenOnTitleName));
+ assertTrue(selectedString, selectedString.equals(injectSelectionAtribute));
+ }
+
+ private void checkAllGenericPointsForAtribute(String atribute,
+ String classTitle) {
+ openOnUtil.openOnByOption(atribute, classTitle, "Show All Generic Configuration
Points...");
+ bot.sleep(Timing.time1S());
+ SWTBotTable genericPointTable = bot.table(0);
+ assertTrue(checkAllGenericConfPoints(genericPointTable));
+ bot.sleep(Timing.time2S());
+ }
+
+ private boolean checkAllGenericConfPoints(SWTBotTable genericPointTable) {
+ boolean isGenericPoint1Present = false;
+ boolean isGenericPoint2Present = false;
+ boolean isGenericPoint3Present = false;
+ for (int rowIterator = 0; rowIterator < genericPointTable.rowCount(); rowIterator++)
{
+ String itemInTable = genericPointTable.getTableItem(rowIterator).getText();
+ if (itemInTable.contains(GENERIC_POINT_1)) {
+ isGenericPoint1Present = true;
+ continue;
+ }
+ if (itemInTable.contains(GENERIC_POINT_2)) {
+ isGenericPoint2Present = true;
+ continue;
+ }
+ if (itemInTable.contains(GENERIC_POINT_3)) {
+ isGenericPoint3Present = true;
+ continue;
+ }
+ }
+ return isGenericPoint1Present && isGenericPoint2Present &&
isGenericPoint3Present;
+ }
+
+
+}
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3ResourceOpenOnTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3ResourceOpenOnTest.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3ResourceOpenOnTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * 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.seam3;
+
+
+import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
+import org.junit.Test;
+
+/**
+ * Test operates on resource openOn in Seam3 using CDI tools
+ *
+ * @author Jaroslav Jankovic
+ */
+
+public class Seam3ResourceOpenOnTest extends Seam3TestBase {
+
+ @Override
+ public String getProjectName() {
+ return "Seam3ResourceOpenOnTest";
+ }
+
+ /**
+ *
https://issues.jboss.org/browse/JBIDE-8202
+ */
+ @Test
+ public void testResourceOpenOn() {
+
+ String className = "Bean1";
+
+ wizard.createCDIComponent(CDIWizardType.BEANS_XML, "beans.xml",
getProjectName() + "/WebContent/WEB-INF", null);
+
+ wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className,
+ getPackageName(), null,
"/resources/seam3/openon/BeanWithResourceAnnotation.java.cdi");
+ editResourceUtil.replaceInEditor("BeanComponent", className);
+
+ openOnUtil.openOnByOption("beansXml", className + ".java",
"Open Resource");
+
+ String destinationFile = getEd().getTitle();
+ assertTrue("ERROR: redirected to " + destinationFile,
+ destinationFile.equals("beans.xml"));
+
+ editResourceUtil.moveFileInProjectExplorer("beans.xml", getProjectName() +
"/WebContent/WEB-INF",
+ getProjectName() + "/WebContent/META-INF");
+ LOGGER.info("bean.xml was moved to META-INF");
+
+ setEd(bot.swtBotEditorExtByTitle(className + ".java"));
+ editResourceUtil.replaceInEditor("WEB", "META");
+ openOnUtil.openOnByOption("beansXml", className + ".java",
"Open Resource");
+
+ destinationFile = getEd().getTitle();
+ assertTrue("ERROR: redirected to " + destinationFile,
+ destinationFile.equals("beans.xml"));
+
+ }
+
+}
+
Deleted:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3Test.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3Test.java 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3Test.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -1,303 +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.seam3;
-
-
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
-import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
-import org.jboss.tools.cdi.bot.test.CDITestBase;
-import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.Timing;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
-
-/**
- * Test operates on seam3 features using CDI tools
- *
- * @author Jaroslav Jankovic
- */
-
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
-@SuiteClasses({ CDIAllBotTests.class })
-public class Seam3Test extends CDITestBase {
-
- private static final Logger LOGGER = Logger.getLogger(Seam3Test.class.getName());
- private final String genericPoint1 = "MyExtendedConfiguration ";
- private final String genericPoint2 =
"MyConfigurationProducer.getOneConfig()";
- private final String genericPoint3 =
"MyConfigurationProducer.getSecondConfig()";
-
-
- @Override
- public void checkAndCreateProject() {
- if (!projectHelper.projectExists(getProjectName())) {
- projectHelper.createCDIProject(getProjectName());
- addLibrary("seam-solder.jar");
- checkLibrary("seam-solder.jar");
- }
- }
-
- @Override
- public String getProjectName() {
- return "CDISeam3Test";
- }
-
- private String getGenericPackageName() {
- return "org.cdi.generic";
- }
-
-
- /**
- *
https://issues.jboss.org/browse/JBIDE-8202
- */
- @Test
- public void testResourceOpenOn() {
-
- String className = "Bean1";
-
- wizard.createCDIComponent(CDIWizardType.BEANS_XML, "beans.xml",
getProjectName() + "/WebContent/WEB-INF", null);
-
- wizard.createCDIComponentWithContent(CDIWizardType.BEAN, className,
- getPackageName(), null, "/resources/seam3/Bean.java.cdi");
- editResourceUtil.replaceInEditor("BeanComponent", className);
-
- openOnUtil.openOnByOption("beansXml", className + ".java",
"Open Resource");
-
- String destinationFile = getEd().getTitle();
- assertTrue("ERROR: redirected to " + destinationFile,
- destinationFile.equals("beans.xml"));
-
- editResourceUtil.moveFileInProjectExplorer("beans.xml", getProjectName() +
"/WebContent/WEB-INF",
- getProjectName() + "/WebContent/META-INF");
- LOGGER.info("bean.xml was moved to META-INF");
-
- setEd(bot.swtBotEditorExtByTitle(className + ".java"));
- editResourceUtil.replaceInEditor("WEB", "META");
- openOnUtil.openOnByOption("beansXml", className + ".java",
"Open Resource");
-
- destinationFile = getEd().getTitle();
- assertTrue("ERROR: redirected to " + destinationFile,
- destinationFile.equals("beans.xml"));
-
- }
-
- /**
- *
https://issues.jboss.org/browse/JBIDE-8692
- */
- @Test
- public void testGenericOpenOn() {
-
- prepareGenericOpenOn();
-
- checkMyBeanInjections();
-
- checkMyGenericBean();
-
- checkMyGenericBean2();
- }
-
- private void addLibrary(String libraryName) {
- try {
- libraryUtil.addLibraryIntoProject(getProjectName(), libraryName);
- LOGGER.info("Library: \"" + libraryName + "\" copied");
- util.waitForNonIgnoredJobs();
- libraryUtil.addLibraryToProjectsClassPath(getProjectName(), libraryName);
- LOGGER.info("Library: \"" + libraryName + "\" on class path
of project\"" + getProjectName() + "\"");
- } catch (IOException exc) {
- LOGGER.log(Level.SEVERE, "Error while adding seam solder library into
project");
- }
- }
-
- private void checkLibrary(String libraryName) {
- assertTrue(libraryUtil.isLibraryInProjectClassPath(getProjectName(), libraryName));
- }
-
- /**
- * wizard.create all necessary components for this test
- */
- private void prepareGenericOpenOn() {
- /**
- * injectable beans + qualifiers + generic configuration components
- */
- wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBean",
- getGenericPackageName(), null, "/resources/generic/MyBean.java.cdi");
- editResourceUtil.replaceInEditor("MyBeanX", "MyBean");
-
- wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBean2",
- getGenericPackageName(), null, "/resources/generic/MyBean.java.cdi");
- editResourceUtil.replaceInEditor("MyBeanX", "MyBean2");
-
- wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBean3",
- getGenericPackageName(), null, "/resources/generic/MyBean.java.cdi");
- editResourceUtil.replaceInEditor("MyBeanX", "MyBean3");
-
- wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyConfiguration",
- getGenericPackageName(), null, "/resources/generic/MyBean.java.cdi");
- editResourceUtil.replaceInEditor("MyBeanX",
"MyConfiguration");
-
- wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyGenericType",
- getGenericPackageName(), null,
"/resources/generic/MyGenericType.java.cdi");
-
- wizard.createCDIComponent(CDIWizardType.QUALIFIER, "Qualifier1",
getGenericPackageName(), null);
- wizard.createCDIComponent(CDIWizardType.QUALIFIER, "Qualifier2",
getGenericPackageName(), null);
-
- wizard.createCDIComponentWithContent(CDIWizardType.BEAN,
"MyExtendedConfiguration",
- getGenericPackageName(), null,
"/resources/generic/MyExtendConfig.java.cdi");
-
- wizard.createCDIComponentWithContent(CDIWizardType.BEAN,
"MyConfigurationProducer",
- getGenericPackageName(), null,
"/resources/generic/MyConfigProd.java.cdi");
-
- /**
- * beans which include atributes suggesting opening all the available
- * generic configurations
- */
-
- wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyBeanInjections",
- getGenericPackageName(), null,
"/resources/generic/MyBeanInjections.java.cdi");
-
- wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyGenericBean",
- getGenericPackageName(), null,
"/resources/generic/MyGenericBean.java.cdi");
-
- wizard.createCDIComponentWithContent(CDIWizardType.BEAN, "MyGenericBean2",
- getGenericPackageName(), null,
"/resources/generic/MyGenericBean2.java.cdi");
- }
-
- private void checkMyBeanInjections() {
- checkFirstOpenOnAndGeneric();
- checkSecondOpenOnAndGeneric();
- checkThirdOpenOnAndGeneric();
- }
-
- private void checkMyGenericBean() {
- String parameter = "MyConfiguration config";
- String classTitle = "MyGenericBean.java";
- checkAllGenericPointsForAtribute(parameter, classTitle);
- }
-
- private void checkMyGenericBean2() {
- String classTitle = "MyGenericBean2.java";
-
- checkAllGenericPointsForAtribute("MyConfiguration config", classTitle);
-
- checkAllGenericPointsForAtribute("MyBean c", classTitle);
-
- checkAllGenericPointsForAtribute("MyBean2 c2", classTitle);
-
- checkAllGenericPointsForAtribute("MyBean3 c3", classTitle);
-
- checkAllGenericPointsForAtribute("MyBean parameter1", classTitle);
-
- }
- private void checkFirstOpenOnAndGeneric() {
- checkOpenOnAndGeneric("first1", "MyBeanInjections.java",
"Generic Configuration Point",
- "MyConfigurationProducer.java", "getOneConfig");
- checkOpenOnAndGeneric("first1", "MyBeanInjections.java",
"@Inject Bean",
- "MyGenericBean.java", "createMyFirstBean");
-
- checkOpenOnAndGeneric("first2", "MyBeanInjections.java",
"Generic Configuration Point",
- "MyConfigurationProducer.java", "getSecondConfig");
- checkOpenOnAndGeneric("first2", "MyBeanInjections.java",
"@Inject Bean",
- "MyGenericBean.java", "createMyFirstBean");
-
- checkOpenOnAndGeneric("first3", "MyBeanInjections.java",
"Generic Configuration Point",
- "MyExtendedConfiguration.java", "MyExtendedConfiguration");
- checkOpenOnAndGeneric("first3", "MyBeanInjections.java",
"@Inject Bean",
- "MyGenericBean.java", "createMyFirstBean");
- }
-
- private void checkSecondOpenOnAndGeneric() {
- checkOpenOnAndGeneric("second1", "MyBeanInjections.java",
"Generic Configuration Point",
- "MyConfigurationProducer.java", "getOneConfig");
- checkOpenOnAndGeneric("second1", "MyBeanInjections.java",
"@Inject Bean",
- "MyGenericBean2.java", "createMySecondBean");
-
- checkOpenOnAndGeneric("second2", "MyBeanInjections.java",
"Generic Configuration Point",
- "MyConfigurationProducer.java", "getSecondConfig");
- checkOpenOnAndGeneric("second2", "MyBeanInjections.java",
"@Inject Bean",
- "MyGenericBean2.java", "createMySecondBean");
-
- checkOpenOnAndGeneric("second3", "MyBeanInjections.java",
"Generic Configuration Point",
- "MyExtendedConfiguration.java", "MyExtendedConfiguration");
- checkOpenOnAndGeneric("second3", "MyBeanInjections.java",
"@Inject Bean",
- "MyGenericBean2.java", "createMySecondBean");
- }
-
- private void checkThirdOpenOnAndGeneric() {
- checkOpenOnAndGeneric("third1", "MyBeanInjections.java",
"Generic Configuration Point",
- "MyConfigurationProducer.java", "getOneConfig");
- checkOpenOnAndGeneric("third1", "MyBeanInjections.java",
"@Inject Bean",
- "MyGenericBean.java", "myThirdBean");
-
- checkOpenOnAndGeneric("third2", "MyBeanInjections.java",
"Generic Configuration Point",
- "MyConfigurationProducer.java", "getSecondConfig");
- checkOpenOnAndGeneric("third2", "MyBeanInjections.java",
"@Inject Bean",
- "MyGenericBean.java", "myThirdBean");
-
- checkOpenOnAndGeneric("third3", "MyBeanInjections.java",
"Generic Configuration Point",
- "MyExtendedConfiguration.java", "MyExtendedConfiguration");
- checkOpenOnAndGeneric("third3", "MyBeanInjections.java",
"@Inject Bean",
- "MyGenericBean.java", "myThirdBean");
- }
-
- private void checkOpenOnAndGeneric(String openOnString, String titleName, String
chosenOption,
- String afterOpenOnTitleName, String injectSelectionAtribute) {
- openOnUtil.openOnByOption(openOnString, titleName, chosenOption);
- String activeEditor = bot.activeEditor().getTitle();
- String selectedString = bot.activeEditor().toTextEditor().getSelection();
- assertTrue(activeEditor, activeEditor.equals(afterOpenOnTitleName));
- assertTrue(selectedString, selectedString.equals(injectSelectionAtribute));
- }
-
- private void checkAllGenericPointsForAtribute(String parameter, String classTitle) {
- openOnUtil.openOnByOption(parameter, classTitle, "Show All Generic Configuration
Points...");
- bot.sleep(Timing.time1S());
- SWTBotTable genericPointTable = bot.table(0);
- assertTrue(checkAllGenericConfPoints(genericPointTable));
- //getEd().pressShortcut(Keystrokes.ESC);
- bot.sleep(Timing.time2S());
- }
-
- private boolean checkAllGenericConfPoints(SWTBotTable genericPointTable) {
- boolean isGenericPoint1Present = false;
- boolean isGenericPoint2Present = false;
- boolean isGenericPoint3Present = false;
- for (int rowIterator = 0; rowIterator < genericPointTable.rowCount(); rowIterator++)
{
- String itemInTable = genericPointTable.getTableItem(rowIterator).getText();
- if (itemInTable.contains(genericPoint1)) {
- isGenericPoint1Present = true;
- continue;
- }
- if (itemInTable.contains(genericPoint2)) {
- isGenericPoint2Present = true;
- continue;
- }
- if (itemInTable.contains(genericPoint3)) {
- isGenericPoint3Present = true;
- continue;
- }
- }
- return isGenericPoint1Present && isGenericPoint2Present &&
isGenericPoint3Present;
- }
-
-}
-
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3TestBase.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3TestBase.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3TestBase.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * 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.seam3;
+
+import java.io.IOException;
+import java.util.logging.Level;
+
+import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
+import org.jboss.tools.cdi.bot.test.CDISeam3AllBotTests;
+import org.jboss.tools.cdi.bot.test.CDITestBase;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+@Require(clearProjects = true, perspective = "Java EE",
+server = @Server(state = ServerState.NotRunning,
+version = "6.0", operator = ">="))
+(a)RunWith(RequirementAwareSuite.class)
+@SuiteClasses({ CDIAllBotTests.class, CDISeam3AllBotTests.class })
+public class Seam3TestBase extends CDITestBase {
+
+ private String projectName = "CDISeam3Project";
+ private String packageName = "cdi.seam";
+
+ protected String getProjectName() {
+ return projectName;
+ }
+
+ protected String getPackageName() {
+ return packageName;
+ }
+
+ @Override
+ public void checkAndCreateProject() {
+ if (!projectHelper.projectExists(getProjectName())) {
+ projectHelper.createCDIProject(getProjectName());
+ addSeamSolderLibrary();
+ }
+ }
+
+ protected void addSeamSolderLibrary() {
+ addLibrary("seam-solder.jar");
+ checkLibrary("seam-solder.jar");
+ }
+
+ private void addLibrary(String libraryName) {
+ try {
+ libraryUtil.addLibraryIntoProject(getProjectName(), libraryName);
+ LOGGER.info("Library: \"" + libraryName + "\" copied");
+ util.waitForNonIgnoredJobs();
+ libraryUtil.addLibraryToProjectsClassPath(getProjectName(), libraryName);
+ LOGGER.info("Library: \"" + libraryName + "\" on class path
of project\"" + getProjectName() + "\"");
+ } catch (IOException exc) {
+ LOGGER.log(Level.SEVERE, "Error while adding seam solder library into
project");
+ }
+ }
+
+ private void checkLibrary(String libraryName) {
+ assertTrue(libraryUtil.isLibraryInProjectClassPath(getProjectName(), libraryName));
+ }
+
+}
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/ConfigurationPresetTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/ConfigurationPresetTest.java 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/ConfigurationPresetTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -12,17 +12,10 @@
package org.jboss.tools.cdi.bot.test.wizard;
-import java.util.logging.Logger;
-
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.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.Test;
-import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
/**
@@ -31,15 +24,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class , CDISmokeBotTests.class })
public class ConfigurationPresetTest extends CDITestBase {
- private static final Logger LOGGER =
Logger.getLogger(ConfigurationPresetTest.class.getName());
-
@Override
public void checkAndCreateProject() {
if (!projectHelper.projectExists(getProjectName())) {
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/FacetTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/FacetTest.java 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/FacetTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -11,17 +11,10 @@
package org.jboss.tools.cdi.bot.test.wizard;
-import java.util.logging.Logger;
-
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.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.Test;
-import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
/**
@@ -30,16 +23,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class , CDISmokeBotTests.class })
public class FacetTest extends CDITestBase {
- private static final Logger LOGGER = Logger.getLogger(FacetTest.class.getName());
-
-
@Override
public void checkAndCreateProject() {
if (!projectHelper.projectExists(getProjectName())) {
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/PerspectiveTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/PerspectiveTest.java 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/PerspectiveTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -12,8 +12,6 @@
package org.jboss.tools.cdi.bot.test.wizard;
-import java.util.logging.Logger;
-
import org.eclipse.swt.SWTException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
@@ -22,14 +20,9 @@
import org.jboss.tools.cdi.bot.test.CDITestBase;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
import org.jboss.tools.cdi.bot.test.uiutils.NodeContextUtil;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.jboss.tools.ui.bot.ext.Timing;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.jboss.tools.ui.bot.ext.types.PerspectiveType;
import org.junit.Test;
-import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
/**
@@ -38,15 +31,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class, CDISmokeBotTests.class })
public class PerspectiveTest extends CDITestBase {
- private static final Logger LOGGER = Logger.getLogger(PerspectiveTest.class.getName());
-
@Override
public void checkAndCreateProject() {
if (!projectHelper.projectExists(getProjectName())) {
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 2011-12-09
10:01:34 UTC (rev 37149)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/WizardTest.java 2011-12-09
10:09:43 UTC (rev 37150)
@@ -11,8 +11,6 @@
package org.jboss.tools.cdi.bot.test.wizard;
-import java.util.logging.Logger;
-
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
@@ -22,13 +20,8 @@
import org.jboss.tools.cdi.bot.test.uiutils.actions.NewCDIFileWizard;
import org.jboss.tools.cdi.bot.test.uiutils.wizards.CDIWizardBase;
import org.jboss.tools.cdi.bot.test.uiutils.wizards.CDIWizardBaseExt;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.jboss.tools.ui.bot.ext.Timing;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.junit.Test;
-import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
/**
@@ -37,14 +30,10 @@
* @author Lukas Jungmann
* @author jjankovi
*/
-@Require(clearProjects = true, perspective = "Java EE",
- server = @Server(state = ServerState.NotRunning,
- version = "6.0", operator = ">="))
-(a)RunWith(RequirementAwareSuite.class)
+
@SuiteClasses({ CDIAllBotTests.class, CDISmokeBotTests.class })
public class WizardTest extends CDITestBase {
- private static final Logger L = Logger.getLogger(WizardTest.class.getName());
private final CDIWizardBaseExt wizard = new CDIWizardBaseExt();
public String getProjectName() {
@@ -67,7 +56,7 @@
SWTBotEditor ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("Q1.java").equals(ed.getTitle()));
String code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("@Qualifier"));
assertTrue(code.contains("@Retention(RUNTIME)"));
assertTrue(code.contains("@Target({ TYPE, METHOD, PARAMETER, FIELD })"));
@@ -79,7 +68,7 @@
ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("Q2.java").equals(ed.getTitle()));
code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("@Qualifier"));
assertTrue(code.contains("@Retention(RUNTIME)"));
assertTrue(code.contains("@Target({ TYPE, METHOD, PARAMETER, FIELD })"));
@@ -94,7 +83,7 @@
SWTBotEditor ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("Scope1.java").equals(ed.getTitle()));
String code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("@NormalScope"));
assertFalse(code.contains("@Scope"));
assertFalse(code.contains("passivating"));
@@ -108,7 +97,7 @@
ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("Scope2.java").equals(ed.getTitle()));
code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("@NormalScope(passivating = true)"));
assertFalse(code.contains("@Scope"));
assertTrue(code.contains("@Retention(RUNTIME)"));
@@ -121,7 +110,7 @@
ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("Scope3.java").equals(ed.getTitle()));
code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("@Scope"));
assertFalse(code.contains("@NormalScope"));
assertTrue(code.contains("@Retention(RUNTIME)"));
@@ -139,7 +128,7 @@
SWTBotEditor ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("B1.java").equals(ed.getTitle()));
String code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("@InterceptorBinding"));
assertTrue(code.contains("@Retention(RUNTIME)"));
assertTrue(code.contains("@Target({ TYPE, METHOD })"));
@@ -151,7 +140,7 @@
ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("B2.java").equals(ed.getTitle()));
code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("@InterceptorBinding"));
assertTrue(code.contains("@Retention(RUNTIME)"));
assertTrue(code.contains("@Target({ TYPE })"));
@@ -163,7 +152,7 @@
ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("B3.java").equals(ed.getTitle()));
code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("@InterceptorBinding"));
assertTrue(code.contains("@Retention(RUNTIME)"));
assertTrue(code.contains("@Target({ TYPE })"));
@@ -177,7 +166,7 @@
ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("B4.java").equals(ed.getTitle()));
code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("@InterceptorBinding"));
assertTrue(code.contains("@Retention(RUNTIME)"));
assertTrue(code.contains("@Target({ TYPE })"));
@@ -197,7 +186,7 @@
SWTBotEditor ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("S1.java").equals(ed.getTitle()));
String code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("@Stereotype"));
assertTrue(code.contains("@Retention(RUNTIME)"));
assertTrue(code.contains("@Target({ TYPE, METHOD, FIELD })"));
@@ -212,7 +201,7 @@
ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("S2.java").equals(ed.getTitle()));
code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("@Stereotype"));
assertTrue(code.contains("@Scope3"));
assertTrue(code.contains("@Named"));
@@ -230,7 +219,7 @@
ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("S3.java").equals(ed.getTitle()));
code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("@Stereotype"));
assertFalse(code.contains("@Scope3"));
assertFalse(code.contains("@Named"));
@@ -252,7 +241,7 @@
SWTBotEditor ed = new
SWTWorkbenchBot().editorByTitle("ComparableDecorator.java");
assertTrue(("ComparableDecorator.java").equals(ed.getTitle()));
String code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("@Decorator"));
assertTrue(code.contains("abstract class"));
assertTrue(code.contains("@Delegate"));
@@ -268,7 +257,7 @@
ed = new SWTWorkbenchBot().editorByTitle("MapDecorator.java");
assertTrue(("MapDecorator.java").equals(ed.getTitle()));
code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("@Decorator"));
assertFalse(code.contains("abstract"));
assertTrue(code.contains("@Delegate"));
@@ -287,7 +276,7 @@
SWTBotEditor ed = new SWTWorkbenchBot().editorByTitle("I1.java");
assertTrue(("I1.java").equals(ed.getTitle()));
String code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("@B2"));
assertTrue(code.contains("@Interceptor"));
assertTrue(code.contains("@AroundInvoke"));
@@ -301,7 +290,7 @@
ed = new SWTWorkbenchBot().editorByTitle("I2.java");
assertTrue(("I2.java").equals(ed.getTitle()));
code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("@B4"));
assertTrue(code.contains("@Interceptor"));
assertTrue(code.contains("@AroundInvoke"));
@@ -332,7 +321,7 @@
SWTBotEditor ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("Bean1.java").equals(ed.getTitle()));
String code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("package cdi;"));
assertTrue(code.contains("public abstract class Bean1 {"));
assertFalse(code.contains("@Named"));
@@ -345,7 +334,7 @@
ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("Bean2.java").equals(ed.getTitle()));
code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("package cdi;"));
assertTrue(code.contains("@Named"));
assertFalse(code.contains("@Named("));
@@ -359,7 +348,7 @@
ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("Bean3.java").equals(ed.getTitle()));
code = ed.toTextEditor().getText();
- L.fine(code);
+ LOGGER.fine(code);
assertTrue(code.contains("package cdi;"));
assertTrue(code.contains("@Named(\"TestedBean\")"));
assertTrue(code.contains("@Scope2"));
@@ -377,7 +366,7 @@
SWTBotEditor ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("AnnL1.java").equals(ed.getTitle()));
String code = ed.toTextEditor().getText();
- L.info(code);
+ LOGGER.info(code);
assertTrue(code.contains("package cdi;"));
assertTrue(code.contains("public final class AnnL1 extends
AnnotationLiteral<Q1> implements Q1"));
assertTrue(code.contains("public static final Q1 INSTANCE = new AnnL1();"));
@@ -390,7 +379,7 @@
ed = new SWTWorkbenchBot().activeEditor();
assertTrue(("AnnL2.java").equals(ed.getTitle()));
code = ed.toTextEditor().getText();
- L.info(code);
+ LOGGER.info(code);
assertTrue(code.contains("package cdi;"));
assertTrue(code.contains("abstract class AnnL2 extends AnnotationLiteral<Q2>
implements Q2 {"));
assertTrue(code.contains("public static final Q2 INSTANCE = new AnnL2();"));