[jbosstools-commits] JBoss Tools SVN: r30653 - in trunk/cdi/tests/org.jboss.tools.cdi.ui.test: src/org/jboss/tools/cdi/ui/test/search and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: dazarov
Date: 2011-04-18 19:30:39 -0400 (Mon, 18 Apr 2011)
New Revision: 30653

Modified:
   trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
   trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java
Log:
https://issues.jboss.org/browse/JBIDE-8705, https://issues.jboss.org/browse/JBIDE-8704

Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF	2011-04-18 23:13:51 UTC (rev 30652)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF	2011-04-18 23:30:39 UTC (rev 30653)
@@ -24,5 +24,6 @@
  org.eclipse.ui.ide,
  org.jboss.tools.jst.jsp.base.test,
  org.eclipse.ltk.core.refactoring,
- org.eclipse.search;bundle-version="3.7.0"
+ org.eclipse.search;bundle-version="3.7.0",
+ org.jboss.tools.common.el.core;bundle-version="3.3.0"
 Export-Package: org.jboss.tools.cdi.ui.test

Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java	2011-04-18 23:13:51 UTC (rev 30652)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/search/CDISearchParticipantTest.java	2011-04-18 23:30:39 UTC (rev 30653)
@@ -23,8 +23,10 @@
 import org.jboss.tools.cdi.core.ICDIElement;
 import org.jboss.tools.cdi.core.test.tck.TCKTest;
 import org.jboss.tools.cdi.internal.core.impl.ClassBean;
+import org.jboss.tools.cdi.internal.core.impl.EventBean;
 import org.jboss.tools.cdi.internal.core.impl.InjectionPointField;
 import org.jboss.tools.cdi.internal.core.impl.InjectionPointParameter;
+import org.jboss.tools.cdi.internal.core.impl.ObserverMethod;
 import org.jboss.tools.cdi.ui.marker.MarkerResolutionUtils;
 import org.jboss.tools.cdi.ui.search.CDIBeanQueryParticipant;
 import org.jboss.tools.cdi.ui.search.CDIMatch;
@@ -148,6 +150,28 @@
 		testSearchParticipant("JavaSource/org/jboss/jsr299/tck/tests/lookup/injectionpoint/ConstructorInjectionPointBean.java", PARAMETER_SEARCH, "ConstructorInjectionPointBean", "injectedBean", new InjectionPointQueryParticipant(), matches);
 	}
 
+	public void testInjectionPointQueryParticipant3(){
+		ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();
+		
+		matches.add(new MatchStructure(EventBean.class, "Event"));
+		
+		matches.add(new MatchStructure(ObserverMethod.class, "DiscerningObserver.observeAny()"));
+		matches.add(new MatchStructure(ObserverMethod.class, "EventTypeFamilyObserver.observeObject()"));
+		matches.add(new MatchStructure(ObserverMethod.class, "Fox.observeEvent()"));
+		matches.add(new MatchStructure(ObserverMethod.class, "GoldenRetriever.anObserverMethod()"));
+		matches.add(new MatchStructure(ObserverMethod.class, "Pomeranian.observeStringEvent()"));
+		matches.add(new MatchStructure(ObserverMethod.class, "StringObserver.anotherObserver()"));
+		matches.add(new MatchStructure(ObserverMethod.class, "TeaCupPomeranian.observeSimpleEvent()"));
+		matches.add(new MatchStructure(ObserverMethod.class, "Terrier.observer()"));
+		matches.add(new MatchStructure(ObserverMethod.class, "TibetanTerrier_Broken.observeSomeEvent()"));
+		matches.add(new MatchStructure(ObserverMethod.class, "TibetanTerrier_BrokenNoInterface.observeSomeEvent()"));
+		matches.add(new MatchStructure(ObserverMethod.class, "ClassFragmentLogger.addEntry()"));
+		matches.add(new MatchStructure(ObserverMethod.class, "ObserverMethodInInterceptorBroken.observeSomeEvent()"));
+		matches.add(new MatchStructure(ObserverMethod.class, "ObserverMethodInDecoratorBroken.observeSomeEvent()"));
+		
+		testSearchParticipant("JavaSource/org/jboss/jsr299/tck/tests/event/bindingTypes/EventEmitter.java", FIELD_SEARCH, "stringEvent", "", new InjectionPointQueryParticipant(), matches);
+	}
+
 	public void testCDIBeanQueryParticipant(){
 		ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();