From 2536f92c61069531a179624ff2d70603995127e6 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 23 Sep 2011 00:55:35 +0100
Subject: handle --enable-gio as well as --enable-gnome-vfs

Both of these providers will attempt to claim to be able to handle all
internally-unhandled protocols in order to forward them to their system
backends, so there will be a preexisting protocol handler for any random
protocol (rather than none) in those cases.

extends e07ac6765dbaec78e77c694148f5531072036dc8 (#i117381#)
---
 .../java/ifc/ucb/_XContentProviderManager.java     | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'qadevOOo')

diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
index de2ea0034d35..7de56a9b1d35 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
@@ -69,9 +69,18 @@ public class _XContentProviderManager extends MultiMethodTest {
      */
     static final String myScheme = "test-scheme";
 
+    /**
+     * Any preexisting content provider. If it exists it will be hidden by
+     * <code>firstContentProvider</code>, registered with the same
+     * <code>myScheme</code>. Typically there is no preexisting content
+     * provider, unless the catch-all providers GnomeVFSContentProvider or
+     * GIOContentProvider is installed
+     */
+    XContentProvider preexistingContentProvider;
+
     /**
      * First content provider. It will be hidden by <code>contentProvider
-     * </code>, registred with the same <code>myScheme</code> to test
+     * </code>, registered with the same <code>myScheme</code> to test
      * the "hiding" behaviour.
      */
     XContentProvider firstContentProvider;
@@ -135,6 +144,9 @@ public class _XContentProviderManager extends MultiMethodTest {
         // querying providfers info before inserting them, to verify results
         initialProvidersInfo = oObj.queryContentProviders();
 
+        // GnomeVFSContentProvider or GIOContentProvider ?, typically null
+        preexistingContentProvider = oObj.queryContentProvider(myScheme);
+
         log.println("registering the first provider");
         try {
             oObj.registerContentProvider(firstContentProvider, myScheme,false);
@@ -273,19 +285,7 @@ public class _XContentProviderManager extends MultiMethodTest {
 
         res = oObj.queryContentProvider(myScheme);
 
-        // verifying that no provider is returned (if the
-        // GnomeVFSContentProvider is installed, it will handle all otherwise
-        // unhandled schemes, so we have to ignore it here):
-        if (res != null) {
-            XServiceInfo info = UnoRuntime.queryInterface(
-                XServiceInfo.class, res);
-            if (info != null
-                && info.supportsService(
-                    "com.sun.star.ucb.GnomeVFSContentProvider"))
-            {
-                res = null;
-            }
-        }
-        tRes.tested("deregisterContentProvider()", res == null);
+	// verifying that the original provider (typically none) is returned.
+        tRes.tested("deregisterContentProvider()", res == preexistingContentProvider);
     }
 }
-- 
cgit