JBoss Tools SVN: r36538 - in trunk/cdi/tests/org.jboss.tools.cdi.bot.test: resources/jsf and 8 other directories.
11:27 a.m.
Author: jjankovi
Date: 2011-11-22 12:27:26 -0500 (Tue, 22 Nov 2011)
New Revision: 36538
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/ManagedBean.java.cdi
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFEnvironment.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFTemplate.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/ELNamedRefactoring.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/NewJSFProjectWizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/JSFWebProjectWizard.java
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizard.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/openon/OpenOnBase.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/BeansXMLValidationHelper.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIProjectHelper.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/DynamicWebProjectWizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/ConfigurationPresetTest.java
Log:
Resources + Other needed classes for new CDI test for EL refactoring added
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/ManagedBean.java.cdi
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/ManagedBean.java.cdi
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/ManagedBean.java.cdi 2011-11-22
17:27:26 UTC (rev 36538)
@@ -0,0 +1,16 @@
+package cdi;
+
+import javax.inject.Named;
+
+@Named("bean")
+public class ManagedBean {
+
+ public ManagedBean() {
+
+ }
+
+ public String submit() {
+ return "OK";
+ }
+
+}
\ No newline at end of file
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml
(rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml 2011-11-22
17:27:26 UTC (rev 36538)
@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<h:head></h:head>
+<body>
+ <h:form>
+ <h:commandButton action="#{bean.submit()}" value="Submit" />
+ </h:form>
+
+</body>
+</html>
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-11-22
16:44:21 UTC (rev 36537)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-11-22
17:27:26 UTC (rev 36538)
@@ -12,6 +12,7 @@
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.jsf.ELNamedRefactoring;
import org.jboss.tools.cdi.bot.test.openon.FindObserverForEventTest;
import org.jboss.tools.cdi.bot.test.openon.OpenOnTest;
import org.jboss.tools.cdi.bot.test.quickfix.BeanValidationQuickFixTest;
@@ -48,7 +49,7 @@
* JAVA=1.6,/space/java/sdk/jdk1.6.0_22
*
*
- * Suite duration: aprox. 21min
+ * Suite duration: aprox. 22min
*
* @author Lukas Jungmann
* @author Jaroslav Jankovic
@@ -60,6 +61,7 @@
FacetTest.class,
WizardTest.class,
BeansEditorTest.class,
+ ELNamedRefactoring.class,
BeansXMLValidationTest.class,
// BeansXMLCompletionTest.class,
StereotypeValidationQuickFixTest.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 2011-11-22
16:44:21 UTC (rev 36537)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDITestBase.java 2011-11-22
17:27:26 UTC (rev 36538)
@@ -8,14 +8,15 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
+
package org.jboss.tools.cdi.bot.test;
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.cdi.bot.test.uiutils.wizards.CDIWizard;
import org.junit.After;
import org.junit.Before;
@@ -27,7 +28,7 @@
protected static CDIProjectHelper projectHelper = new CDIProjectHelper();
protected static BeansXMLValidationHelper beansHelper = new BeansXMLValidationHelper();
- protected static CDIWizard wizard = new CDIWizard();
+ protected static CDIWizardHelper wizard = new CDIWizardHelper();
protected static OpenOnHelper openOnUtil = new OpenOnHelper();
protected static LibraryHelper libraryUtil = new LibraryHelper();
protected static EditorResourceHelper editResourceUtil = new EditorResourceHelper();
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFEnvironment.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFEnvironment.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFEnvironment.java 2011-11-22
17:27:26 UTC (rev 36538)
@@ -0,0 +1,21 @@
+package org.jboss.tools.cdi.bot.test.annotations;
+
+public enum JSFEnvironment {
+
+ JSF_11, JSF_12, JSF_12_FACETS, JSF_20;
+
+ public String getName() {
+ switch (this) {
+ case JSF_11:
+ return "JSF 1.1.02 - Reference Implementation";
+ case JSF_12:
+ return "JSF 1.2";
+ case JSF_12_FACETS:
+ return "JSF 1.2 with Facets";
+ case JSF_20:
+ return "JSF 2.0";
+ default:
+ throw new AssertionError("Unknown type");
+ }
+ }
+}
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFTemplate.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFTemplate.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFTemplate.java 2011-11-22
17:27:26 UTC (rev 36538)
@@ -0,0 +1,18 @@
+package org.jboss.tools.cdi.bot.test.annotations;
+
+public enum JSFTemplate {
+
+ BLANK, KICKSTART;
+
+ public String getName() {
+ switch (this) {
+ case BLANK:
+ return "JSFBlankWithoutLibs";
+ case KICKSTART:
+ return "JSFKickStartWithoutLibs";
+ default:
+ throw new AssertionError("Unknown type");
+ }
+ }
+
+}
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/ELNamedRefactoring.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/ELNamedRefactoring.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/ELNamedRefactoring.java 2011-11-22
17:27:26 UTC (rev 36538)
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * 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.jsf;
+
+import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
+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 EL named refactoring
+ *
+ * @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 ELNamedRefactoring extends JSFTestBase {
+
+ @Override
+ public String getProjectName() {
+ return "CDIRefactoring";
+ }
+
+ @Test
+ public void testCreateJSFBlankProject() {
+
+ assertTrue(projectHelper.projectExists(getProjectName()));
+ assertTrue(projectHelper.checkCDISupport(getProjectName()));
+
+ }
+
+}
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java 2011-11-22
17:27:26 UTC (rev 36538)
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * 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.jsf;
+
+import org.jboss.tools.cdi.bot.test.CDITestBase;
+import org.jboss.tools.cdi.bot.test.annotations.JSFEnvironment;
+import org.jboss.tools.cdi.bot.test.annotations.JSFTemplate;
+import org.jboss.tools.cdi.bot.test.uiutils.actions.NewJSFProjectWizard;
+import org.junit.Before;
+
+public class JSFTestBase extends CDITestBase {
+
+ private JSFEnvironment env = JSFEnvironment.JSF_11;
+
+ public JSFEnvironment getEnv() {
+ return env;
+ }
+
+ @Before
+ public void checkAndCreateProject() {
+
+ if (!projectHelper.projectExists(getProjectName())) {
+ createJSFProjectWithCDISupport(getProjectName(), getEnv());
+ }
+
+ }
+
+ private void createJSFProjectWithCDISupport(String projectName, JSFEnvironment env) {
+
+ createJSFProject(projectName, env);
+ projectHelper.addCDISupport(projectName);
+
+ }
+
+ private void createJSFProject(String projectName, JSFEnvironment env) {
+ new NewJSFProjectWizard().run().
+ setName(getProjectName()).
+ setEnvironment(env).
+ setJSFTemplate(JSFTemplate.BLANK).finish();
+ util.waitForNonIgnoredJobs();
+ }
+
+}
\ No newline at end of file
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnBase.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnBase.java 2011-11-22
16:44:21 UTC (rev 36537)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnBase.java 2011-11-22
17:27:26 UTC (rev 36538)
@@ -14,7 +14,14 @@
import org.jboss.tools.cdi.bot.test.CDITestBase;
import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
-public class OpenOnBase extends CDITestBase{
+/**
+ * test base for OpenOn-like CDI tests
+ *
+ * @author jjankovi
+ *
+ */
+
+public class OpenOnBase extends CDITestBase {
protected static final String[] events = { "myBean1Q1Event",
"myBean1AnyEvent",
"myBean2Q1Event", "myBean2AnyEvent", "myBean1Q2Event",
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/BeansXMLValidationHelper.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/BeansXMLValidationHelper.java 2011-11-22
16:44:21 UTC (rev 36537)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/BeansXMLValidationHelper.java 2011-11-22
17:27:26 UTC (rev 36538)
@@ -29,8 +29,7 @@
/**
* Method checks if there is validation problem with text
- * specified by parameter validationErrors for entered project
- *
+ * specified by parameter validationErrors for entered project
* @param validationError
* @return
*/
@@ -59,8 +58,7 @@
/**
* Method checks if there is no validation problem when
* creating interceptor component with entered className
- * packageName for project with name projectName
- *
+ * packageName for project with name projectName
* @param projectName
* @param packageName
* @param className
@@ -76,7 +74,6 @@
* Method checks if there is no validation problem when
* creating decorator component with entered className
* packageName for project with name projectName
- *
* @param projectName
* @param packageName
* @param className
@@ -91,8 +88,7 @@
/**
* Method checks if there is no validation problem when
* creating alternative bean component with entered className
- * packageName for project with name projectName
- *
+ * packageName for project with name projectName
* @param projectName
* @param packageName
* @param className
@@ -107,7 +103,6 @@
/**
* Method gets all beans.xml validation errors showed in Problems View
* for entered project
- *
* @return
*/
public SWTBotTreeItem[] getBeansXMLValidationErrors(String projectName) {
@@ -116,8 +111,7 @@
}
/**
- * Methods creates beans.xml with no tags for entered project.
- *
+ * Methods creates beans.xml with no tags for entered project.
* @param projectName
*/
public void createClearBeansXML(String projectName) {
@@ -129,8 +123,7 @@
/**
* Methods creates beans.xml with interceptor tags in it for entered project.
* Package and interceptor component name which should be showed in tag is
- * determined by parameters
- *
+ * determined by parameters
* @param projectName
* @param packageName
* @param className
@@ -147,8 +140,7 @@
/**
* Methods creates beans.xml with decorator tags in it for entered project.
* Package and decorator component name which should be showed in tag is
- * determined by parameters
- *
+ * determined by parameters
* @param projectName
* @param packageName
* @param className
@@ -164,8 +156,7 @@
/**
* Methods creates beans.xml with alternative tags in it for entered project.
* Package and alternative bean component name which should be showed in tag is
- * determined by parameters
- *
+ * determined by parameters
* @param projectName
* @param packageName
* @param className
@@ -181,8 +172,7 @@
/**
* Methods create beans.xml for entered project with content of file
* determined by parameter path. If there is beans.xml in project, its
- * content is simply replaced
- *
+ * content is simply replaced
* @param projectName
* @param path
*/
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIProjectHelper.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIProjectHelper.java 2011-11-22
16:44:21 UTC (rev 36537)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIProjectHelper.java 2011-11-22
17:27:26 UTC (rev 36538)
@@ -12,12 +12,14 @@
package org.jboss.tools.cdi.bot.test.uiutils;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.cdi.bot.test.CDIBase;
import org.jboss.tools.cdi.bot.test.uiutils.actions.NewFileWizardAction;
import org.jboss.tools.cdi.bot.test.uiutils.wizards.DynamicWebProjectWizard;
import org.jboss.tools.ui.bot.ext.Timing;
+import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
public class CDIProjectHelper extends CDIBase{
@@ -84,7 +86,7 @@
* Method adds CDI support to project with entered name
* @param projectName
*/
- private void addCDISupport(String projectName) {
+ public void addCDISupport(String projectName) {
projectExplorer.selectProject(projectName);
SWTBotTree tree = projectExplorer.bot().tree();
SWTBotTreeItem item = tree.getTreeItem(projectName);
@@ -97,4 +99,22 @@
util.waitForNonIgnoredJobs();
}
+ /**
+ * Method checks if entered project has CDI support set
+ * @param projectName
+ * @return
+ */
+ public boolean checkCDISupport(String projectName) {
+ projectExplorer.selectProject(projectName);
+
+ SWTBotTree tree = projectExplorer.bot().tree();
+ ContextMenuHelper.prepareTreeItemForContextMenu(tree);
+ new
SWTBotMenu(ContextMenuHelper.getContextMenu(tree,"Properties",false)).click();
+
+ bot.tree().expandNode("CDI (Context and Dependency Injection)
Settings").select();
+ boolean isCDISupported = bot.checkBox().isChecked();
+ bot.button("Cancel").click();
+ return isCDISupported;
+ }
+
}
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java 2011-11-22
17:27:26 UTC (rev 36538)
@@ -0,0 +1,134 @@
+/*******************************************************************************
+ * 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.uiutils;
+
+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;
+
+public class CDIWizardHelper extends CDITestBase{
+
+ private CDIWizardBaseExt wizardExt = new CDIWizardBaseExt();
+
+ /**
+ * Method creates Java Annotation with selected name and package
+ * @param name
+ * @param packageName
+ */
+ public void createAnnotation(String name, String packageName) {
+ wizardExt.annotation(open, util, packageName, name);
+ }
+
+ /**
+ * Method creates CDI component with workaround for beans.xml -
+ * if component is beans.xml, editor is not set (there is no active editor by default)
+ * @param component
+ * @param name
+ * @param packageName
+ * @param necessaryParam
+ */
+ public void createCDIComponent(CDIWizardType component, String name,
+ String packageName, String necessaryParam) {
+ createComponent(component, name, packageName, necessaryParam);
+ util.waitForNonIgnoredJobs();
+ /**
+ * if beans.xml is created as first component in project,
+ * it is not opened as default ==> there is no active editor
+ */
+ if (component != CDIWizardType.BEANS_XML) {
+ setEd(bot.activeEditor().toTextEditor());
+ }
+ }
+
+ /**
+ * Method creates larger number("amount") of the same component.
+ * @param component
+ * @param amount
+ * @param baseName
+ * @param packageBaseName
+ * @param necessaryParam
+ * @param differentPackages
+ */
+ public void createCDIComponents(CDIWizardType component, int amount, String baseName,
+ String packageBaseName, String necessaryParam, boolean differentPackages) {
+
+ for (int i = 1; i <= amount; i++) {
+ String packageName = (differentPackages) ? packageBaseName + i : packageBaseName;
+ createCDIComponent(component, baseName + i, packageName, necessaryParam);
+ }
+
+ }
+
+ /**
+ * Method that actually creates CDI component according to parameter
+ * @param component
+ * @param name
+ * @param packageName
+ * @param necessaryParam
+ */
+ private void createComponent(CDIWizardType component, String name,
+ String packageName, String necessaryParam) {
+ switch (component) {
+ case STEREOTYPE:
+ boolean alternative = false;
+ boolean regInBeansXml = false;
+ if (necessaryParam != null) {
+ if (necessaryParam.equals("alternative+beansxml")) {
+ alternative = true;
+ regInBeansXml = true;
+ } else if (necessaryParam.equals("alternative")) {
+ alternative = true;
+ }
+ }
+ wizardExt.stereotype(packageName, name, null, null, false, false, alternative,
regInBeansXml,
+ false).finish();
+ break;
+ case QUALIFIER:
+ wizardExt.qualifier(packageName, name, false, false).finish();
+ break;
+ case SCOPE:
+ wizardExt.scope(packageName, name, false, false, true, false).finish();
+ break;
+ case BEAN:
+ alternative = false;
+ regInBeansXml = false;
+ if (necessaryParam != null) {
+ if (necessaryParam.equals("alternative+beansxml")) {
+ alternative = true;
+ regInBeansXml = true;
+ } else if (necessaryParam.equals("alternative")) {
+ alternative = true;
+ }
+ }
+ wizardExt.bean(packageName, name, true, false, false, false, alternative,
regInBeansXml, null, null,
+ null, null).finish();
+ break;
+ case INTERCEPTOR:
+ wizardExt.interceptor(packageName, name, null, null, null, false).finish();
+ break;
+ case DECORATOR:
+ wizardExt.decorator(packageName, name, necessaryParam, null, true, false, false,
false)
+ .finish();
+ break;
+ case ANNOTATION_LITERAL:
+ wizardExt.annLiteral(packageName, name, true, false, false, false, null).finish();
+ break;
+ case INTERCEPTOR_BINDING:
+ wizardExt.binding(packageName, name, null, true, false).finish();
+ break;
+ case BEANS_XML:
+ wizardExt.beansXML(packageName).finish();
+ break;
+ }
+ }
+
+}
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/NewJSFProjectWizard.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/NewJSFProjectWizard.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/NewJSFProjectWizard.java 2011-11-22
17:27:26 UTC (rev 36538)
@@ -0,0 +1,20 @@
+package org.jboss.tools.cdi.bot.test.uiutils.actions;
+
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.JSFWebProjectWizard;
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.Wizard;
+
+public class NewJSFProjectWizard extends NewFileWizardAction {
+
+ public NewJSFProjectWizard() {
+ super();
+ }
+
+ @Override
+ public JSFWebProjectWizard run() {
+ Wizard w = super.run();
+ w.selectTemplate("JBoss Tools Web", "JSF", "JSF
Project");
+ w.next();
+ return new JSFWebProjectWizard();
+ }
+
+}
Deleted:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizard.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizard.java 2011-11-22
16:44:21 UTC (rev 36537)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizard.java 2011-11-22
17:27:26 UTC (rev 36538)
@@ -1,137 +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.uiutils.wizards;
-
-import org.jboss.tools.cdi.bot.test.CDITestBase;
-import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType;
-
-public class CDIWizard extends CDITestBase{
-
- private CDIWizardBaseExt wizardExt = new CDIWizardBaseExt();
-
- /**
- * Method creates Java Annotation with selected name and package
- *
- * @param name
- * @param packageName
- */
- public void createAnnotation(String name, String packageName) {
- wizardExt.annotation(open, util, packageName, name);
- }
-
- /**
- * Method creates CDI component with workaround for beans.xml -
- * if component is beans.xml, editor is not set (there is no active editor by default)
- *
- * @param component
- * @param name
- * @param packageName
- * @param necessaryParam
- */
- public void createCDIComponent(CDIWizardType component, String name,
- String packageName, String necessaryParam) {
- createComponent(component, name, packageName, necessaryParam);
- util.waitForNonIgnoredJobs();
- /**
- * if beans.xml is created as first component in project,
- * it is not opened as default ==> there is no active editor
- */
- if (component != CDIWizardType.BEANS_XML) {
- setEd(bot.activeEditor().toTextEditor());
- }
- }
-
- /**
- * Method creates larger number("amount") of the same component.
- *
- * @param component
- * @param amount
- * @param baseName
- * @param packageBaseName
- * @param necessaryParam
- * @param differentPackages
- */
- public void createCDIComponents(CDIWizardType component, int amount, String baseName,
- String packageBaseName, String necessaryParam, boolean differentPackages) {
-
- for (int i = 1; i <= amount; i++) {
- String packageName = (differentPackages) ? packageBaseName + i : packageBaseName;
- createCDIComponent(component, baseName + i, packageName, necessaryParam);
- }
-
- }
-
- /**
- * Method that actually creates CDI component according to parameter
- *
- * @param component
- * @param name
- * @param packageName
- * @param necessaryParam
- */
- private void createComponent(CDIWizardType component, String name,
- String packageName, String necessaryParam) {
- switch (component) {
- case STEREOTYPE:
- boolean alternative = false;
- boolean regInBeansXml = false;
- if (necessaryParam != null) {
- if (necessaryParam.equals("alternative+beansxml")) {
- alternative = true;
- regInBeansXml = true;
- } else if (necessaryParam.equals("alternative")) {
- alternative = true;
- }
- }
- wizardExt.stereotype(packageName, name, null, null, false, false, alternative,
regInBeansXml,
- false).finish();
- break;
- case QUALIFIER:
- wizardExt.qualifier(packageName, name, false, false).finish();
- break;
- case SCOPE:
- wizardExt.scope(packageName, name, false, false, true, false).finish();
- break;
- case BEAN:
- alternative = false;
- regInBeansXml = false;
- if (necessaryParam != null) {
- if (necessaryParam.equals("alternative+beansxml")) {
- alternative = true;
- regInBeansXml = true;
- } else if (necessaryParam.equals("alternative")) {
- alternative = true;
- }
- }
- wizardExt.bean(packageName, name, true, false, false, false, alternative,
regInBeansXml, null, null,
- null, null).finish();
- break;
- case INTERCEPTOR:
- wizardExt.interceptor(packageName, name, null, null, null, false).finish();
- break;
- case DECORATOR:
- wizardExt.decorator(packageName, name, necessaryParam, null, true, false, false,
false)
- .finish();
- break;
- case ANNOTATION_LITERAL:
- wizardExt.annLiteral(packageName, name, true, false, false, false, null).finish();
- break;
- case INTERCEPTOR_BINDING:
- wizardExt.binding(packageName, name, null, true, false).finish();
- break;
- case BEANS_XML:
- wizardExt.beansXML(packageName).finish();
- break;
- }
- }
-
-}
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/DynamicWebProjectWizard.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/DynamicWebProjectWizard.java 2011-11-22
16:44:21 UTC (rev 36537)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/DynamicWebProjectWizard.java 2011-11-22
17:27:26 UTC (rev 36538)
@@ -12,6 +12,9 @@
package org.jboss.tools.cdi.bot.test.uiutils.wizards;
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.jboss.tools.ui.bot.ext.Timing;
public class DynamicWebProjectWizard extends Wizard {
@@ -24,5 +27,31 @@
setText("Project name:", name);
return this;
}
+
+ public DynamicWebProjectWizard setCDIPreset() {
+ bot().comboBoxInGroup("Configuration", 0).
+ setSelection("Dynamic Web Project with CDI (Context and Dependency
Injection)");
+ return this;
+ }
+
+ public DynamicWebProjectWizard setCDIFacet() {
+ clickButton("Modify...");
+ SWTBot bot = bot().shell("Project Facets").bot();
+ setCDIFacetInFacets(bot);
+ bot().sleep(Timing.time1S());
+ return this;
+ }
+
+ private void setCDIFacetInFacets(SWTBot bot) {
+ SWTBotTree tree= bot.tree();
+ for (SWTBotTreeItem ti: tree.getAllItems()) {
+ if (ti.cell(0).contains("CDI (Contexts and Dependency Injection)")) {
+ ti.check();
+ break;
+ }
+ }
+ bot.sleep(Timing.time1S());
+ bot.button("OK").click();
+ }
}
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/JSFWebProjectWizard.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/JSFWebProjectWizard.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/JSFWebProjectWizard.java 2011-11-22
17:27:26 UTC (rev 36538)
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * 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.uiutils.wizards;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.jboss.tools.cdi.bot.test.annotations.JSFEnvironment;
+import org.jboss.tools.cdi.bot.test.annotations.JSFTemplate;
+
+public class JSFWebProjectWizard extends Wizard {
+
+ public JSFWebProjectWizard() {
+ super(new SWTBot().activeShell().widget);
+ assert ("New JSF Project").equals(getText());
+ }
+
+ public JSFWebProjectWizard setName(String name) {
+ setText("Project Name*", name);
+ return this;
+ }
+
+ public JSFWebProjectWizard setEnvironment(JSFEnvironment env) {
+ setTextInCombobox("JSF Environment*", env.getName());
+ return this;
+ }
+
+ public JSFWebProjectWizard setJSFTemplate(JSFTemplate template) {
+ setTextInCombobox("Template*", template.getName());
+ return this;
+ }
+
+}
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2011-11-22
16:44:21 UTC (rev 36537)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2011-11-22
17:27:26 UTC (rev 36538)
@@ -12,7 +12,6 @@
package org.jboss.tools.cdi.bot.test.uiutils.wizards;
import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
@@ -62,38 +61,10 @@
public boolean canFinish() {
return canClick("Finish");
}
-
- public Wizard setCDIPreset() {
- bot().comboBoxInGroup("Configuration", 0).
- setSelection("Dynamic Web Project with CDI (Context and Dependency
Injection)");
- return this;
- }
-
- public Wizard setCDIFacet() {
- clickButton("Modify...");
- SWTBot bot = bot().shell("Project Facets").bot();
- setCDIFacet(bot);
- bot().sleep(Timing.time1S());
- return this;
- }
-
- private void setCDIFacet(SWTBot bot) {
- SWTBotTree tree= bot.tree();
- for (SWTBotTreeItem ti: tree.getAllItems()) {
- if (ti.cell(0).contains("CDI (Contexts and Dependency Injection)")) {
- ti.check();
- break;
- }
- }
- bot.sleep(Timing.time1S());
- bot.button("OK").click();
- }
-
-
-
+
protected void clickButton(String text) {
bot().button(text).click();
- bot().sleep(500);
+ bot().sleep(Timing.time500MS());
}
protected void setText(String label, String text) {
@@ -105,4 +76,9 @@
protected boolean canClick(String button) {
return bot().button(button).isEnabled();
}
+
+ protected void setTextInCombobox(String combobox, String text) {
+ bot().comboBoxWithLabel(combobox).setSelection(text);
+ bot().sleep(Timing.time500MS());
+ }
}
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-11-22
16:44:21 UTC (rev 36537)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/ConfigurationPresetTest.java 2011-11-22
17:27:26 UTC (rev 36538)
@@ -14,8 +14,6 @@
import java.util.logging.Logger;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.jboss.tools.cdi.bot.test.CDIAllBotTests;
import org.jboss.tools.cdi.bot.test.CDISmokeBotTests;
import org.jboss.tools.cdi.bot.test.CDITestBase;
@@ -23,7 +21,6 @@
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.ContextMenuHelper;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
@@ -56,21 +53,7 @@
@Test
public void testCDIPreset() {
LOGGER.info("Dynamic Web Project with CDI Configuration Preset created");
- assertTrue(checkCDISupport(getProjectName()));
+ assertTrue(projectHelper.checkCDISupport(getProjectName()));
}
- private boolean checkCDISupport(String projectName) {
- projectExplorer.selectProject(projectName);
-
- SWTBotTree tree = projectExplorer.bot().tree();
- ContextMenuHelper.prepareTreeItemForContextMenu(tree);
- new
SWTBotMenu(ContextMenuHelper.getContextMenu(tree,"Properties",false)).click();
-
- bot.tree().expandNode("CDI (Context and Dependency Injection)
Settings").select();
- boolean isCDISupported = bot.checkBox().isChecked();
- bot.button("Cancel").click();
- return isCDISupported;
- }
-
-
}
5258
days inactive
5258
days old
jbosstools-commits@lists.jboss.org
0 comments
1 participants
participants (1)
-
jbosstools-commits＠lists.jboss.org