summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2023-11-07 11:57:58 +0100
committerMichael Stahl <michael.stahl@allotropia.de>2023-11-09 16:51:42 +0100
commit4a26dcac8e4f3ff3cbc3c356ad0a34968ef9d8fe (patch)
tree73cc949ad18d73cdfa88cd640c94ac9e42da04d5 /qadevOOo
parent5365daf67f8b81f69a47e3692a71fd3962505e46 (diff)
tdf#146386 curl,ucb: remove FTP UCP
FTP support has been deprecated since LO 7.4. The UCP currently doesn't even support TLS connections. Also disable FTP protocol in libcurl. Also remove JunitTest_ucb_complex: turns out the only test in it, checkWrongFtpConnection, fails on Linux because now GIO UCP handles ftp:// URLs and it throws InteractiveAugmentedIOException instead of expected ones, and on other platforms it would fail differently because there is no GIO. Change-Id: I4631d124371fef390f105fb16bf09aaa59e739e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159065 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/Jar_OOoRunner.mk1
-rw-r--r--qadevOOo/objdsc/ucpftp/com.sun.star.comp.ucb.FTPContentProvider.csv2
-rw-r--r--qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java66
3 files changed, 0 insertions, 69 deletions
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 365ea75bc71b..3ba2d4525aee 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -1232,7 +1232,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_ucpchelp/CHelpContentProvider \
qadevOOo/tests/java/mod/_ucpdav/WebDAVContentProvider \
qadevOOo/tests/java/mod/_ucpfile/FileProvider \
- qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider \
qadevOOo/tests/java/mod/_ucphier/HierarchyContentProvider \
qadevOOo/tests/java/mod/_ucphier/HierarchyDataSource \
qadevOOo/tests/java/mod/_ucppkg/PackageContentProvider \
diff --git a/qadevOOo/objdsc/ucpftp/com.sun.star.comp.ucb.FTPContentProvider.csv b/qadevOOo/objdsc/ucpftp/com.sun.star.comp.ucb.FTPContentProvider.csv
deleted file mode 100644
index c5adee391f2a..000000000000
--- a/qadevOOo/objdsc/ucpftp/com.sun.star.comp.ucb.FTPContentProvider.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"FTPContentProvider";"com::sun::star::ucb::XContentProvider";"queryContent()"
-"FTPContentProvider";"com::sun::star::ucb::XContentProvider";"compareContentIds()"
diff --git a/qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java b/qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java
deleted file mode 100644
index 7bb047214d37..000000000000
--- a/qadevOOo/tests/java/mod/_ucpftp/FTPContentProvider.java
+++ /dev/null
@@ -1,66 +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._ucpftp;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.ucb.XContentIdentifierFactory;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-public class FTPContentProvider extends TestCase {
-
- @Override
- public TestEnvironment createTestEnvironment
- ( TestParameters Param,PrintWriter log ) throws Exception {
-
- XInterface oObj = null;
- Object oInterface = null;
- Object aUCB = null;
-
- XMultiServiceFactory xMSF = Param.getMSF();
- oInterface = xMSF.createInstance
- ( "com.sun.star.ucb.FTPContentProvider" );
- aUCB = xMSF.createInstance
- ( "com.sun.star.comp.ucb.UniversalContentBroker" );
-
- oObj = (XInterface) oInterface;
-
- XContentIdentifierFactory CIF = UnoRuntime.queryInterface(XContentIdentifierFactory.class,aUCB);
-
- log.println("ImplementationName: "+util.utils.getImplName(oObj));
- util.dbg.printInterfaces(oObj);
- TestEnvironment tEnv = new TestEnvironment( oObj );
-
- //Adding ObjRelation for XContentProvider
- tEnv.addObjRelation("FACTORY",CIF);
- tEnv.addObjRelation("CONTENT1","ftp:///ftp.sun.com");
- tEnv.addObjRelation("CONTENT2","ftp:///ftp.openoffice.org");
-
- return tEnv;
-
- } // finish method getTestEnvironment
-
-} // finish class FileProvider
-