12:58 p.m.
Author: dazarov
Date: 2010-02-10 13:58:54 -0500 (Wed, 10 Feb 2010)
New Revision: 20227
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
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/jira/browse/JBIDE-3125
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2010-02-10
18:22:50 UTC (rev 20226)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2010-02-10
18:58:54 UTC (rev 20227)
@@ -16,7 +16,8 @@
org.eclipse.core.runtime;bundle-version="3.5.0",
org.jboss.tools.cdi.text.ext;bundle-version="2.0.0",
org.eclipse.jdt.ui;bundle-version="3.5.0",
- org.eclipse.core.commands;bundle-version="3.5.0"
+ org.eclipse.core.commands;bundle-version="3.5.0",
+ org.jboss.tools.cdi.core.test;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.cdi.text.ext.test
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-02-10
18:22:50 UTC (rev 20226)
+++
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-02-10
18:58:54 UTC (rev 20227)
@@ -3,14 +3,11 @@
import java.util.ArrayList;
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
import org.eclipse.jdt.internal.ui.text.JavaWordFinder;
import org.eclipse.jface.text.IDocument;
@@ -30,46 +27,22 @@
import org.eclipse.wst.sse.core.StructuredModelManager;
import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.jboss.tools.cdi.core.test.tck.TCKTest;
import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlinkDetector;
-import org.jboss.tools.common.test.util.TestProjectProvider;
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion;
import org.jboss.tools.common.text.ext.util.AxisUtil;
-import org.jboss.tools.test.util.JobUtils;
-public class InjectedPointHyperlinkDetectorTest extends TestCase {
- TestProjectProvider provider = null;
- IProject project = null;
- boolean makeCopy = false;
- private static final String PROJECT_NAME = "test_cdi_project";
- private static final String FILE_NAME =
"/src/org/jboss/jsr299/tck/tests/lookup/injectionpoint/LoggerConsumer.java";
+public class InjectedPointHyperlinkDetectorTest extends TCKTest {
+ 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 setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.cdi.text.ext.test", null,
PROJECT_NAME, makeCopy);
- project = provider.getProject();
- project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
- Throwable exception = null;
-
- assertNull("An exception caught: " + (exception != null?
exception.getMessage() : ""), exception);
- }
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
+ public void testInjectedPointHyperlinkDetector() throws Exception {
+ IProject project = importPreparedProject("/lookup/injectionpoint");
- public void testInjectedPointHyperlinkDetector() {
- try {
- JobUtils.waitForIdle(3000);
- } catch (Exception e) {
- assertNull("An exception caught: " + e.getMessage(), e);
- }
- assertTrue("Test project \"" + PROJECT_NAME + "\" is not
loaded", (project != null));
-
IFile javaFile = project.getFile(FILE_NAME);
assertTrue("The file \"" + FILE_NAME + "\" is not found",
(javaFile != null));
@@ -106,9 +79,9 @@
ArrayList<Region> regionList = new ArrayList<Region>();
regionList.add(new Region(115, 6)); // Inject
- regionList.add(new Region(145, 6)); // logger
- regionList.add(new Region(201, 6)); // logger
- regionList.add(new Region(255, 6)); // logger
+ regionList.add(new Region(140, 6)); // logger
+ regionList.add(new Region(196, 6)); // logger
+ regionList.add(new Region(250, 6)); // logger
IEditorPart part = openFileInEditor(javaFile);
@@ -134,7 +107,7 @@
}else{
for(Region region : regionList){
if(i >= region.getOffset() && i <=
region.getOffset()+region.getLength())
- fail("Wrong detection for region - "+region.getOffset()+" :
"+region.getLength());
+ fail("Wrong detection for region - "+region.getOffset()+" :
"+region.getLength()+region.getLength()+" region - "+i);
}
}
}