Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Maetzel2004-10-13 10:59:09 +0000
committerKai Maetzel2004-10-13 10:59:09 +0000
commit253bce2b39ca57fe433b1d70770447cd180a68ea (patch)
treed8fd32ab91388d7e6733921e233b59fec48cc29e /org.eclipse.core.filebuffers.tests
parent4597c64fc4c0009f2fdac165f56342ea3986f4f0 (diff)
downloadeclipse.platform.text-253bce2b39ca57fe433b1d70770447cd180a68ea.tar.gz
eclipse.platform.text-253bce2b39ca57fe433b1d70770447cd180a68ea.tar.xz
eclipse.platform.text-253bce2b39ca57fe433b1d70770447cd180a68ea.zip
bug fix for tests
Diffstat (limited to 'org.eclipse.core.filebuffers.tests')
-rw-r--r--org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java2
-rw-r--r--org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForFilesInLinkedFolders.java6
-rw-r--r--org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForLinkedFiles.java6
-rw-r--r--org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForWorkspaceFiles.java6
4 files changed, 16 insertions, 4 deletions
diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java
index 23aa3798c..41ecd74a5 100644
--- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java
+++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBufferFunctions.java
@@ -1039,7 +1039,7 @@ public abstract class FileBufferFunctions extends TestCase {
/*
* Test annotation model existence.
- * ATTENTION: This test only works as is in a workspace that contains the "org.eclipse.ui.editors" plug-in.
+ * ATTENTION: This test is only effective in a workspace that contains the "org.eclipse.ui.editors" bundle.
*/
public void test18() throws Exception {
fManager.connect(fPath, null);
diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForFilesInLinkedFolders.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForFilesInLinkedFolders.java
index 6fa96a02a..b7304d446 100644
--- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForFilesInLinkedFolders.java
+++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForFilesInLinkedFolders.java
@@ -18,11 +18,14 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.filebuffers.FileBuffers;
import org.eclipse.jface.text.source.IAnnotationModel;
+import org.osgi.framework.Bundle;
+
/**
* FileBuffersForLinkedFiles
*/
@@ -110,6 +113,7 @@ public class FileBuffersForFilesInLinkedFolders extends FileBufferFunctions {
* @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#getAnnotationModelClass()
*/
protected Class getAnnotationModelClass() throws Exception {
- return IAnnotationModel.class;
+ Bundle bundle= Platform.getBundle("org.eclipse.ui.editors");
+ return bundle != null ? IAnnotationModel.class : null;
}
}
diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForLinkedFiles.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForLinkedFiles.java
index e35517598..1955da07e 100644
--- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForLinkedFiles.java
+++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForLinkedFiles.java
@@ -17,11 +17,14 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.filebuffers.FileBuffers;
import org.eclipse.jface.text.source.IAnnotationModel;
+import org.osgi.framework.Bundle;
+
/**
* FileBuffersForLinkedFiles
*/
@@ -104,6 +107,7 @@ public class FileBuffersForLinkedFiles extends FileBufferFunctions {
* @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#getAnnotationModelClass()
*/
protected Class getAnnotationModelClass() throws Exception {
- return IAnnotationModel.class;
+ Bundle bundle= Platform.getBundle("org.eclipse.ui.editors");
+ return bundle != null ? IAnnotationModel.class : null;
}
}
diff --git a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForWorkspaceFiles.java b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForWorkspaceFiles.java
index b8aac9a10..d2e98a0c2 100644
--- a/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForWorkspaceFiles.java
+++ b/org.eclipse.core.filebuffers.tests/src/org/eclipse/core/filebuffers/tests/FileBuffersForWorkspaceFiles.java
@@ -18,11 +18,14 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.filebuffers.FileBuffers;
import org.eclipse.jface.text.source.IAnnotationModel;
+import org.osgi.framework.Bundle;
+
/**
* FileBuffersForWorkspaceFiles
*/
@@ -90,6 +93,7 @@ public class FileBuffersForWorkspaceFiles extends FileBufferFunctions {
* @see org.eclipse.core.filebuffers.tests.FileBufferFunctions#getAnnotationModelClass()
*/
protected Class getAnnotationModelClass() throws Exception {
- return IAnnotationModel.class;
+ Bundle bundle= Platform.getBundle("org.eclipse.ui.editors");
+ return bundle != null ? IAnnotationModel.class : null;
}
}

Back to the top