12:08 p.m.
Author: vrubezhny
Date: 2011-09-30 13:08:34 -0400 (Fri, 30 Sep 2011)
New Revision: 35231
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/OpenCDINamedBeanDialogTest.java
Log:
JBIDE-7892
Search for @Named beans.
JUnit test case is added
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-09-30
17:02:51 UTC (rev 35230)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-09-30
17:08:34 UTC (rev 35231)
@@ -27,7 +27,6 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IType;
import org.eclipse.jface.dialogs.DialogSettings;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/OpenCDINamedBeanDialogTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/OpenCDINamedBeanDialogTest.java 2011-09-30
17:02:51 UTC (rev 35230)
+++
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/OpenCDINamedBeanDialogTest.java 2011-09-30
17:08:34 UTC (rev 35231)
@@ -12,11 +12,14 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
import org.jboss.tools.cdi.ui.wizard.OpenCDINamedBeanDialog;
import org.jboss.tools.cdi.ui.wizard.OpenCDINamedBeanDialog.CDINamedBeanWrapper;
+import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.test.util.JobUtils;
/**
@@ -33,26 +36,27 @@
project = ResourcesPlugin.getWorkspace().getRoot().getProject(TCKTest.PROJECT_NAME);
}
- public void testCDINamedBeanDialogSearch() {
- find("spi", "SpiderSize", true);
- find("bla", "blackWidow", false);
- find("lady", "ladybirdSpider", false);
+ public void testCDINamedBeanDialogSearch() throws CoreException {
+ find("spi", "SpiderSize", "OtherSpiderProducer.java",
true);
+ find("bla", "blackWidow", "BlackWidowProducer.java",
false);
+ find("lady", "ladybirdSpider", "SpiderProducer.java",
false);
}
- public void testCDINamedBeanDialogSearchShortHand() {
- find("s*ze", "SpiderSize", true);
- find("b*w", "blackWidow", false);
- find("*dSp*r", "ladybirdSpider", false);
- find("foo?", "foo3", false);
+ public void testCDINamedBeanDialogSearchShortHand() throws CoreException {
+ find("s*ze", "SpiderSize", "OtherSpiderProducer.java",
true);
+ find("b*w", "blackWidow", "SpiderProducer.java", false);
+ find("*dSp*r", "ladybirdSpider", "SpiderProducer.java",
false);
+ find("foo?", "foo3", "TestNamed.java", false);
}
- private void find(String pattern, String beanName, boolean wait){
+ private void find(String pattern, String beanName, String editorName, boolean wait)
throws CoreException{
OpenCDINamedBeanDialog dialog = new OpenCDINamedBeanDialog(
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
dialog.setBlockOnOpen(false);
dialog.setInitialPattern(pattern);
dialog.open();
+ IBean bean = null;
try {
dialog.startSearch();
if(wait){
@@ -66,13 +70,18 @@
assertTrue("Component "+beanName+" not found", objects.length !=
0);
- IBean bean = findNamedBean(objects, beanName);
+ bean = findNamedBean(objects, beanName);
assertNotNull("Component "+beanName+" not found with " + pattern,
bean);
} finally {
dialog.okPressed();
dialog.close();
}
+
+ bean.open();
+ TestUtil.waitForValidation();
+ IEditorPart resultEditor =
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ assertTrue("Unexpected editor is opened for CDI Named Bean '" +
bean.getName() + "': " + resultEditor.getTitle(),
editorName.equals(resultEditor.getTitle()));
}
private IBean findNamedBean(Object[] objects, String beanName) {