[jbosstools-commits] JBoss Tools SVN: r39718 - trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Wed Mar 21 11:32:59 EDT 2012
Author: jjankovi
Date: 2012-03-21 11:32:58 -0400 (Wed, 21 Mar 2012)
New Revision: 39718
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java
Log:
Modifying annotation tests to extend SolderAnnotationTestBase
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java 2012-03-21 15:32:26 UTC (rev 39717)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/DefaultBeansTest.java 2012-03-21 15:32:58 UTC (rev 39718)
@@ -13,11 +13,11 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
import org.jboss.tools.cdi.bot.test.CDIConstants;
-import org.jboss.tools.cdi.seam3.bot.test.base.SolderTestBase;
+import org.jboss.tools.cdi.seam3.bot.test.base.SolderAnnotationTestBase;
import org.jboss.tools.cdi.seam3.bot.test.uiutils.AssignableBeansDialog;
import org.junit.Test;
-public class DefaultBeansTest extends SolderTestBase {
+public class DefaultBeansTest extends SolderAnnotationTestBase {
@Override
public String getProjectName() {
@@ -35,7 +35,7 @@
public void testProperAssign() {
packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
- "cdi.seam", className);
+ getPackageName(), className);
assertFalse(openOnUtil.openOnByOption("managerImpl", className, CDIConstants.SHOW_ALL_ASSIGNABLE));
openOnUtil.openOnByOption("managerImpl", className, CDIConstants.OPEN_INJECT_BEAN);
@@ -48,11 +48,11 @@
@Test
public void testProperAssignAlternativesDeactive() {
- wizardExt.bean("cdi.seam", "ManagerImpl", true, false, false, false, true, false, null,
+ wizardExt.bean(getPackageName(), "ManagerImpl", true, false, false, false, true, false, null,
"Manager", null, null).finish();
packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
- "cdi.seam", className);
+ getPackageName(), className);
assertTrue(openOnUtil.openOnByOption("managerImpl", className, CDIConstants.SHOW_ALL_ASSIGNABLE));
@@ -78,11 +78,11 @@
@Test
public void testProperUnassign() {
- wizardExt.bean("cdi.seam", "ManagerImpl", true, false, false, false, false, false, null,
+ wizardExt.bean(getPackageName(), "ManagerImpl", true, false, false, false, false, false, null,
"Manager", null, null).finish();
packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
- "cdi.seam", className);
+ getPackageName(), className);
assertTrue(openOnUtil.openOnByOption("managerImpl", className, CDIConstants.SHOW_ALL_ASSIGNABLE));
@@ -108,11 +108,11 @@
@Test
public void testProperUnassignAlternativesActive() {
- wizardExt.bean("cdi.seam", "ManagerImpl", true, false, false, false, true, true, null,
+ wizardExt.bean(getPackageName(), "ManagerImpl", true, false, false, false, true, true, null,
"Manager", null, null).finish();
packageExplorer.openFile(getProjectName(), CDIConstants.SRC,
- "cdi.seam", className);
+ getPackageName(), className);
assertTrue(openOnUtil.openOnByOption("managerImpl", className, CDIConstants.SHOW_ALL_ASSIGNABLE));
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java 2012-03-21 15:32:26 UTC (rev 39717)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/ExactAnnotationTest.java 2012-03-21 15:32:58 UTC (rev 39718)
@@ -11,14 +11,12 @@
package org.jboss.tools.cdi.seam3.bot.test.tests;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.cdi.bot.test.CDIConstants;
-import org.jboss.tools.cdi.bot.test.annotations.ProblemsType;
-import org.jboss.tools.cdi.seam3.bot.test.base.SolderTestBase;
+import org.jboss.tools.cdi.seam3.bot.test.base.SolderAnnotationTestBase;
import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibraries;
import org.junit.Test;
-public class ExactAnnotationTest extends SolderTestBase {
+public class ExactAnnotationTest extends SolderAnnotationTestBase {
private String className = "Application.java";
@@ -63,37 +61,20 @@
importProjectWithLibrary(projectName, SeamLibraries.SOLDER);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
- "cdi.seam", className).toTextEditor());
+ getPackageName(), className).toTextEditor());
- testExactImproperValue(projectName);
+ testAnnotationImproperValue(projectName, false);
editResourceUtil.replaceInEditor(managerClass, peopleManager + ".class");
- testExactProperValue(projectName, peopleManager);
+ testAnnotationProperValue(projectName, peopleManager + ".class",
+ peopleManager, false, null);
-
bot.editorByTitle(className).show();
editResourceUtil.replaceInEditor(peopleManager + ".class", otherManager + ".class");
- testExactProperValue(projectName, otherManager);
+ testAnnotationProperValue(projectName, otherManager + ".class",
+ otherManager, false, null);
}
- private void testExactImproperValue(String projectName) {
-
- SWTBotTreeItem[] validationProblems = quickFixHelper.getProblems(ProblemsType.WARNINGS, projectName);
- assertTrue(validationProblems.length > 0);
- assertTrue(validationProblems.length == 1);
- assertContains(CDIConstants.MULTIPLE_BEANS, validationProblems[0].getText());
-
- }
-
- private void testExactProperValue(String projectName, String value) {
-
- SWTBotTreeItem[] validationProblems = quickFixHelper.getProblems(ProblemsType.WARNINGS, projectName);
- assertTrue(validationProblems.length == 0);
- assertTrue(openOnUtil.openOnByOption(value + ".class", className, CDIConstants.OPEN_INJECT_BEAN));
- assertTrue(getEd().getTitle().equals(value + ".java"));
-
- }
-
}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java 2012-03-21 15:32:26 UTC (rev 39717)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/VetoAnnotationTest.java 2012-03-21 15:32:58 UTC (rev 39718)
@@ -11,17 +11,13 @@
package org.jboss.tools.cdi.seam3.bot.test.tests;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.cdi.bot.test.CDIConstants;
-import org.jboss.tools.cdi.bot.test.annotations.ProblemsType;
-import org.jboss.tools.cdi.seam3.bot.test.base.SolderTestBase;
+import org.jboss.tools.cdi.seam3.bot.test.base.SolderAnnotationTestBase;
import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibraries;
import org.junit.Test;
-public class VetoAnnotationTest extends SolderTestBase {
+public class VetoAnnotationTest extends SolderAnnotationTestBase {
- private String APPLICATION_CLASS = "Application.java";
-
@Override
public String getProjectName() {
return "veto1";
@@ -47,16 +43,16 @@
importProjectWithLibrary(projectName, SeamLibraries.SOLDER);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
- "cdi.seam", APPLICATION_CLASS).toTextEditor());
+ getPackageName(), APPLICATION_CLASS).toTextEditor());
- testVetoAnnotationImproperValue(projectName);
+ testAnnotationImproperValue(projectName, true);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
- "cdi.seam", otherBean + ".java").toTextEditor());
+ getPackageName(), otherBean + ".java").toTextEditor());
editResourceUtil.replaceInEditor("public class " + otherBean,
"public class " + otherBean + " extends " + vetoBean);
- testVetoAnnotationProperValue(projectName, "bean", otherBean, false, null);
+ testAnnotationProperValue(projectName, "bean", otherBean, false, null);
}
@@ -70,16 +66,16 @@
importProjectWithLibrary(projectName, SeamLibraries.SOLDER);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
- "cdi.seam", APPLICATION_CLASS).toTextEditor());
+ getPackageName(), APPLICATION_CLASS).toTextEditor());
- testVetoAnnotationImproperValue(projectName);
+ testAnnotationImproperValue(projectName, true);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
- "cdi.seam", otherBean + ".java").toTextEditor());
+ getPackageName(), otherBean + ".java").toTextEditor());
editResourceUtil.replaceInEditor("public class " + otherBean,
"public class " + otherBean + " extends " + vetoBean);
- testVetoAnnotationProperValue(projectName, "bean", otherBean, false, null);
+ testAnnotationProperValue(projectName, "bean", otherBean, false, null);
}
@@ -92,16 +88,16 @@
importProjectWithLibrary(projectName, SeamLibraries.SOLDER);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
- "cdi.seam", APPLICATION_CLASS).toTextEditor());
+ getPackageName(), APPLICATION_CLASS).toTextEditor());
- testVetoAnnotationImproperValue(projectName);
+ testAnnotationImproperValue(projectName, true);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
- "cdi.seam", vetoBean + ".java").toTextEditor());
+ getPackageName(), vetoBean + ".java").toTextEditor());
editResourceUtil.replaceInEditor("@Veto", "");
editResourceUtil.replaceInEditor("import org.jboss.seam.solder.core.Veto;", "");
- testVetoAnnotationProperValue(projectName, "manager", vetoBean,
+ testAnnotationProperValue(projectName, "manager", vetoBean,
true, "getManager");
}
@@ -115,16 +111,16 @@
importProjectWithLibrary(projectName, SeamLibraries.SOLDER);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
- "cdi.seam", APPLICATION_CLASS).toTextEditor());
+ getPackageName(), APPLICATION_CLASS).toTextEditor());
- testVetoAnnotationImproperValue(projectName);
+ testAnnotationImproperValue(projectName, true);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
- "cdi.seam", vetoBean + ".java").toTextEditor());
+ getPackageName(), vetoBean + ".java").toTextEditor());
editResourceUtil.replaceInEditor("@Veto", "");
editResourceUtil.replaceInEditor("import org.jboss.seam.solder.core.Veto;", "");
- testVetoAnnotationProperValue(projectName, "manager", vetoBean,
+ testAnnotationProperValue(projectName, "manager", vetoBean,
true, "manager");
}
@@ -139,13 +135,13 @@
importProjectWithLibrary(projectName, SeamLibraries.SOLDER);
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
- "cdi.seam", APPLICATION_CLASS).toTextEditor());
+ getPackageName(), APPLICATION_CLASS).toTextEditor());
assertFalse(openOnUtil.openOnByOption(eventAttribute, APPLICATION_CLASS,
CDIConstants.OPEN_CDI_OBSERVER_METHOD));
setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
- "cdi.seam", vetoBean + ".java").toTextEditor());
+ getPackageName(), vetoBean + ".java").toTextEditor());
editResourceUtil.replaceInEditor("@Veto", "");
editResourceUtil.replaceInEditor("import org.jboss.seam.solder.core.Veto;", "");
@@ -156,26 +152,4 @@
}
- private void testVetoAnnotationImproperValue(String projectName) {
-
- SWTBotTreeItem[] validationProblems = quickFixHelper.getProblems(
- ProblemsType.WARNINGS, projectName);
- assertTrue(validationProblems.length > 0);
- assertTrue(validationProblems.length == 1);
- assertContains(CDIConstants.NO_BEAN_IS_ELIGIBLE, validationProblems[0].getText());
-
- }
-
- private void testVetoAnnotationProperValue(String projectName, String openOnString, String openedClass,
- boolean producer, String producerMethod) {
- SWTBotTreeItem[] validationProblems = quickFixHelper.getProblems(
- ProblemsType.WARNINGS, projectName);
- assertTrue(validationProblems.length == 0);
- assertTrue(openOnUtil.openOnByOption(openOnString, APPLICATION_CLASS, CDIConstants.OPEN_INJECT_BEAN));
- assertTrue(getEd().getTitle().equals(openedClass + ".java"));
- if (producer) {
- assertTrue(getEd().getSelection().equals(producerMethod));
- }
- }
-
}
More information about the jbosstools-commits
mailing list