From 28327c28ced32f181ed9b5c4921fd844e549980d Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 29 Nov 2012 23:40:26 +0100 Subject: 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 --- framework/qa/complex/api_internal/api.lst | 1 - framework/qa/complex/api_internal/worksforme.sce | 1 - offapi/UnoApi_offapi.mk | 6 - offapi/com/sun/star/system/ProxySettings.idl | 44 ---- .../com/sun/star/system/SOffice52ProxySettings.idl | 46 ---- offapi/com/sun/star/system/SystemProxySettings.idl | 44 ---- offapi/com/sun/star/system/XProxySettings.idl | 117 --------- offapi/type_reference/types.rdb | Bin 7486976 -> 7486976 bytes qadevOOo/Jar_OOoRunner.mk | 3 - ...om.sun.star.comp.system.SystemProxySettings.csv | 17 -- .../tests/java/ifc/system/_XProxySettings.java | 286 --------------------- .../java/mod/_proxyset/SOffice52ProxySettings.java | 135 ---------- .../java/mod/_proxyset/SystemProxySettings.java | 136 ---------- shell/source/win32/workbench/TestProxySet.cxx | 183 ------------- shell/source/win32/workbench/makefile.mk | 13 - 15 files changed, 1032 deletions(-) delete mode 100644 offapi/com/sun/star/system/ProxySettings.idl delete mode 100644 offapi/com/sun/star/system/SOffice52ProxySettings.idl delete mode 100644 offapi/com/sun/star/system/SystemProxySettings.idl delete mode 100644 offapi/com/sun/star/system/XProxySettings.idl delete mode 100644 qadevOOo/objdsc/proxyset/com.sun.star.comp.system.SystemProxySettings.csv delete mode 100644 qadevOOo/tests/java/ifc/system/_XProxySettings.java delete mode 100644 qadevOOo/tests/java/mod/_proxyset/SOffice52ProxySettings.java delete mode 100644 qadevOOo/tests/java/mod/_proxyset/SystemProxySettings.java delete mode 100644 shell/source/win32/workbench/TestProxySet.cxx diff --git a/framework/qa/complex/api_internal/api.lst b/framework/qa/complex/api_internal/api.lst index bf4656231560..f045d179e632 100644 --- a/framework/qa/complex/api_internal/api.lst +++ b/framework/qa/complex/api_internal/api.lst @@ -64,7 +64,6 @@ job63=mcnttype.MimeContentTypeFactory job64=namingservice.uno.NamingService job65=nestedreg.uno.NestedRegistry job66=proxyfac.uno.ProxyFactory -job67=proxyset.SOffice52ProxySettings job68=regtypeprov.uno.RegistryTypeDescriptionProvider job69=remotebridge.uno.various job70=sc.AccessibleEditableTextPara_HeaderFooter diff --git a/framework/qa/complex/api_internal/worksforme.sce b/framework/qa/complex/api_internal/worksforme.sce index 9efc6e14c4a0..c411bb337e0e 100644 --- a/framework/qa/complex/api_internal/worksforme.sce +++ b/framework/qa/complex/api_internal/worksforme.sce @@ -17,7 +17,6 @@ # job=cmdmail.SimpleCommandMail job=fileacc.SimpleFileAccess -job=proxyset.SOffice52ProxySettings job=sc.ScCellFieldObj job=sc.ScCellFieldsObj job=sc.XMLImporter diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 1bbff25a1f4b..c6bae56e3226 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -269,7 +269,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smarttags, SmartTagRecognizer \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/system,\ - ProxySettings \ SimpleCommandMail \ SimpleSystemMail \ SystemShellExecute \ @@ -1180,10 +1179,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/style,\ StyleFamilies \ StyleFamily \ )) -$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/system,\ - SOffice52ProxySettings \ - SystemProxySettings \ -)) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/table,\ AccessibleCellView \ AccessibleTableView \ @@ -3477,7 +3472,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/system,\ SimpleMailClientFlags \ SystemShellExecuteException \ SystemShellExecuteFlags \ - XProxySettings \ XSimpleMailClient \ XSimpleMailClientSupplier \ XSimpleMailMessage \ diff --git a/offapi/com/sun/star/system/ProxySettings.idl b/offapi/com/sun/star/system/ProxySettings.idl deleted file mode 100644 index 307a56cb1faf..000000000000 --- a/offapi/com/sun/star/system/ProxySettings.idl +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#ifndef __com_sun_star_system_ProxySettings_idl__ -#define __com_sun_star_system_ProxySettings_idl__ - - -module com { module sun { module star { module system { - - -published interface XProxySettings; - -/** Specifies a service for reading the proxy settings from an old office - installation or a central system database. - - @see com::sun::star::system::XProxySettings - - @deprecated -*/ - -published service ProxySettings : XProxySettings; - - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/system/SOffice52ProxySettings.idl b/offapi/com/sun/star/system/SOffice52ProxySettings.idl deleted file mode 100644 index 241ef3e9ba7a..000000000000 --- a/offapi/com/sun/star/system/SOffice52ProxySettings.idl +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#ifndef __com_sun_star_system_SOffice52ProxySettings_idl__ -#define __com_sun_star_system_SOffice52ProxySettings_idl__ - -#include - - -module com { module sun { module star { module system { - -/** Specifies a service for reading the proxy settings from an old - StarOffice 5.2 installation. - - @see com::sun::star::system::ProxySettings - - @deprecated -*/ - -published service SOffice52ProxySettings -{ - service ProxySettings; -}; - - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/system/SystemProxySettings.idl b/offapi/com/sun/star/system/SystemProxySettings.idl deleted file mode 100644 index 668ac25e3cd6..000000000000 --- a/offapi/com/sun/star/system/SystemProxySettings.idl +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#ifndef __com_sun_star_system_SystemProxySettings_idl__ -#define __com_sun_star_system_SystemProxySettings_idl__ - -#include - - -module com { module sun { module star { module system { - -/** Specifies a service for reading the system proxy settings. Some systems - store this information in a central configuration database. - - @deprecated -*/ - -published service SystemProxySettings -{ - service ProxySettings; -}; - - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/system/XProxySettings.idl b/offapi/com/sun/star/system/XProxySettings.idl deleted file mode 100644 index e53452c1349f..000000000000 --- a/offapi/com/sun/star/system/XProxySettings.idl +++ /dev/null @@ -1,117 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#ifndef __com_sun_star_system_XProxySettings_idl__ -#define __com_sun_star_system_XProxySettings_idl__ - -#include -#include - - -module com { module sun { module star { module system { - -/** Enables access to different proxy settings. If particular settings are not - available an empty string will be returned. - - @deprecated -*/ - -published interface XProxySettings: com::sun::star::uno::XInterface -{ - /** Access to the FTP proxy address. - @returns - The address of the FTP proxy server, if any has been specified. - */ - string getFtpProxyAddress( ); - - /** Access to the FTP proxy port. - @returns - The port of the FTP proxy server, if any has been specified. - */ - string getFtpProxyPort( ); - - /** Access to the Gopher proxy address. - @returns - The address of the gopher proxy server, if any has been specified. - */ - string getGopherProxyAddress( ); - - /** Access to the Gopher proxy port. - @returns - The port of the gopher proxy server, if any has been specified. - */ - string getGopherProxyPort( ); - - /** Access to the Http proxy address. - @returns - The address of the http proxy server, if any has been specified. - */ - string getHttpProxyAddress( ); - - /** Access to the Http proxy port. - @returns - The port of the http proxy server, if any has been specified. - */ - string getHttpProxyPort( ); - - /** Access to the HTTPS proxy address. - @returns - The address of the HTTPS proxy server, if any has been specified. - */ - string getHttpsProxyAddress( ); - - /** Access to the HTTPS proxy port. - @returns - The port of the HTTPS proxy server, if any has been specified. - */ - string getHttpsProxyPort( ); - - /** Access to the Socks proxy address. - @returns - The address of the socks proxy server, if any has been specified. - */ - string getSocksProxyAddress( ); - - /** Access to the Socks proxy port. - @returns - The port of the socks proxy server, if any has been specified. - */ - string getSocksProxyPort( ); - - /** Access to the Proxy-Bypass address. - @returns - A string of ";" separated addresses for which no proxy server - should be used. - */ - string getProxyBypassAddress( ); - - /** Either a proxy is enabled or not. - @returns - A value of if a proxy is enabled. -

A value of if a proxy is disabled.

- */ - boolean isProxyEnabled( ); -}; - - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb index 7fc0995f27e7..1190d094d5e3 100644 Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index b67cb238787f..eac17854d02c 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -788,7 +788,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/style/_Style \ qadevOOo/tests/java/ifc/style/_XStyle \ qadevOOo/tests/java/ifc/style/_XStyleFamiliesSupplier \ - qadevOOo/tests/java/ifc/system/_XProxySettings \ qadevOOo/tests/java/ifc/system/_XSimpleMailClientSupplier \ qadevOOo/tests/java/ifc/system/_XSystemShellExecute \ qadevOOo/tests/java/ifc/table/_CellProperties \ @@ -1127,8 +1126,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel \ qadevOOo/tests/java/mod/_proxyfac/ProxyFactory \ qadevOOo/tests/java/mod/_proxyfac/uno/ProxyFactory \ - qadevOOo/tests/java/mod/_proxyset/SOffice52ProxySettings \ - qadevOOo/tests/java/mod/_proxyset/SystemProxySettings \ qadevOOo/tests/java/mod/_qadevOOo/SelfTest \ qadevOOo/tests/java/mod/_rdbtdp/RegistryTypeDescriptionProvider \ qadevOOo/tests/java/mod/_regtypeprov/uno/RegistryTypeDescriptionProvider \ diff --git a/qadevOOo/objdsc/proxyset/com.sun.star.comp.system.SystemProxySettings.csv b/qadevOOo/objdsc/proxyset/com.sun.star.comp.system.SystemProxySettings.csv deleted file mode 100644 index e4a1ca43edbb..000000000000 --- a/qadevOOo/objdsc/proxyset/com.sun.star.comp.system.SystemProxySettings.csv +++ /dev/null @@ -1,17 +0,0 @@ -"SystemProxySettings";"com::sun::star::lang::XServiceInfo";"getImplementationName()" -"SystemProxySettings";"com::sun::star::lang::XServiceInfo";"supportsService()" -"SystemProxySettings";"com::sun::star::lang::XServiceInfo";"getSupportedServiceNames()" -"SystemProxySettings";"com::sun::star::lang::XTypeProvider";"getTypes()" -"SystemProxySettings";"com::sun::star::lang::XTypeProvider";"getImplementationId()" -"SystemProxySettings";"com::sun::star::system::XProxySettings";"getFtpProxyAddress()" -"SystemProxySettings";"com::sun::star::system::XProxySettings";"getFtpProxyPort()" -"SystemProxySettings";"com::sun::star::system::XProxySettings";"getGopherProxyAddress()" -"SystemProxySettings";"com::sun::star::system::XProxySettings";"getGopherProxyPort()" -"SystemProxySettings";"com::sun::star::system::XProxySettings";"getHttpProxyAddress()" -"SystemProxySettings";"com::sun::star::system::XProxySettings";"getHttpProxyPort()" -"SystemProxySettings";"com::sun::star::system::XProxySettings";"getHttpsProxyAddress()" -"SystemProxySettings";"com::sun::star::system::XProxySettings";"getHttpsProxyPort()" -"SystemProxySettings";"com::sun::star::system::XProxySettings";"getSocksProxyAddress()" -"SystemProxySettings";"com::sun::star::system::XProxySettings";"getSocksProxyPort()" -"SystemProxySettings";"com::sun::star::system::XProxySettings";"getProxyBypassAddress()" -"SystemProxySettings";"com::sun::star::system::XProxySettings";"isProxyEnabled()" 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 com.sun.star.system.XProxySettings 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: - *
    - *
  • ftpProxyAddress
    • - *
  • ftpProxyPort
    • - *
  • gopherProxyAddress
    • - *
  • gopherProxyPort
    • - *
  • httpProxyAddress
    • - *
  • httpProxyPort
    • - *
  • httpsProxyAddress
    • - *
  • httpsProxyPort
    • - *
  • socksProxyAddress
    • - *
  • socksProxyPort
    • - *
  • proxyBypassAddress
    • - *
  • proxyEnabled
    • - *
. - * Each value for a key, should be a String specifying the correct result of - * the corresponding getXXX() method of XProxySettings interface. - *

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 expectedProxies; - - /** - * Checks that the "XProxySettings.proxySettings" object relation is - * specified and stores its value to expectedProxies field. - * - * @throws StatusException is the object relation is not specified. - * - * @see #expectedProxies - */ - @SuppressWarnings("unchecked") - public void before() { - expectedProxies = (Map)tEnv.getObjRelation( - "XProxySettings.proxySettings"); - - if (expectedProxies == null) { - throw new StatusException( - Status.failed("Expected proxy settings are not specified")); - } - } - - /** - * Calls getFtpProxyAddress() and verifies its result with - * "ftpProxyAddress" value of expectedProxies. - * - * @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 getFtpProxyPort() and verifies its result with - * "ftpProxyPort" value of expectedProxies. - * - * @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 getGopherProxyAddress() and verifies its result with - * "gopherProxyAddress" value of expectedProxies. - * - * @see #expectedProxies - */ - public void _getGopherProxyAddress() { - String gopherProxyAddress = oObj.getGopherProxyAddress(); - String expectedGopherProxyAddress = expectedProxies.get("gopherProxyAddress"); - - tRes.tested("getGopherProxyAddress()", - gopherProxyAddress.equals(expectedGopherProxyAddress)); - } - - /** - * Calls getGopherProxyPort() and verifies its result with - * "gopherProxyPort" value of expectedProxies. - * - * @see #expectedProxies - */ - public void _getGopherProxyPort() { - String gopherProxyPort = oObj.getGopherProxyPort(); - String expectedGopherProxyPort = expectedProxies.get("gopherProxyPort"); - - tRes.tested("getGopherProxyPort()", - gopherProxyPort.equals(expectedGopherProxyPort)); - } - - /** - * Calls getHttpProxyAddress() and verifies its result with - * "httpProxyAddress" value of expectedProxies. - * - * @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 getHttpProxyPort() and verifies its result with - * "httpProxyPort" value of expectedProxies. - * - * @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 getHttpsProxyAddress() and verifies its result with - * "httpsProxyAddress" value of expectedProxies. - * - * @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 getHttpsProxyPort() and verifies its result with - * "httpsProxyPort" value of expectedProxies. - * - * @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 getProxyBypassAddress() and verifies its result with - * "proxyBypassAddress" value of expectedProxies. - * - * @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 getSocksProxyAddress() and verifies its result with - * "socksProxyAddress" value of expectedProxies. - * - * @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 getSocksProxyPort() and verifies its result with - * "socksProxyPort" value of expectedProxies. - * - * @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 isProxyEnabled() and verifies its result with - * "proxyEnabled" value of expectedProxies. - * - * @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 - * com.sun.star.system.SOffice52ProxySettings.

- * Object implements the following interfaces : - *

    - *
  • com::sun::star::lang::XServiceInfo
    • - *
  • com::sun::star::system::XProxySettings
    • - *
  • com::sun::star::lang::XTypeProvider
    • - *

- * - * This object test is NOT 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 - * com.sun.star.system.SOffice52ProxySettings,for testing. - * - * Object relations created : - *

    - *
  • 'XProxySettings.proxySettings' for - * {@link ifc.system._XProxySettings} :
    • - *

    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: - *

      - *
    • test.proxy.soffice52.ftpProxyAddress
      • - *
    • test.proxy.soffice52.ftpProxyPort
      • - *
    • test.proxy.soffice52.gopherProxyAddress
      • - *
    • test.proxy.soffice52.gopherProxyPort
      • - *
    • test.proxy.soffice52.httpProxyAddress
      • - *
    • test.proxy.soffice52.httpProxyPort
      • - *
    • test.proxy.soffice52.httpsProxyAddress
      • - *
    • test.proxy.soffice52.httpsProxyPort
      • - *
    • test.proxy.soffice52.socksProxyAddress
      • - *
    • test.proxy.soffice52.socksProxyPort
      • - *
    • test.proxy.soffice52.proxyBypassAddress
      • - *
    • test.proxy.soffice52.proxyEnabled
      • - *
    . - *
- */ - 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 proxySettings = new HashMap(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 - * com.sun.star.system.SystemProxySettings.

- * Object implements the following interfaces : - *

    - *
  • com::sun::star::lang::XServiceInfo
    • - *
  • com::sun::star::system::XProxySettings
    • - *
  • com::sun::star::lang::XTypeProvider
    • - *

- * - * This object test is NOT 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 - * com.sun.star.system.SystemProxySettings,for testing. - * - * Object relations created : - *

    - *
  • 'XProxySettings.proxySettings' for - * {@link ifc.system._XProxySettings} :
    • - *

    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: - *

      - *
    • test.proxy.soffice52.ftpProxyAddress
      • - *
    • test.proxy.soffice52.ftpProxyPort
      • - *
    • test.proxy.soffice52.gopherProxyAddress
      • - *
    • test.proxy.soffice52.gopherProxyPort
      • - *
    • test.proxy.soffice52.httpProxyAddress
      • - *
    • test.proxy.soffice52.httpProxyPort
      • - *
    • test.proxy.soffice52.httpsProxyAddress
      • - *
    • test.proxy.soffice52.httpsProxyPort
      • - *
    • test.proxy.soffice52.socksProxyAddress
      • - *
    • test.proxy.soffice52.socksProxyPort
      • - *
    • test.proxy.soffice52.proxyBypassAddress
      • - *
    • test.proxy.soffice52.proxyEnabled
      • - *
    . - *
- */ - 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 proxySettings = new HashMap(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; - } -} - diff --git a/shell/source/win32/workbench/TestProxySet.cxx b/shell/source/win32/workbench/TestProxySet.cxx deleted file mode 100644 index 8d472c0c8e5c..000000000000 --- a/shell/source/win32/workbench/TestProxySet.cxx +++ /dev/null @@ -1,183 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef WNT - -#include -#if defined _MSC_VER -#pragma warning(push, 1) -#endif -#include -#if defined _MSC_VER -#pragma warning(pop) -#endif - -#endif - -//-------------------------------------------------------------- -// namesapces -//-------------------------------------------------------------- - -using namespace ::rtl ; -using namespace ::cppu ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::lang ; -using namespace std ; -using namespace com::sun::star::system; - -#ifdef WNT - -#define RDB_SYSPATH "D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\applicat.rdb" - -#endif - -//-------------------------------------------------------------- -// global variables -//-------------------------------------------------------------- - -Reference< XMultiServiceFactory > g_xFactory; - -//-------------------------------------------------------------- -// main -//-------------------------------------------------------------- - - -// int SAL_CALL main(int nArgc, char* Argv[], char* Env[] ) -int SAL_CALL main(int, char*, char* ) -{ - //------------------------------------------------- - // get the global service-manager - //------------------------------------------------- - - // Get global factory for uno services. - OUString rdbName = OUString( RDB_SYSPATH ); - Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) ); - - // Print a message if an error occurred. - if ( g_xFactory.is() == sal_False ) - { - OSL_FAIL("Can't create RegistryServiceFactory"); - return(-1); - } - - printf("Creating RegistryServiceFactory successful\n"); - - //------------------------------------------------- - // try to get an Interface to a XFilePicker Service - //------------------------------------------------- - - try - { - Reference< XProxySettings > xProxySettings( - g_xFactory->createInstance( OUString("com.sun.star.system.SystemProxySettings") ), UNO_QUERY ); - - if ( !xProxySettings.is() ) - { - OSL_FAIL( "Error creating SystemProxySettings Service" ); - return(-1); - } - - printf( "Creating instance of SystemProxySettings successful\n" ); - - OUString ftpProxy = xProxySettings->getFtpProxyAddress( ); - OUString httpProxy = xProxySettings->getHttpProxyAddress( ); - OUString httpsProxy = xProxySettings->getHttpsProxyAddress( ); - OUString socksProxy = xProxySettings->getSocksProxyAddress( ); - OUString gopherProxy = xProxySettings->getGopherProxyAddress( ); - - OUString ftpProxyPort = xProxySettings->getFtpProxyPort( ); - OUString httpProxyPort = xProxySettings->getHttpProxyPort( ); - OUString httpsProxyPort = xProxySettings->getHttpsProxyPort( ); - OUString socksProxyPort = xProxySettings->getSocksProxyPort( ); - OUString gopherProxyPort = xProxySettings->getGopherProxyPort( ); - - OUString proxyBypass = xProxySettings->getProxyBypassAddress( ); - - printf( "Test of SystemProxySettings successful\n" ); - - xProxySettings = Reference< XProxySettings >( - g_xFactory->createInstance( OUString("com.sun.star.system.SOProxySettings") ), UNO_QUERY ); - - if ( !xProxySettings.is() ) - { - OSL_FAIL( "Error creating SystemProxySettings Service" ); - return(-1); - } - - printf( "Creating instance of SOProxySettings successful\n" ); - - ftpProxy = xProxySettings->getFtpProxyAddress( ); - httpProxy = xProxySettings->getHttpProxyAddress( ); - httpsProxy = xProxySettings->getHttpsProxyAddress( ); - socksProxy = xProxySettings->getSocksProxyAddress( ); - gopherProxy = xProxySettings->getGopherProxyAddress( ); - - ftpProxyPort = xProxySettings->getFtpProxyPort( ); - httpProxyPort = xProxySettings->getHttpProxyPort( ); - httpsProxyPort = xProxySettings->getHttpsProxyPort( ); - socksProxyPort = xProxySettings->getSocksProxyPort( ); - gopherProxyPort = xProxySettings->getGopherProxyPort( ); - - proxyBypass = xProxySettings->getProxyBypassAddress( ); - - sal_Bool bProxyEnabled = xProxySettings->isProxyEnabled( ); - if (bProxyEnabled) - { - printf("Test ProxyEnabled true\n"); - } - - printf( "Test of SOProxySettings successful\n" ); - } - catch( Exception& ) - { - } - - //-------------------------------------------------- - // shutdown - //-------------------------------------------------- - - // Cast factory to XComponent - Reference< XComponent > xComponent( g_xFactory, UNO_QUERY ); - - // Print a message if an error occurred. - if ( xComponent.is() == sal_False ) - { - OSL_FAIL("Error shuting down"); - } - - // Dispose and clear factory - xComponent->dispose(); - g_xFactory.clear(); - g_xFactory = Reference< XMultiServiceFactory >(); - - printf("Test successful\n"); - - return 0; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/win32/workbench/makefile.mk b/shell/source/win32/workbench/makefile.mk index 277ec062bf69..d55a7999d70e 100644 --- a/shell/source/win32/workbench/makefile.mk +++ b/shell/source/win32/workbench/makefile.mk @@ -21,7 +21,6 @@ PRJ=..$/..$/.. PRJNAME=shell TARGET=testsyssh TARGET1=testsmplmail -TARGET2=testprx TARGET4=testfopen LIBTARGET=NO TARGETTYPE=CUI @@ -36,7 +35,6 @@ CFLAGS+=/GX OBJFILES1=$(OBJ)$/TestSysShExec.obj OBJFILES2=$(OBJ)$/TestSmplMail.obj -OBJFILES3=$(OBJ)$/TestProxySet.obj OBJFILES4=$(OBJ)$/Testfopen.obj OBJFILES=$(OBJFILES1)\ @@ -65,17 +63,6 @@ APP2STDLIBS+= $(CPPULIB) \ APP2DEF= $(MISC)$/$(APP2TARGET).def -# --- TestProxy --- - -APP3TARGET=$(TARGET2) -APP3OBJS=$(OBJFILES3) - -APP3STDLIBS+= $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) - -APP3DEF= $(MISC)$/$(APP3TARGET).def - # --- Testfopen --- APP4TARGET=$(TARGET4) -- cgit