API CHANGE: remove com.sun.star.system.XProxySettings

... and related services:

com.sun.star.system.SOffice52ProxySettings
com.sun.star.system.ProxySettings
com.sun.star.system.SystemProxySettings

The implementation for these has apparently been removed in
OpenOffice.org 2.0 or thereabouts.

EXISTENCE: published key
"/UCR/com/sun/star/system/SOffice52ProxySettings" exists only in
registry 1
EXISTENCE: published key "/UCR/com/sun/star/system/ProxySettings" exists
only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/system/XProxySettings"
exists only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/system/SystemProxySettings"
exists only in registry 1

Change-Id: If00c332edf08619fcad12ed07d0d8a13a714045e

3 files changed, 0 insertions, 557 deletions

diff --git a/qadevOOo/tests/java/ifc/system/_XProxySettings.java b/qadevOOo/tests/java/ifc/system/_XProxySettings.java
deleted file mode 100644
index b11e10282a97..000000000000
--- a/qadevOOo/tests/java/ifc/system/_XProxySettings.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package ifc.system;
-
-import java.util.Map;
-
-import lib.MultiMethodTest;
-import lib.Status;
-import lib.StatusException;
-
-import com.sun.star.system.XProxySettings;
-
-/**
- * Tests <code>com.sun.star.system.XProxySettings</code> interface. The result
- * of each method is compared with expected settings which is specified by the
- * caller of the tests via object relation "XProxySettings.proxaSettings". That
- * should be a HashMap containing the following keys:
- * <ul>
- *   <li>ftpProxyAddress</li>
- *   <li>ftpProxyPort</li>
- *   <li>gopherProxyAddress</li>
- *   <li>gopherProxyPort</li>
- *   <li>httpProxyAddress</li>
- *   <li>httpProxyPort</li>
- *   <li>httpsProxyAddress</li>
- *   <li>httpsProxyPort</li>
- *   <li>socksProxyAddress</li>
- *   <li>socksProxyPort</li>
- *   <li>proxyBypassAddress</li>
- *   <li>proxyEnabled</li>
- * </ul>.
- * Each value for a key, should be a String specifying the correct result of
- * the corresponding getXXX() method of XProxySettings interface.
- * <p>If the object relation is not specified the test failes.
- *
- */
-public class _XProxySettings extends MultiMethodTest {
-    public XProxySettings oObj;
-
-    /**
-     * Contains a HashMap with correct results of the tested methods. See
-     * the class description.
-     */
-    Map<String,String> expectedProxies;
-
-    /**
-     * Checks that the "XProxySettings.proxySettings" object relation is
-     * specified and stores its value to <code>expectedProxies</code> field.
-     *
-     * @throws StatusException is the object relation is not specified.
-     *
-     * @see #expectedProxies
-     */
-    @SuppressWarnings("unchecked")
-    public void before() {
-        expectedProxies = (Map<String,String>)tEnv.getObjRelation(
-                "XProxySettings.proxySettings");
-
-        if (expectedProxies == null) {
-            throw new StatusException(
-                    Status.failed("Expected proxy settings are not specified"));
-        }
-    }
-
-    /**
-     * Calls <code>getFtpProxyAddress()</code> and verifies its result with
-     * "ftpProxyAddress" value of <code>expectedProxies</code>.
-     *
-     * @see #expectedProxies
-     */
-    public void _getFtpProxyAddress() {
-        String ftpProxyAddress = oObj.getFtpProxyAddress();
-        String expectedFtpProxyAddress = expectedProxies.get("ftpProxyAddress");
-
-        log.println("getFtpProxyAddress");
-        log.println("getting: "+ftpProxyAddress);
-        log.println("expected: "+expectedFtpProxyAddress);
-
-        tRes.tested("getFtpProxyAddress()",
-                ftpProxyAddress.equals(expectedFtpProxyAddress));
-    }
-
-    /**
-     * Calls <code>getFtpProxyPort()</code> and verifies its result with
-     * "ftpProxyPort" value of <code>expectedProxies</code>.
-     *
-     * @see #expectedProxies
-     */
-    public void _getFtpProxyPort() {
-        String ftpProxyPort = oObj.getFtpProxyPort();
-        String expectedFtpProxyPort = expectedProxies.get("ftpProxyPort");
-
-        log.println("getFtpProxyPort");
-        log.println("getting: "+ftpProxyPort);
-        log.println("expected: "+expectedFtpProxyPort);
-
-        tRes.tested("getFtpProxyPort()",
-                ftpProxyPort.equals(expectedFtpProxyPort));
-    }
-
-    /**
-     * Calls <code>getGopherProxyAddress()</code> and verifies its result with
-     * "gopherProxyAddress" value of <code>expectedProxies</code>.
-     *
-     * @see #expectedProxies
-     */
-    public void _getGopherProxyAddress() {
-        String gopherProxyAddress = oObj.getGopherProxyAddress();
-        String expectedGopherProxyAddress = expectedProxies.get("gopherProxyAddress");
-
-        tRes.tested("getGopherProxyAddress()",
-                gopherProxyAddress.equals(expectedGopherProxyAddress));
-    }
-
-    /**
-     * Calls <code>getGopherProxyPort()</code> and verifies its result with
-     * "gopherProxyPort" value of <code>expectedProxies</code>.
-     *
-     * @see #expectedProxies
-     */
-    public void _getGopherProxyPort() {
-        String gopherProxyPort = oObj.getGopherProxyPort();
-        String expectedGopherProxyPort = expectedProxies.get("gopherProxyPort");
-
-        tRes.tested("getGopherProxyPort()",
-                gopherProxyPort.equals(expectedGopherProxyPort));
-    }
-
-    /**
-     * Calls <code>getHttpProxyAddress()</code> and verifies its result with
-     * "httpProxyAddress" value of <code>expectedProxies</code>.
-     *
-     * @see #expectedProxies
-     */
-    public void _getHttpProxyAddress() {
-        String httpProxyAddress = oObj.getHttpProxyAddress();
-        String expectedHttpProxyAddress = expectedProxies.get("httpProxyAddress");
-
-        log.println("getHttpProxyAddress");
-        log.println("getting: "+httpProxyAddress);
-        log.println("expected: "+expectedHttpProxyAddress);
-
-        tRes.tested("getHttpProxyAddress()",
-                httpProxyAddress.equals(expectedHttpProxyAddress));
-    }
-
-    /**
-     * Calls <code>getHttpProxyPort()</code> and verifies its result with
-     * "httpProxyPort" value of <code>expectedProxies</code>.
-     *
-     * @see #expectedProxies
-     */
-    public void _getHttpProxyPort() {
-        String httpProxyPort = oObj.getHttpProxyPort();
-        String expectedHttpProxyPort = expectedProxies.get("httpProxyPort");
-
-        log.println("getHttpProxyPort");
-        log.println("getting: "+httpProxyPort);
-        log.println("expected: "+expectedHttpProxyPort);
-
-        tRes.tested("getHttpProxyPort()",
-                httpProxyPort.equals(expectedHttpProxyPort));
-    }
-
-    /**
-     * Calls <code>getHttpsProxyAddress()</code> and verifies its result with
-     * "httpsProxyAddress" value of <code>expectedProxies</code>.
-     *
-     * @see #expectedProxies
-     */
-    public void _getHttpsProxyAddress() {
-        String httpsProxyAddress = oObj.getHttpsProxyAddress();
-        String expectedHttpsProxyAddress = expectedProxies.get("httpsProxyAddress");
-
-        log.println("getHttpsProxyAddress");
-        log.println("getting: "+httpsProxyAddress);
-        log.println("expected: "+expectedHttpsProxyAddress);
-
-        tRes.tested("getHttpsProxyAddress()",
-                httpsProxyAddress.equals(expectedHttpsProxyAddress));
-    }
-
-    /**
-     * Calls <code>getHttpsProxyPort()</code> and verifies its result with
-     * "httpsProxyPort" value of <code>expectedProxies</code>.
-     *
-     * @see #expectedProxies
-     */
-    public void _getHttpsProxyPort() {
-        String httpsProxyPort = oObj.getHttpsProxyPort();
-        String expectedHttpsProxyPort = expectedProxies.get("httpsProxyPort");
-
-        log.println("getHttpsProxyPort");
-        log.println("getting: "+httpsProxyPort);
-        log.println("expected: "+expectedHttpsProxyPort);
-
-        tRes.tested("getHttpsProxyPort()",
-                httpsProxyPort.equals(expectedHttpsProxyPort));
-    }
-
-    /**
-     * Calls <code>getProxyBypassAddress()</code> and verifies its result with
-     * "proxyBypassAddress" value of <code>expectedProxies</code>.
-     *
-     * @see #expectedProxies
-     */
-    public void _getProxyBypassAddress() {
-        String proxyBypassAddress = oObj.getProxyBypassAddress();
-        String expectedProxyBypassAddress = expectedProxies.get("proxyBypassAddress");
-
-        log.println("getProxyBypassAddress");
-        log.println("getting: "+proxyBypassAddress);
-        log.println("expected: "+expectedProxyBypassAddress);
-
-        tRes.tested("getProxyBypassAddress()",
-                proxyBypassAddress.equals(expectedProxyBypassAddress));
-    }
-
-    /**
-     * Calls <code>getSocksProxyAddress()</code> and verifies its result with
-     * "socksProxyAddress" value of <code>expectedProxies</code>.
-     *
-     * @see #expectedProxies
-     */
-    public void _getSocksProxyAddress() {
-        String socksProxyAddress = oObj.getSocksProxyAddress();
-        String expectedSocksProxyAddress = expectedProxies.get("socksProxyAddress");
-
-        log.println("getSocksProxyAddress");
-        log.println("getting: "+socksProxyAddress);
-        log.println("expected: "+expectedSocksProxyAddress);
-
-        tRes.tested("getSocksProxyAddress()",
-                socksProxyAddress.equals(expectedSocksProxyAddress));
-    }
-
-    /**
-     * Calls <code>getSocksProxyPort()</code> and verifies its result with
-     * "socksProxyPort" value of <code>expectedProxies</code>.
-     *
-     * @see #expectedProxies
-     */
-    public void _getSocksProxyPort() {
-        String socksProxyPort = oObj.getSocksProxyPort();
-        String expectedSocksProxyPort = expectedProxies.get("socksProxyPort");
-
-        log.println("getSocksProxyPort");
-        log.println("getting: "+socksProxyPort);
-        log.println("expected: "+expectedSocksProxyPort);
-
-        tRes.tested("getSocksProxyPort()",
-                socksProxyPort.equals(expectedSocksProxyPort));
-    }
-
-    /**
-     * Calls <code>isProxyEnabled()</code> and verifies its result with
-     * "proxyEnabled" value of <code>expectedProxies</code>.
-     *
-     * @see #expectedProxies
-     */
-    public void _isProxyEnabled() {
-        boolean proxyEnabled = oObj.isProxyEnabled();
-
-        String proxyEnabledStr = expectedProxies.get("proxyEnabled");
-        boolean expected = proxyEnabledStr != null
-                && proxyEnabledStr.equalsIgnoreCase("true");
-
-        tRes.tested("isProxyEnabled()", proxyEnabled == expected);
-    }
-}
diff --git a/qadevOOo/tests/java/mod/_proxyset/SOffice52ProxySettings.java b/qadevOOo/tests/java/mod/_proxyset/SOffice52ProxySettings.java
deleted file mode 100644
index ed464e0630f4..000000000000
--- a/qadevOOo/tests/java/mod/_proxyset/SOffice52ProxySettings.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package mod._proxyset;
-
-import java.io.PrintWriter;
-import java.util.HashMap;
-
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.XInterface;
-
-/**
- * Test for object which is represented by service
- * <code>com.sun.star.system.SOffice52ProxySettings</code>. <p>
- * Object implements the following interfaces :
- * <ul>
- *  <li> <code>com::sun::star::lang::XServiceInfo</code></li>
- *  <li> <code>com::sun::star::system::XProxySettings</code></li>
- *  <li> <code>com::sun::star::lang::XTypeProvider</code></li>
- * </ul> <p>
- *
- * This object test <b> is NOT </b> designed to be run in several
- * threads concurently.
- *
- * @see com.sun.star.lang.XServiceInfo
- * @see com.sun.star.system.XProxySettings
- * @see com.sun.star.lang.XTypeProvider
- * @see ifc.lang._XServiceInfo
- * @see ifc.system._XProxySettings
- * @see ifc.lang._XTypeProvider
- */
-public class SOffice52ProxySettings extends TestCase {
-
-    /**
-     * Creating a Testenvironment for the interfaces to be tested.
-     * Creates an instance of
-     * <code>com.sun.star.system.SOffice52ProxySettings</code>,for testing.
-     *
-     *     Object relations created :
-     * <ul>
-     *  <li> <code>'XProxySettings.proxySettings'</code> for
-     *      {@link ifc.system._XProxySettings} : </li>
-     *   <p>It passes a HashMap with expected proxy settings as object
-     *   relation "XProxySettings.proxySettings", to verify results. The expected
-     *   settings are taken from parameters. The following parameters are recognized:
-     *   <ul>
-     *   <li>test.proxy.soffice52.ftpProxyAddress</li>
-     *   <li>test.proxy.soffice52.ftpProxyPort</li>
-     *   <li>test.proxy.soffice52.gopherProxyAddress</li>
-     *   <li>test.proxy.soffice52.gopherProxyPort</li>
-     *   <li>test.proxy.soffice52.httpProxyAddress</li>
-     *   <li>test.proxy.soffice52.httpProxyPort</li>
-     *   <li>test.proxy.soffice52.httpsProxyAddress</li>
-     *   <li>test.proxy.soffice52.httpsProxyPort</li>
-     *   <li>test.proxy.soffice52.socksProxyAddress</li>
-     *   <li>test.proxy.soffice52.socksProxyPort</li>
-     *   <li>test.proxy.soffice52.proxyBypassAddress</li>
-     *   <li>test.proxy.soffice52.proxyEnabled</li>
-     *   </ul>.
-     * </ul>
-     */
-    protected TestEnvironment createTestEnvironment(TestParameters tParam, PrintWriter log) {
-        XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF();
-        XInterface oObj = null;
-
-        try {
-            oObj = (XInterface)xMSF.createInstance(
-                        "com.sun.star.system.SOffice52ProxySettings");
-        } catch (com.sun.star.uno.Exception e) {
-            e.printStackTrace(log);
-            throw new StatusException("Unexpected exception", e);
-        }
-
-        String Iname = util.utils.getImplName(oObj);
-        log.println("Implementation Name: "+Iname);
-        TestEnvironment tEnv = new TestEnvironment(oObj);
-
-        // extracting parameters to proxy settings
-        HashMap<String, String> proxySettings = new HashMap<String, String>(12);
-
-        String prefix = "test.proxy.soffice52.";
-
-        final String[] names = {
-            "ftpProxyAddress",
-            "ftpProxyPort",
-            "gopherProxyAddress",
-            "gopherProxyPort",
-            "httpProxyAddress",
-            "httpProxyPort",
-            "httpsProxyAddress",
-            "httpsProxyPort",
-            "socksProxyAddress",
-            "socksProxyPort",
-            "proxyBypassAddress",
-            "proxyEnabled"
-        };
-
-        for (int i = 0; i < names.length; i++) {
-            String name = prefix + names[i];
-            String value = (String) tParam.get(name);
-
-            if (value == null) {
-                value = "";
-            }
-
-            proxySettings.put(names[i], value);
-        }
-
-        tEnv.addObjRelation("XProxySettings.proxySettings", proxySettings);
-
-        return tEnv;
-    }
-
-}    // finish class TestCase
-
diff --git a/qadevOOo/tests/java/mod/_proxyset/SystemProxySettings.java b/qadevOOo/tests/java/mod/_proxyset/SystemProxySettings.java
deleted file mode 100644
index a72ca716f627..000000000000
--- a/qadevOOo/tests/java/mod/_proxyset/SystemProxySettings.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package mod._proxyset;
-
-import java.io.PrintWriter;
-import java.util.HashMap;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.XInterface;
-
-/**
- * Test for object which is represented by service
- * <code>com.sun.star.system.SystemProxySettings</code>. <p>
- * Object implements the following interfaces :
- * <ul>
- *  <li> <code>com::sun::star::lang::XServiceInfo</code></li>
- *  <li> <code>com::sun::star::system::XProxySettings</code></li>
- *  <li> <code>com::sun::star::lang::XTypeProvider</code></li>
- * </ul> <p>
- *
- * This object test <b> is NOT </b> designed to be run in several
- * threads concurently.
- *
- * @see com.sun.star.lang.XServiceInfo
- * @see com.sun.star.system.XProxySettings
- * @see com.sun.star.lang.XTypeProvider
- * @see ifc.lang._XServiceInfo
- * @see ifc.system._XProxySettings
- * @see ifc.lang._XTypeProvider
- */
-public class SystemProxySettings extends TestCase {
-
-    /**
-     * Creating a Testenvironment for the interfaces to be tested.
-     * Creates an instance of
-     * <code>com.sun.star.system.SystemProxySettings</code>,for testing.
-     *
-     *     Object relations created :
-     * <ul>
-     *  <li> <code>'XProxySettings.proxySettings'</code> for
-     *      {@link ifc.system._XProxySettings} : </li>
-     *   <p>It passes a HashMap with expected proxy settings as object
-     *   relation "XProxySettings.proxySettings", to verify results. The expected
-     *   settings are taken from parameters. The following parameters are recognized:
-     *   <ul>
-     *   <li>test.proxy.soffice52.ftpProxyAddress</li>
-     *   <li>test.proxy.soffice52.ftpProxyPort</li>
-     *   <li>test.proxy.soffice52.gopherProxyAddress</li>
-     *   <li>test.proxy.soffice52.gopherProxyPort</li>
-     *   <li>test.proxy.soffice52.httpProxyAddress</li>
-     *   <li>test.proxy.soffice52.httpProxyPort</li>
-     *   <li>test.proxy.soffice52.httpsProxyAddress</li>
-     *   <li>test.proxy.soffice52.httpsProxyPort</li>
-     *   <li>test.proxy.soffice52.socksProxyAddress</li>
-     *   <li>test.proxy.soffice52.socksProxyPort</li>
-     *   <li>test.proxy.soffice52.proxyBypassAddress</li>
-     *   <li>test.proxy.soffice52.proxyEnabled</li>
-     *   </ul>.
-     * </ul>
-     */
-    protected TestEnvironment createTestEnvironment
-            (TestParameters tParam, PrintWriter log) {
-        XInterface oObj = null;
-        Object oInterface = null;
-
-        try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF();
-            oInterface = xMSF.createInstance
-                ( "com.sun.star.system.SystemProxySettings" );
-        }
-        catch( com.sun.star.uno.Exception e ) {
-            log.println("Service not available" );
-        }
-
-        oObj = (XInterface) oInterface;
-
-        log.println( "    creating a new environment for object" );
-        TestEnvironment tEnv = new TestEnvironment( oObj );
-
-        // extracting parameters to proxy settings
-        HashMap<String, String> proxySettings = new HashMap<String, String>(12);
-
-        String prefix = "test.proxy.system.";
-
-        final String[] names = {
-            "ftpProxyAddress",
-            "ftpProxyPort",
-            "gopherProxyAddress",
-            "gopherProxyPort",
-            "httpProxyAddress",
-            "httpProxyPort",
-            "httpsProxyAddress",
-            "httpsProxyPort",
-            "socksProxyAddress",
-            "socksProxyPort",
-            "proxyBypassAddress",
-            "proxyEnabled"
-        };
-
-        for (int i = 0; i < names.length; i++) {
-            String name = prefix + names[i];
-            String value = (String) tParam.get(name);
-
-            if (value == null) {
-                value = "";
-            }
-
-            proxySettings.put(names[i], value);
-        }
-
-        tEnv.addObjRelation("XProxySettings.proxySettings", proxySettings);
-
-        return tEnv;
-    }
-}
-