Author: dazarov
Date: 2010-05-26 13:05:24 -0400 (Wed, 26 May 2010)
New Revision: 22333
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDITextExtTestSuite.java
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6340
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDITextExtTestSuite.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDITextExtTestSuite.java 2010-05-26
16:59:57 UTC (rev 22332)
+++
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDITextExtTestSuite.java 2010-05-26
17:05:24 UTC (rev 22333)
@@ -19,8 +19,6 @@
public static Test suite() {
TestSuite suite = new TestSuite("CDI Text Ext Tests");
suite.addTest(InjectedPointHyperlinkDetectorTest.suite());
- suite.addTest(ProducerDisposerHyperlinkDetectorTest.suite());
- suite.addTest(InjectedPointInProducerMethodHyperlinkDetectorTest.suite());
return suite;
}
}
\ No newline at end of file
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java 2010-05-26
16:59:57 UTC (rev 22332)
+++
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java 2010-05-26
17:05:24 UTC (rev 22333)
@@ -4,15 +4,22 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
import org.eclipse.jdt.internal.ui.text.JavaWordFinder;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.texteditor.DocumentProviderRegistry;
+import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.wst.sse.core.StructuredModelManager;
import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
@@ -21,9 +28,74 @@
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion;
import org.jboss.tools.common.text.ext.util.AxisUtil;
-import junit.framework.TestCase;
+public class HyperlinkDetectorTest extends TCKTest {
+ protected void checkRegions(String fileName, ArrayList<Region> regionList,
AbstractHyperlinkDetector elPartitioner) throws Exception {
+ IFile javaFile = tckProject.getFile(fileName);
-public class HyperlinkDetectorTest extends TCKTest {
+ TCKTest.assertTrue("The file \"" + fileName + "\" is not
found", (javaFile != null));
+ TCKTest.assertTrue("The file \"" + fileName + "\" is not
found", (javaFile.exists()));
+
+ FileEditorInput editorInput = new FileEditorInput(javaFile);
+
+ IDocumentProvider documentProvider = null;
+ try {
+ documentProvider =
DocumentProviderRegistry.getDefault().getDocumentProvider(editorInput);
+ } catch (Exception x) {
+ x.printStackTrace();
+ fail("An exception caught: " + x.getMessage());
+ }
+
+ assertNotNull("The document provider for the file \"" + fileName +
"\" is not loaded", documentProvider);
+
+ try {
+ documentProvider.connect(editorInput);
+ } catch (Exception x) {
+ x.printStackTrace();
+ fail("The document provider is not able to be initialized with the editor
input\nAn exception caught: "+x.getMessage());
+ }
+
+ IDocument document = documentProvider.getDocument(editorInput);
+
+ assertNotNull("The document for the file \"" + fileName + "\"
is not loaded", document);
+
+ int expected = 0;
+ for(Region region : regionList)
+ expected += region.getLength()+1;
+
+ IEditorPart part = openFileInEditor(javaFile);
+ ISourceViewer viewer = null;
+ if(part instanceof JavaEditor){
+ viewer = ((JavaEditor)part).getViewer();
+ }
+
+ elPartitioner.setContext(new TestContext((ITextEditor)part));
+
+ int counter = 0;
+ for (int i = 0; i < document.getLength(); i++) {
+ TestData testData = new TestData(document, i);
+ IHyperlink[] links = elPartitioner.detectHyperlinks(viewer,
testData.getHyperlinkRegion(), true);
+
+ boolean recognized = links != null;
+
+ if (recognized) {
+ counter++;
+ if(!findOffsetInRegions(i, regionList)){
+ fail("Wrong detection for offset - "+i);
+ }
+ } else {
+ for(Region region : regionList){
+ if(i >= region.getOffset() && i <=
region.getOffset()+region.getLength())
+ fail("Wrong detection for region - "+region.getOffset()+" :
"+region.getLength()+" region - "+i);
+ }
+ }
+ }
+
+ assertEquals("Wrong recognized region count: ", expected, counter);
+
+ documentProvider.disconnect(editorInput);
+ }
+
+
protected boolean findOffsetInRegions(int offset, ArrayList<Region> regionList){
for(Region region : regionList){
if(offset >= region.getOffset() && offset <=
region.getOffset()+region.getLength())
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 2010-05-26
16:59:57 UTC (rev 22332)
+++
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-05-26
17:05:24 UTC (rev 22333)
@@ -2,99 +2,46 @@
import java.util.ArrayList;
+import org.eclipse.jface.text.Region;
+import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlinkDetector;
+import org.jboss.tools.cdi.text.ext.hyperlink.ProducerDisposerHyperlinkDetector;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.texteditor.DocumentProviderRegistry;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.jboss.tools.cdi.core.test.tck.TCKTest;
-import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlinkDetector;
public class InjectedPointHyperlinkDetectorTest extends HyperlinkDetectorTest {
- private static final String FILE_NAME =
"JavaSource/org/jboss/jsr299/tck/tests/lookup/injectionpoint/LoggerConsumer.java";
public static Test suite() {
return new TestSuite(InjectedPointHyperlinkDetectorTest.class);
}
public void testInjectedPointHyperlinkDetector() throws Exception {
- IFile javaFile = tckProject.getFile(FILE_NAME);
-
- TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not
found", (javaFile != null));
- TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not
found", (javaFile.exists()));
-
- FileEditorInput editorInput = new FileEditorInput(javaFile);
-
- IDocumentProvider documentProvider = null;
- try {
- documentProvider =
DocumentProviderRegistry.getDefault().getDocumentProvider(editorInput);
- } catch (Exception x) {
- x.printStackTrace();
- fail("An exception caught: " + x.getMessage());
- }
-
- assertNotNull("The document provider for the file \"" + FILE_NAME +
"\" is not loaded", documentProvider);
-
- try {
- documentProvider.connect(editorInput);
- } catch (Exception x) {
- x.printStackTrace();
- fail("The document provider is not able to be initialized with the editor
input\nAn exception caught: "+x.getMessage());
- }
-
- IDocument document = documentProvider.getDocument(editorInput);
-
- assertNotNull("The document for the file \"" + FILE_NAME + "\"
is not loaded", document);
-
- InjectedPointHyperlinkDetector elPartitioner = new InjectedPointHyperlinkDetector();
-
ArrayList<Region> regionList = new ArrayList<Region>();
regionList.add(new Region(115, 6)); // Inject
regionList.add(new Region(140, 6)); // logger
regionList.add(new Region(196, 6)); // logger
regionList.add(new Region(250, 6)); // logger
+
+ checkRegions("JavaSource/org/jboss/jsr299/tck/tests/lookup/injectionpoint/LoggerConsumer.java",
regionList, new InjectedPointHyperlinkDetector());
+ }
- IEditorPart part = openFileInEditor(javaFile);
- ISourceViewer viewer = null;
- if(part instanceof JavaEditor){
- viewer = ((JavaEditor)part).getViewer();
- }
+ public void testInjectedProducerMethodParametersHyperlinkDetector() throws Exception {
+ ArrayList<Region> regionList = new ArrayList<Region>();
+ regionList.add(new Region(571, 5)); // order
+ regionList.add(new Region(659, 3));
+ regionList.add(new Region(695, 3));
+
+ checkRegions("JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/CustomProducerImpl.java",
regionList, new InjectedPointHyperlinkDetector());
+ }
+
+ public void testProducerDisposerHyperlinkDetector() throws Exception {
+ ArrayList<Region> regionList = new ArrayList<Region>();
+ regionList.add(new Region(1199, 8)); // @Produces
+ regionList.add(new Region(1222, 7)); // producer
+ regionList.add(new Region(1291, 7)); // disposer
- elPartitioner.setContext(new TestContext((ITextEditor)part));
-
- int counter = 0;
- for (int i = 0; i < document.getLength(); i++) {
- TestData testData = new TestData(document, i);
- IHyperlink[] links = elPartitioner.detectHyperlinks(viewer,
testData.getHyperlinkRegion(), true);
-
- boolean recognized = links != null;
-
- if (recognized) {
- counter++;
- if(!findOffsetInRegions(i, regionList)){
- fail("Wrong detection for offset - "+i);
- }
- } else {
- for(Region region : regionList){
- if(i >= region.getOffset() && i <=
region.getOffset()+region.getLength())
- fail("Wrong detection for region - "+region.getOffset()+" :
"+region.getLength()+" region - "+i);
- }
- }
- }
-
- assertEquals("Wrong recognized region count: ", 28, counter);
-
- documentProvider.disconnect(editorInput);
+ checkRegions("JavaSource/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerImpl.java",
regionList, new ProducerDisposerHyperlinkDetector());
}
-
}
\ No newline at end of file
Deleted:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java 2010-05-26
16:59:57 UTC (rev 22332)
+++
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java 2010-05-26
17:05:24 UTC (rev 22333)
@@ -1,98 +0,0 @@
-package org.jboss.tools.cdi.text.ext.test;
-
-import java.util.ArrayList;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.texteditor.DocumentProviderRegistry;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.jboss.tools.cdi.core.test.tck.TCKTest;
-import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlinkDetector;
-
-public class InjectedPointInProducerMethodHyperlinkDetectorTest extends
HyperlinkDetectorTest{
- private static final String FILE_NAME =
"JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/CustomProducerImpl.java";
-
- public static Test suite() {
- return new TestSuite(InjectedPointInProducerMethodHyperlinkDetectorTest.class);
- }
-
- public void testProducerDisposerHyperlinkDetector() throws Exception {
- IFile javaFile = tckProject.getFile(FILE_NAME);
-
- TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not
found", (javaFile != null));
- TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not
found", (javaFile.exists()));
-
- FileEditorInput editorInput = new FileEditorInput(javaFile);
-
- IDocumentProvider documentProvider = null;
- try {
- documentProvider =
DocumentProviderRegistry.getDefault().getDocumentProvider(editorInput);
- } catch (Exception x) {
- x.printStackTrace();
- fail("An exception caught: " + x.getMessage());
- }
-
- assertNotNull("The document provider for the file \"" + FILE_NAME +
"\" is not loaded", documentProvider);
-
- try {
- documentProvider.connect(editorInput);
- } catch (Exception x) {
- x.printStackTrace();
- fail("The document provider is not able to be initialized with the editor
input\nAn exception caught: "+x.getMessage());
- }
-
- IDocument document = documentProvider.getDocument(editorInput);
-
- assertNotNull("The document for the file \"" + FILE_NAME + "\"
is not loaded", document);
-
- InjectedPointHyperlinkDetector elPartitioner = new InjectedPointHyperlinkDetector();
-
- ArrayList<Region> regionList = new ArrayList<Region>();
- regionList.add(new Region(571, 5)); // order
- regionList.add(new Region(659, 3));
- regionList.add(new Region(695, 3));
-
- IEditorPart part = openFileInEditor(javaFile);
- ISourceViewer viewer = null;
- if(part instanceof JavaEditor){
- viewer = ((JavaEditor)part).getViewer();
- }
-
- elPartitioner.setContext(new TestContext((ITextEditor)part));
-
- int counter = 0;
- for (int i = 0; i < document.getLength(); i++) {
- TestData testData = new TestData(document, i);
- IHyperlink[] links = elPartitioner.detectHyperlinks(viewer,
testData.getHyperlinkRegion(), true);
-
- boolean recognized = links != null;
-
- if (recognized) {
- counter++;
- if(!findOffsetInRegions(i, regionList)){
- fail("Wrong detection for offset - "+i);
- }
- } else {
- for(Region region : regionList){
- if(i >= region.getOffset() && i <=
region.getOffset()+region.getLength())
- fail("Wrong detection for region - "+region.getOffset()+" :
"+region.getLength()+" region - "+i);
- }
- }
- }
-
- assertEquals("Wrong recognized region count: ", 14, counter);
-
- documentProvider.disconnect(editorInput);
- }
-
-}
Deleted:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java 2010-05-26
16:59:57 UTC (rev 22332)
+++
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java 2010-05-26
17:05:24 UTC (rev 22333)
@@ -1,99 +0,0 @@
-package org.jboss.tools.cdi.text.ext.test;
-
-import java.util.ArrayList;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.texteditor.DocumentProviderRegistry;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.jboss.tools.cdi.core.test.tck.TCKTest;
-import org.jboss.tools.cdi.text.ext.hyperlink.ProducerDisposerHyperlinkDetector;
-
-public class ProducerDisposerHyperlinkDetectorTest extends HyperlinkDetectorTest{
- private static final String FILE_NAME =
"JavaSource/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerImpl.java";
-
- public static Test suite() {
- return new TestSuite(ProducerDisposerHyperlinkDetectorTest.class);
- }
-
- public void testProducerDisposerHyperlinkDetector() throws Exception {
- IFile javaFile = tckProject.getFile(FILE_NAME);
-
- TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not
found", (javaFile != null));
- TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not
found", (javaFile.exists()));
-
- FileEditorInput editorInput = new FileEditorInput(javaFile);
-
- IDocumentProvider documentProvider = null;
- try {
- documentProvider =
DocumentProviderRegistry.getDefault().getDocumentProvider(editorInput);
- } catch (Exception x) {
- x.printStackTrace();
- fail("An exception caught: " + x.getMessage());
- }
-
- assertNotNull("The document provider for the file \"" + FILE_NAME +
"\" is not loaded", documentProvider);
-
- try {
- documentProvider.connect(editorInput);
- } catch (Exception x) {
- x.printStackTrace();
- fail("The document provider is not able to be initialized with the editor
input\nAn exception caught: "+x.getMessage());
- }
-
- IDocument document = documentProvider.getDocument(editorInput);
-
- assertNotNull("The document for the file \"" + FILE_NAME + "\"
is not loaded", document);
-
- ProducerDisposerHyperlinkDetector elPartitioner = new
ProducerDisposerHyperlinkDetector();
-
- ArrayList<Region> regionList = new ArrayList<Region>();
- regionList.add(new Region(1199, 8)); // @Produces
- regionList.add(new Region(1222, 7)); // producer
- regionList.add(new Region(1291, 7)); // disposer
-
- IEditorPart part = openFileInEditor(javaFile);
- ISourceViewer viewer = null;
- if(part instanceof JavaEditor){
- viewer = ((JavaEditor)part).getViewer();
- }
-
- elPartitioner.setContext(new TestContext((ITextEditor)part));
-
- int counter = 0;
- for (int i = 0; i < document.getLength(); i++) {
- TestData testData = new TestData(document, i);
- IHyperlink[] links = elPartitioner.detectHyperlinks(viewer,
testData.getHyperlinkRegion(), true);
-
- boolean recognized = links != null;
-
- if (recognized) {
- counter++;
- if(!findOffsetInRegions(i, regionList)){
- fail("Wrong detection for offset - "+i);
- }
- } else {
- for(Region region : regionList){
- if(i >= region.getOffset() && i <=
region.getOffset()+region.getLength())
- fail("Wrong detection for region - "+region.getOffset()+" :
"+region.getLength()+" region - "+i);
- }
- }
- }
-
- assertEquals("Wrong recognized region count: ", 25, counter);
-
- documentProvider.disconnect(editorInput);
- }
-
-}