sb140: #i117381# gvfs ucp handling all schemes spoils deregisterContentProvider test

This commit is contained in:
Stephan Bergmann 2011-09-12 11:50:26 +02:00
parent 60ad74a87c
commit e07ac6765d

View file

@ -32,6 +32,7 @@ import lib.Status;
import lib.StatusException;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.lang.XServiceInfo;
import com.sun.star.ucb.ContentProviderInfo;
import com.sun.star.ucb.DuplicateProviderException;
import com.sun.star.ucb.XContentProvider;
@ -272,7 +273,19 @@ public class _XContentProviderManager extends MultiMethodTest {
res = oObj.queryContentProvider(myScheme);
// verifying that no provider is returned
// 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);
}
}