5:07 a.m.
Author: jjankovi
Date: 2011-11-23 06:07:33 -0500 (Wed, 23 Nov 2011)
New Revision: 36564
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml.cdi
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/NamedRefactoringTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/NewXHTMLFileWizard.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/XHTMLDialogWizard.java
Removed:
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/jsf/ELNamedRefactoring.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/annotations/JSFTemplate.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/jsf/JSFTestBase.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/BeanValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/DecoratorValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/IBindingValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/InterceptorValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QualifierValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/ScopeValidationQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java
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/uiutils/wizards/Wizard.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
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/todo.txt
Log:
XHTML action and XHTML wizard added
Deleted: 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 2011-11-23
09:41:50 UTC (rev 36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml 2011-11-23
11:07:33 UTC (rev 36564)
@@ -1,14 +0,0 @@
-<!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>
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml.cdi
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml.cdi
(rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/jsf/index.xhtml.cdi 2011-11-23
11:07:33 UTC (rev 36564)
@@ -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>
\ 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-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -12,7 +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.jsf.NamedRefactoringTest;
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;
@@ -57,23 +57,23 @@
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
// PerspectiveTest.class,
- ConfigurationPresetTest.class,
- FacetTest.class,
- WizardTest.class,
- BeansEditorTest.class,
- ELNamedRefactoring.class,
- BeansXMLValidationTest.class,
+// ConfigurationPresetTest.class,
+// FacetTest.class,
+// WizardTest.class,
+// BeansEditorTest.class,
+ NamedRefactoringTest.class,
+// BeansXMLValidationTest.class,
// BeansXMLCompletionTest.class,
- StereotypeValidationQuickFixTest.class,
- QualifierValidationQuickFixTest.class,
- ScopeValidationQuickFixTest.class,
- BeanValidationQuickFixTest.class,
- InterceptorValidationQuickFixTest.class,
- DecoratorValidationQuickFixTest.class,
- IBindingValidationQuickFixTest.class,
- OpenOnTest.class,
- FindObserverForEventTest.class,
- Seam3Test.class
+// StereotypeValidationQuickFixTest.class,
+// QualifierValidationQuickFixTest.class,
+// ScopeValidationQuickFixTest.class,
+// BeanValidationQuickFixTest.class,
+// InterceptorValidationQuickFixTest.class,
+// DecoratorValidationQuickFixTest.class,
+// IBindingValidationQuickFixTest.class,
+// OpenOnTest.class,
+// FindObserverForEventTest.class,
+// Seam3Test.class
})
public class CDIAllBotTests extends CDITestBase {
Modified:
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 2011-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/annotations/JSFTemplate.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -2,13 +2,20 @@
public enum JSFTemplate {
- BLANK, KICKSTART;
+ BLANK_LIBS, BLANK_NO_LIBS,
+ KICKSTART_LIBS, KICKSTART_RI_LIBS, KICKSTART_NO_LIBS;
public String getName() {
switch (this) {
- case BLANK:
+ case BLANK_LIBS:
+ return "JSFBlankWithLibs";
+ case BLANK_NO_LIBS:
return "JSFBlankWithoutLibs";
- case KICKSTART:
+ case KICKSTART_LIBS:
+ return "JSFKickStartWithLibs";
+ case KICKSTART_RI_LIBS:
+ return "JSFKickStartWithRILibs";
+ case KICKSTART_NO_LIBS:
return "JSFKickStartWithoutLibs";
default:
throw new AssertionError("Unknown type");
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-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLCompletionTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -36,7 +36,9 @@
*
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class BeansXMLCompletionTest extends CDITestBase {
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-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/beansxml/BeansXMLValidationTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -32,7 +32,9 @@
*
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class BeansXMLValidationTest extends CDITestBase {
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-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/editor/BeansEditorTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -48,7 +48,9 @@
* @author Lukas Jungmann
* @author jjankovi
*/
-@Require(clearProjects = false, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class BeansEditorTest extends CDITestBase {
Deleted:
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 2011-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/ELNamedRefactoring.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -1,48 +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.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()));
-
- }
-
-}
Modified:
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 2011-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/JSFTestBase.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -15,11 +15,14 @@
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.jboss.tools.cdi.bot.test.uiutils.actions.NewXHTMLFileWizard;
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.XHTMLDialogWizard;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.junit.Before;
public class JSFTestBase extends CDITestBase {
- private JSFEnvironment env = JSFEnvironment.JSF_11;
+ private JSFEnvironment env = JSFEnvironment.JSF_20;
public JSFEnvironment getEnv() {
return env;
@@ -33,6 +36,14 @@
}
}
+
+ protected void createXHTMLPage(String pageName) {
+ XHTMLDialogWizard xhtmlWizard = new NewXHTMLFileWizard().run();
+ xhtmlWizard.setName(pageName).finish();
+ bot.sleep(Timing.time3S());
+ util.waitForNonIgnoredJobs();
+ setEd(bot.activeEditor().toTextEditor());
+ }
private void createJSFProjectWithCDISupport(String projectName, JSFEnvironment env) {
@@ -45,7 +56,7 @@
new NewJSFProjectWizard().run().
setName(getProjectName()).
setEnvironment(env).
- setJSFTemplate(JSFTemplate.KICKSTART).finish();
+ setJSFTemplate(JSFTemplate.BLANK_LIBS).finish();
util.waitForNonIgnoredJobs();
}
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/NamedRefactoringTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/NamedRefactoringTest.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/jsf/NamedRefactoringTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * 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.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 EL named refactoring
+ *
+ * @author Jaroslav Jankovic
+ *
+ */
+
+@Require(clearProjects = true, perspective = "Web Development",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
+(a)RunWith(RequirementAwareSuite.class)
+@SuiteClasses({ CDIAllBotTests.class })
+public class NamedRefactoringTest extends JSFTestBase {
+
+ @Override
+ public String getProjectName() {
+ return "CDIRefactoring";
+ }
+
+ @Test
+ public void testNamedAnnotation() {
+
+ wizard.createCDIComponent(CDIWizardType.BEAN, "ManagedBean",
getPackageName(), null);
+ editResourceUtil.replaceClassContentByResource(NamedRefactoringTest.class.
+ getResourceAsStream("/resources/jsf/ManagedBean.java.cdi"), false);
+
+ createXHTMLPage("index.xhtml");
+ editResourceUtil.replaceClassContentByResource(NamedRefactoringTest.class.
+ getResourceAsStream("/resources/jsf/index.xhtml.cdi"), false);
+
+
+
+ }
+
+}
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-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/FindObserverForEventTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -31,7 +31,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class FindObserverForEventTest extends OpenOnBase {
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-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/openon/OpenOnTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -32,7 +32,9 @@
*
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class OpenOnTest extends OpenOnBase {
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/BeanValidationQuickFixTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/BeanValidationQuickFixTest.java 2011-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/BeanValidationQuickFixTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -29,7 +29,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@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/DecoratorValidationQuickFixTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/DecoratorValidationQuickFixTest.java 2011-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/DecoratorValidationQuickFixTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -29,7 +29,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@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/IBindingValidationQuickFixTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/IBindingValidationQuickFixTest.java 2011-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/IBindingValidationQuickFixTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -29,7 +29,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@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/InterceptorValidationQuickFixTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/InterceptorValidationQuickFixTest.java 2011-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/InterceptorValidationQuickFixTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -29,7 +29,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@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/QualifierValidationQuickFixTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QualifierValidationQuickFixTest.java 2011-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/QualifierValidationQuickFixTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -29,7 +29,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class QualifierValidationQuickFixTest extends QuickFixTestBase {
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/ScopeValidationQuickFixTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/ScopeValidationQuickFixTest.java 2011-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/ScopeValidationQuickFixTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -29,7 +29,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class ScopeValidationQuickFixTest extends QuickFixTestBase {
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java 2011-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/StereotypeValidationQuickFixTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -29,7 +29,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class StereotypeValidationQuickFixTest extends QuickFixTestBase {
Modified:
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-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/seam3/Seam3Test.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -35,7 +35,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class })
public class Seam3Test extends CDITestBase {
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/NewXHTMLFileWizard.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/NewXHTMLFileWizard.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/NewXHTMLFileWizard.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -0,0 +1,20 @@
+package org.jboss.tools.cdi.bot.test.uiutils.actions;
+
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.Wizard;
+import org.jboss.tools.cdi.bot.test.uiutils.wizards.XHTMLDialogWizard;
+
+public class NewXHTMLFileWizard extends NewFileWizardAction{
+
+ public NewXHTMLFileWizard() {
+ super();
+ }
+
+ @Override
+ public XHTMLDialogWizard run() {
+ Wizard w = super.run();
+ w.selectTemplate("JBoss Tools Web", "XHTML Page");
+ w.next();
+ return new XHTMLDialogWizard();
+ }
+
+}
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-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -62,6 +62,16 @@
return canClick("Finish");
}
+ protected void checkCheckbox(String text) {
+ bot().checkBoxWithLabel(text).select();
+ bot().sleep(Timing.time500MS());
+ }
+
+ protected void uncheckCheckbox(String text) {
+ bot().checkBoxWithLabel(text).deselect();
+ bot().sleep(Timing.time500MS());
+ }
+
protected void clickButton(String text) {
bot().button(text).click();
bot().sleep(Timing.time500MS());
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/XHTMLDialogWizard.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/XHTMLDialogWizard.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/XHTMLDialogWizard.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -0,0 +1,38 @@
+package org.jboss.tools.cdi.bot.test.uiutils.wizards;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTableItem;
+
+public class XHTMLDialogWizard extends Wizard {
+
+ public XHTMLDialogWizard() {
+ super(new SWTBot().activeShell().widget);
+ assert ("New XHTML Page").equals(getText());
+ }
+
+ public XHTMLDialogWizard setName(String nameOfPage) {
+ setText("File name:", nameOfPage);
+ return this;
+ }
+
+ public XHTMLDialogWizard checkXHTMLTemplate() {
+ checkCheckbox("Use XHTML Template");
+ return this;
+ }
+
+ public XHTMLDialogWizard setXHTMLTemplate(SWTBotTableItem template) {
+ template.select();
+ return this;
+ }
+
+ public SWTBotTableItem[] getTemplates() {
+ SWTBotTable templateTable = bot().table(0);
+ SWTBotTableItem[] templates = new SWTBotTableItem[templateTable.rowCount()];
+ for (int i = 0; i < templateTable.rowCount(); i++) {
+ templates[i] = templateTable.getTableItem(i);
+ }
+ return templates;
+ }
+
+}
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-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/ConfigurationPresetTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -31,7 +31,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class , CDISmokeBotTests.class })
public class ConfigurationPresetTest extends CDITestBase {
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-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/FacetTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -30,7 +30,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class , CDISmokeBotTests.class })
public class FacetTest extends CDITestBase {
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-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/PerspectiveTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -38,7 +38,9 @@
* @author Jaroslav Jankovic
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class, CDISmokeBotTests.class })
public class PerspectiveTest extends CDITestBase {
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-11-23
09:41:50 UTC (rev 36563)
+++
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/wizard/WizardTest.java 2011-11-23
11:07:33 UTC (rev 36564)
@@ -35,7 +35,9 @@
* @author Lukas Jungmann
* @author jjankovi
*/
-@Require(clearProjects = true, perspective = "Java EE", server = @Server(state
= ServerState.NotRunning, version = "6.0", operator = ">="))
+@Require(clearProjects = true, perspective = "Java EE",
+ server = @Server(state = ServerState.NotRunning,
+ version = "6.0", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ CDIAllBotTests.class, CDISmokeBotTests.class })
public class WizardTest extends CDITestBase {
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/todo.txt
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/todo.txt 2011-11-23 09:41:50 UTC (rev
36563)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/todo.txt 2011-11-23 11:07:33 UTC (rev
36564)
@@ -1,31 +1,32 @@
-/**
- * what tests have to be done(JBDS50_0010):
- * 1. Validations works good for Inconsistent specialization,
- Ambiguous EL names, Unproxyable bean types, Decorator resolution
- * 2. Code completion works in beans.xml
- * 3. Complex test from Weld is working in JBDS and CDI functionality works without
errors
- * 4. CDI @Named beans are renamed via refactoring and shows up correctly
- * when using Find References for EL Expressions
- * 5. Create new decorator from existing Web Bean
- * 6. EL refactoring for @Named beans works
- *
- *
- * what tests have to be done(JBDS50_0015):
- * 1. OpenOn works for injected classes
- * 2. OpenOn works in Seam Config for given beans
- * 3. OpenOn works for Bean injected into java source files declard in seam-config.xml
can be navigated
- * 4. Seam-beans.xml validation works
- * 5. Seam3 not-trivial example works with JBDS without errors and as expected
- * 6. Wel extension(beans_1_1.xsd) is now supported by beans.xml editor
- * 7. Non-serializable passivating-scoped beans are now validated correctly
- * 8. Code completion and validation works in seam config for annotated CDI beans
- * 9. Seam3 features is enabled automatically for CDI support enabled project containing
corresponding Seam module
- * 10.CDI supports Seam3 annotations
(@Veto,@Requires,@Exact,@MessageLogger,@MessageBundle
- * @DefaultBean,@Unwraps,@ServiceHandlerType,@FullyQualified,@Resource)
- * 11.CDI tools can work with generic beans and validation, code completion, hyperlinks,
- * refactoring is working as expected
- */
+ what tests have to be done(JBDS50_0010):
+ * Validations works good for Inconsistent specialization,
+ Ambiguous EL names, Unproxyable bean types, Decorator resolution
+ * Code completion works in beans.xml
+ * Quick fixes for problem markers in
beans.xml(https://issues.jboss.org/browse/JBIDE-9833)
+ * Complex test from Weld is working in JBDS and CDI functionality works without
errors
+ * CDI @Named beans are renamed via refactoring and shows up correctly
+ when using Find References for EL Expressions
+ * Create new decorator from existing Web Bean
+ * EL refactoring for @Named beans works
+
+
+ what tests have to be done(JBDS50_0015):
+ * OpenOn works for injected classes
+ * OpenOn works in Seam Config for given beans
+ * OpenOn works for Bean injected into java source files declard in seam-config.xml can
be navigated
+ * Seam-beans.xml validation works
+ * Seam3 not-trivial example works with JBDS without errors and as expected
+ * Wel extension(beans_1_1.xsd) is now supported by beans.xml editor
+ * Non-serializable passivating-scoped beans are now validated correctly
+ * Code completion and validation works in seam config for annotated CDI beans
+ * Seam3 features is enabled automatically for CDI support enabled project containing
corresponding Seam module
+ * CDI supports Seam3 annotations (@Veto,@Requires,@Exact,@MessageLogger,@MessageBundle
+ @DefaultBean,@Unwraps,@ServiceHandlerType,@FullyQualified,@Resource)
+ * CDI tools can work with generic beans and validation, code completion, hyperlinks,
+ refactoring is working as expected
+
+
UI tests to implement for CDI (based on F2F meeting)
hyperlinks (...open ons etc)