Bug 552683 - refurbish IProgressMonitor by merge withY20200809-1200Y20200808-1200I20200809-1800I20200808-1800

IProgressMonitorWithBlocking

Adapt platform.text tests as they will not receive the old deprecated
class anymore.

Change-Id: I561a9ff039461dc43bf33fd76b1af6d4dde25bbc
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

4 files changed, 2 insertions, 6 deletions

diff --git a/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF b/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
index f883164d344..5e0eb58a45a 100644
--- a/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.ui.editors.tests;singleton:=true
-Bundle-Version: 3.11.700.qualifier
+Bundle-Version: 3.11.800.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.ui.editors.tests
diff --git a/org.eclipse.ui.editors.tests/pom.xml b/org.eclipse.ui.editors.tests/pom.xml
index 95bf6f5416c..3652a9368f9 100644
--- a/org.eclipse.ui.editors.tests/pom.xml
+++ b/org.eclipse.ui.editors.tests/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.ui</groupId>
   <artifactId>org.eclipse.ui.editors.tests</artifactId>
-  <version>3.11.700-SNAPSHOT</version>
+  <version>3.11.800-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
   	<testSuite>${project.artifactId}</testSuite>
diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FileDocumentProviderTest.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FileDocumentProviderTest.java
index 8d4505a4176..ae984d27048 100644
--- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FileDocumentProviderTest.java
+++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/FileDocumentProviderTest.java
@@ -35,7 +35,6 @@ import org.eclipse.core.internal.resources.Workspace;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IProgressMonitorWithBlocking;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
@@ -110,7 +109,6 @@ public class FileDocumentProviderTest {
 		assertNotNull(progressMonitor);
 		assertFalse(progressMonitor instanceof NullProgressMonitor);
 		assertFalse(progressMonitor instanceof EventLoopProgressMonitor);
-		assertTrue(progressMonitor instanceof IProgressMonitorWithBlocking);
 
 		// Because this monitor is not EventLoopProgressMonitor, it will not
 		// process UI events while waiting on workspace lock
diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextFileDocumentProviderTest.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextFileDocumentProviderTest.java
index e0e775700f9..15480d8a894 100644
--- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextFileDocumentProviderTest.java
+++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/TextFileDocumentProviderTest.java
@@ -33,7 +33,6 @@ import org.eclipse.core.internal.localstore.FileSystemResourceManager;
 import org.eclipse.core.internal.resources.File;
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IProgressMonitorWithBlocking;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.jobs.Job;
 
@@ -94,7 +93,6 @@ public class TextFileDocumentProviderTest {
 		assertNotNull(progressMonitor);
 		assertFalse(progressMonitor instanceof NullProgressMonitor);
 		assertFalse(progressMonitor instanceof EventLoopProgressMonitor);
-		assertTrue(progressMonitor instanceof IProgressMonitorWithBlocking);
 
 		// Because this monitor is not EventLoopProgressMonitor, it will not
 		// process UI events while waiting on workspace lock