Author: scabanovich Date: 2011-09-14 14:36:24 -0400 (Wed, 14 Sep 2011) New Revision: 34740 Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java Log: JBIDE-9699 https://issues.jboss.org/browse/JBIDE-9699 Test fixed. Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-09-14 18:33:11 UTC (rev 34739) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-09-14 18:36:24 UTC (rev 34740) @@ -288,14 +288,17 @@ } private static String findRegionInformation(IDocument document, int offset, List<TestRegion> regionList) throws BadLocationException{ - int index = 0; + int index = -1; for(int i = 0; i < regionList.size(); i++){ TestRegion testRegion = regionList.get(i); if(offset > testRegion.region.getOffset()+testRegion.region.getLength()){ index = i; } } - String info = "previous region - " + getRegionInformation(document, regionList.get(index)); + String info = ""; + if(index >= 0) { + info = "previous region - " + getRegionInformation(document, regionList.get(index)); + } if(index+1 < regionList.size()) info += " next region - " + getRegionInformation(document, regionList.get(index+1)); return info; Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java 2011-09-14 18:33:11 UTC (rev 34739) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java 2011-09-14 18:36:24 UTC (rev 34740) @@ -6,6 +6,7 @@ import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages; import org.jboss.tools.cdi.text.ext.hyperlink.EventAndObserverMethodHyperlinkDetector; import org.jboss.tools.cdi.text.ext.hyperlink.EventListHyperlink; +import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlink; import org.jboss.tools.cdi.text.ext.hyperlink.ObserverMethodListHyperlink; import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil.TestRegion; import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil.TestHyperlink; Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2011-09-14 18:33:11 UTC (rev 34739) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2011-09-14 18:36:24 UTC (rev 34740) @@ -7,7 +7,6 @@ import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.test.tck.TCKTest; import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages; -import org.jboss.tools.cdi.text.ext.hyperlink.AlternativeInjectedPointListHyperlink; import org.jboss.tools.cdi.text.ext.hyperlink.AssignableBeansHyperlink; import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlink; import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlinkDetector; @@ -15,7 +14,6 @@ import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil.TestHyperlink; - public class InjectedPointHyperlinkDetectorTest extends TCKTest { public void testInjectedPointHyperlinkDetector() throws Exception { @@ -90,7 +88,15 @@ regionList.add(new TestRegion(orderPosition, 15, new TestHyperlink[]{ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " CustomProducerImpl.produce()", bean) })); // order + + //It may seem strange that we cannot start with "@Disposes" + String disposesParam = "Disposes Something toDispose"; + int disposePosition = text.indexOf(disposesParam); + regionList.add(new TestRegion(disposePosition, disposesParam.length(), new TestHyperlink[]{ + new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " CustomProducerImpl.produce()", bean) + })); // toDispose + CDIHyperlinkTestUtil.checkRegions(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/CustomProducerImpl.java", regionList, new InjectedPointHyperlinkDetector()); }