[jbosstools-commits] JBoss Tools SVN: r39825 - in trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test: tests and 1 other directory.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Mar 26 09:38:06 EDT 2012
Author: jjankovi
Date: 2012-03-26 09:38:05 -0400 (Mon, 26 Mar 2012)
New Revision: 39825
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java
trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java
Log:
Implementation of FullyQualifiedTest bot test finished
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java 2012-03-26 13:37:02 UTC (rev 39824)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/base/Seam3TestBase.java 2012-03-26 13:38:05 UTC (rev 39825)
@@ -37,8 +37,9 @@
private String packageName = "cdi.seam";
protected final LibraryHelper libraryHelper = new LibraryHelper();
- protected final ProjectImportHelper projectImportHelper = new ProjectImportHelper();
+ protected final ProjectImportHelper projectImportHelper = new ProjectImportHelper();
+
protected String getProjectName() {
return projectName;
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java 2012-03-26 13:37:02 UTC (rev 39824)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam3.bot.test/src/org/jboss/tools/cdi/seam3/bot/test/tests/FullyQualifiedTest.java 2012-03-26 13:38:05 UTC (rev 39825)
@@ -11,12 +11,21 @@
package org.jboss.tools.cdi.seam3.bot.test.tests;
+import java.util.Arrays;
+import java.util.List;
+
+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.bot.test.uiutils.CollectionsUtil;
import org.jboss.tools.cdi.seam3.bot.test.base.SolderTestBase;
+import org.jboss.tools.cdi.seam3.bot.test.util.SeamLibraries;
import org.junit.Test;
-
public class FullyQualifiedTest extends SolderTestBase {
+ private String APPLICATION_CLASS = "Application.java";
+
@Override
public String getProjectName() {
return "fullyQualified";
@@ -32,50 +41,244 @@
}
- // should be error
@Test
public void testNonNamedBean() {
+
+ String projectName = "fullyQualified1";
+ importProjectWithLibrary(projectName, SeamLibraries.SOLDER);
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), APPLICATION_CLASS).toTextEditor());
+
+ List<String> beansProposal = editResourceUtil.getProposalList(APPLICATION_CLASS,
+ "\"#{}\"", 3, 0);
+ List<String> nonexpectedList = Arrays.asList("cdi.seam.manager : Manager");
+ assertTrue(CollectionsUtil.checkNoMatch(beansProposal, nonexpectedList));
+
}
- // all beans in that package are fully qualified
+
@Test
public void testQualifiedPackage() {
+ String projectName = "fullyQualified2";
+
+ importProjectWithLibrary(projectName, SeamLibraries.SOLDER);
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), APPLICATION_CLASS).toTextEditor());
+
+ List<String> beansProposal = editResourceUtil.getProposalList(APPLICATION_CLASS,
+ "\"#{}\"", 3, 0);
+ List<String> nonexpectedList = Arrays.asList("cdi.test.myBean3 : MyBean3",
+ "cdi.test.myBean4 : MyBean4");
+ assertTrue(CollectionsUtil.checkNoMatch(beansProposal, nonexpectedList));
+
+ List<String> expectedList = Arrays.asList("cdi.seam.myBean1 : MyBean1",
+ "cdi.seam.myBean2 : MyBean2");
+ assertTrue(CollectionsUtil.checkMatch(beansProposal, expectedList));
+
+ expectedList = Arrays.asList("myBean3 : MyBean3",
+ "myBean4 : MyBean4");
+ assertTrue(CollectionsUtil.checkMatch(beansProposal, expectedList));
+
}
- // should be ok
+
@Test
public void testDifferentExistedPackage() {
+ String projectName = "fullyQualified3";
+
+ importProjectWithLibrary(projectName, SeamLibraries.SOLDER);
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), APPLICATION_CLASS).toTextEditor());
+
+ List<String> beansProposal = editResourceUtil.getProposalList(APPLICATION_CLASS,
+ "\"#{}\"", 3, 0);
+ List<String> nonexpectedList = Arrays.asList("cdi.seam.myBean1 : MyBean1");
+ assertTrue(CollectionsUtil.checkNoMatch(beansProposal, nonexpectedList));
+
+ List<String> expectedList = Arrays.asList("cdi.test.myBean1 : MyBean1");
+ assertTrue(CollectionsUtil.checkMatch(beansProposal, expectedList));
+
}
- // should be error
+
@Test
public void testDifferentNonExistedPackage() {
- }
- // should be ok
- @Test
- public void testDifferentExistedClass() {
+ String projectName = "fullyQualified4";
+ String myBean1 = "MyBean1.java";
- }
- // should be error
- @Test
- public void testDifferentNonExistedClass() {
+ importProjectWithLibrary(projectName, SeamLibraries.SOLDER);
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), myBean1).toTextEditor());
+
+ SWTBotTreeItem[] validationProblems = quickFixHelper.getProblems(
+ ProblemsType.ERRORS, projectName);
+ assertTrue(validationProblems.length > 0);
+ assertTrue(validationProblems.length == 1);
+ assertTrue(validationProblems[0].getText().contains("cannot be resolved to a type"));
+
+ editResourceUtil.replaceInEditor("cdi.test.MyBean1", "cdi.seam.MyBean2");
+ validationProblems = quickFixHelper.getProblems(
+ ProblemsType.ERRORS, projectName);
+ assertTrue(validationProblems.length > 0);
+ assertTrue(validationProblems.length == 1);
+ assertTrue(validationProblems[0].getText().contains("cannot be resolved to a type"));
+
}
- // should be ok
+
@Test
- public void testNamedBean() {
+ public void testFullyNamedBean() {
+ String projectName = "fullyQualified5";
+
+ importProjectWithLibrary(projectName, SeamLibraries.SOLDER);
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), APPLICATION_CLASS).toTextEditor());
+
+ List<String> beansProposal = editResourceUtil.getProposalList(APPLICATION_CLASS,
+ "\"#{}\"", 3, 0);
+ List<String> nonexpectedList = Arrays.asList("cdi.seam.myBean1 : MyBean1");
+ assertTrue(CollectionsUtil.checkNoMatch(beansProposal, nonexpectedList));
+
+ List<String> expectedList = Arrays.asList("cdi.seam.bean : MyBean1");
+ assertTrue(CollectionsUtil.checkMatch(beansProposal, expectedList));
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), "MyBean1.java").toTextEditor());
+
+ editResourceUtil.replaceInEditor("@FullyQualified",
+ "@FullyQualified(cdi.test.MyBean2.class)");
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), APPLICATION_CLASS).toTextEditor());
+ beansProposal = editResourceUtil.getProposalList(APPLICATION_CLASS,
+ "\"#{}\"", 3, 0);
+
+ nonexpectedList = Arrays.asList("cdi.seam.bean : MyBean1");
+ assertTrue(CollectionsUtil.checkNoMatch(beansProposal, nonexpectedList));
+
+ expectedList = Arrays.asList("cdi.test.bean : MyBean1");
+ assertTrue(CollectionsUtil.checkMatch(beansProposal, expectedList));
+
}
- // should be ok
+
@Test
public void testProducerMethod() {
+ String projectName = "fullyQualified6";
+
+ importProjectWithLibrary(projectName, SeamLibraries.SOLDER);
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), APPLICATION_CLASS).toTextEditor());
+
+ List<String> beansProposal = editResourceUtil.getProposalList(APPLICATION_CLASS,
+ "\"#{}\"", 3, 0);
+ List<String> nonexpectedList = Arrays.asList("cdi.seam.myBean1 : MyBean1",
+ "cdi.seam.myBean1 : MyBean1 - MyBean1", "cdi.seam.myBean1 : bean - MyBean1");
+ assertTrue(CollectionsUtil.checkNoMatch(beansProposal, nonexpectedList));
+
+ List<String> expectedList = Arrays.asList("cdi.seam.uniqueBean : MyBean1 - MyBean1");
+ assertTrue(CollectionsUtil.checkMatch(beansProposal, expectedList));
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), "MyBean1.java").toTextEditor());
+
+ editResourceUtil.replaceInEditor("@Named",
+ "@Named(\"bean\")");
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), APPLICATION_CLASS).toTextEditor());
+ beansProposal = editResourceUtil.getProposalList(APPLICATION_CLASS,
+ "\"#{}\"", 3, 0);
+
+ nonexpectedList = Arrays.asList("cdi.seam.uniqueBean : MyBean1 - MyBean1");
+ assertTrue(CollectionsUtil.checkNoMatch(beansProposal, nonexpectedList));
+
+ expectedList = Arrays.asList("cdi.seam.bean : MyBean1 - MyBean1");
+ assertTrue(CollectionsUtil.checkMatch(beansProposal, expectedList));
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), "MyBean1.java").toTextEditor());
+
+ editResourceUtil.replaceInEditor("@FullyQualified",
+ "@FullyQualified(cdi.test.MyBean2.class)");
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), APPLICATION_CLASS).toTextEditor());
+ beansProposal = editResourceUtil.getProposalList(APPLICATION_CLASS,
+ "\"#{}\"", 3, 0);
+
+ nonexpectedList = Arrays.asList("cdi.seam.uniqueBean : MyBean1 - MyBean1",
+ "cdi.seam.bean : MyBean1 - MyBean1");
+ assertTrue(CollectionsUtil.checkNoMatch(beansProposal, nonexpectedList));
+
+ expectedList = Arrays.asList("cdi.test.bean : MyBean1 - MyBean1");
+ assertTrue(CollectionsUtil.checkMatch(beansProposal, expectedList));
+
}
- // should be ok
+
@Test
public void testProducerField() {
+ String projectName = "fullyQualified7";
+
+ importProjectWithLibrary(projectName, SeamLibraries.SOLDER);
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), APPLICATION_CLASS).toTextEditor());
+
+ List<String> beansProposal = editResourceUtil.getProposalList(APPLICATION_CLASS,
+ "\"#{}\"", 3, 0);
+ List<String> nonexpectedList = Arrays.asList("cdi.seam.myBean1 : MyBean1",
+ "cdi.seam.myBean1 : MyBean1 - MyBean1", "cdi.seam.myBean1 : bean - MyBean1");
+ assertTrue(CollectionsUtil.checkNoMatch(beansProposal, nonexpectedList));
+
+ List<String> expectedList = Arrays.asList("cdi.seam.uniqueBean : MyBean1 - MyBean1");
+ assertTrue(CollectionsUtil.checkMatch(beansProposal, expectedList));
+
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), "MyBean1.java").toTextEditor());
+
+ editResourceUtil.replaceInEditor("@FullyQualified",
+ "@FullyQualified(cdi.test.MyBean2.class)");
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), APPLICATION_CLASS).toTextEditor());
+ beansProposal = editResourceUtil.getProposalList(APPLICATION_CLASS,
+ "\"#{}\"", 3, 0);
+
+ nonexpectedList = Arrays.asList("cdi.seam.uniqueBean : MyBean1 - MyBean1",
+ "cdi.seam.bean : MyBean1 - MyBean1", "cdi.test.bean : MyBean1 - MyBean1");
+ assertTrue(CollectionsUtil.checkNoMatch(beansProposal, nonexpectedList));
+
+ expectedList = Arrays.asList("cdi.test.uniqueBean : MyBean1 - MyBean1");
+ assertTrue(CollectionsUtil.checkMatch(beansProposal, expectedList));
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), "MyBean1.java").toTextEditor());
+
+ editResourceUtil.replaceInEditor("@Named",
+ "@Named(\"bean\")");
+
+ setEd(packageExplorer.openFile(projectName, CDIConstants.SRC,
+ getPackageName(), APPLICATION_CLASS).toTextEditor());
+ beansProposal = editResourceUtil.getProposalList(APPLICATION_CLASS,
+ "\"#{}\"", 3, 0);
+
+ nonexpectedList = Arrays.asList("cdi.seam.uniqueBean : MyBean1 - MyBean1",
+ "cdi.seam.bean : MyBean1 - MyBean1", "cdi.test.uniqueBean : MyBean1 - MyBean1");
+ assertTrue(CollectionsUtil.checkNoMatch(beansProposal, nonexpectedList));
+
+ expectedList = Arrays.asList("cdi.test.bean : MyBean1 - MyBean1");
+ assertTrue(CollectionsUtil.checkMatch(beansProposal, expectedList));
+
}
}
More information about the jbosstools-commits
mailing list