chore: Get rid of travis in DAV app

Signed-off-by: Ferdinand Thiessen <[email protected]>

.github/workflows/integration-dav.yml

@@ -99,9 +99,9 @@ jobs:
 
         - name: Run CalDAVTester
           run: |
-            cp "apps/dav/tests/travis/caldavtest/serverinfo-${{ matrix.endpoint }}${{ matrix.endpoint == 'old' && (matrix.service == 'CardDAV' && '-carddav' || '-caldav') || '' }}-endpoint.xml" "apps/dav/tests/travis/caldavtest/serverinfo.xml"
+            cp "apps/dav/tests/testsuits/caldavtest/serverinfo-${{ matrix.endpoint }}${{ matrix.endpoint == 'old' && (matrix.service == 'CardDAV' && '-carddav' || '-caldav') || '' }}-endpoint.xml" "apps/dav/tests/testsuits/caldavtest/serverinfo.xml"
             pushd CalDAVTester
-            PYTHONPATH="../pycalendar/src" python testcaldav.py --print-details-onfail --basedir "../apps/dav/tests/travis/caldavtest" -o cdt.txt \
+            PYTHONPATH="../pycalendar/src" python testcaldav.py --print-details-onfail --basedir "../apps/dav/tests/testsuits/caldavtest" -o cdt.txt \
               "${{ matrix.service }}/current-user-principal.xml" \
               "${{ matrix.service }}/sync-report.xml" \
               ${{ matrix.endpoint == 'new' && format('{0}/sharing-{1}.xml', matrix.service, matrix.service == 'CalDAV' && 'calendars' || 'addressbooks') || ';' }}

.reuse/dep5

@@ -71,7 +71,7 @@ Files: themes/example/core/img/favicon-touch.png themes/example/core/img/favicon
 Copyright: 2015 ownCloud, Inc., 2016 Nextcloud GmbH and Nextcloud contributors
 License: AGPL-3.0-only
 
-Files: tests/data/testapp.zip tests/data/testapp2.zip tests/docker/mariadb/oc.cnf apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/2.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/3.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/4.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/5.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/6.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf
+Files: tests/data/testapp.zip tests/data/testapp2.zip tests/docker/mariadb/oc.cnf apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/1.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/2.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/3.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/4.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/5.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/6.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf
 Copyright: 2016 ownCloud, Inc.
 License: AGPL-3.0-only
 
@@ -147,7 +147,7 @@ Files: build/stubs/app_api.php build/stubs/SensitiveParameter.phpstub build/stub
 Copyright: 2023 Nextcloud GmbH and Nextcloud contributors
 License: AGPL-3.0-or-later
 
-Files: apps/dav/tests/misc/caldav-search-limit-timerange-1.ics apps/dav/tests/misc/caldav-search-limit-timerange-2.ics apps/dav/tests/misc/caldav-search-limit-timerange-3.ics apps/dav/tests/misc/caldav-search-limit-timerange-4.ics apps/dav/tests/misc/caldav-search-limit-timerange-5.ics apps/dav/tests/misc/caldav-search-limit-timerange-6.ics apps/dav/tests/misc/caldav-search-missing-start-1.ics apps/dav/tests/misc/caldav-search-missing-start-2.ics
+Files: apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-1.ics apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-2.ics apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-3.ics apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-4.ics apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-5.ics apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-6.ics apps/dav/tests/unit/test_fixtures/caldav-search-missing-start-1.ics apps/dav/tests/unit/test_fixtures/caldav-search-missing-start-2.ics
 Copyright: 2023 Nextcloud GmbH and Nextcloud contributors
 License: AGPL-3.0-or-later
 

apps/dav/tests/travis/caldavtest/serverinfo-new-endpoint.xml → apps/dav/tests/testsuits/caldavtest/serverinfo-new-endpoint.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<!DOCTYPE serverinfo SYSTEM
-		"/home/deepdiver/Development/ownCloud/master/apps/dav/tests/travis/caldavtest/serverinfo.dtd">
+<!DOCTYPE serverinfo SYSTEM "./serverinfo.dtd">
 
 <!--
   - SPDX-FileCopyrightText: 2006-2015 Apple Inc. All rights reserved.

apps/dav/tests/travis/caldavtest/serverinfo-old-caldav-endpoint.xml → apps/dav/tests/testsuits/caldavtest/serverinfo-old-caldav-endpoint.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<!DOCTYPE serverinfo SYSTEM
-		"/home/deepdiver/Development/ownCloud/master/apps/dav/tests/travis/caldavtest/serverinfo.dtd">
+<!DOCTYPE serverinfo SYSTEM "./serverinfo.dtd">
 
 <!--
   - SPDX-FileCopyrightText: 2006-2015 Apple Inc. All rights reserved.

apps/dav/tests/travis/caldavtest/serverinfo-old-carddav-endpoint.xml → apps/dav/tests/testsuits/caldavtest/serverinfo-old-carddav-endpoint.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 
-<!DOCTYPE serverinfo SYSTEM
-		"/home/deepdiver/Development/ownCloud/master/apps/dav/tests/travis/caldavtest/serverinfo.dtd">
+<!DOCTYPE serverinfo SYSTEM "./serverinfo.dtd">
 
 <!--
   - SPDX-FileCopyrightText: 2006-2015 Apple Inc. All rights reserved.

apps/dav/tests/unit/CalDAV/CalDavBackendTest.php

@@ -117,7 +117,7 @@ public function providesSharingData() {
 	public function testCalendarSharing($userCanRead, $userCanWrite, $groupCanRead, $groupCanWrite, $add, $principals): void {
 		$logger = $this->createMock(\Psr\Log\LoggerInterface::class);
 		$config = $this->createMock(IConfig::class);
-		/** @var IL10N|MockObject $l10n */
+
 		$l10n = $this->createMock(IL10N::class);
 		$l10n->expects($this->any())
 			->method('t')
@@ -1655,12 +1655,12 @@ public function testSearchWithLimitAndTimeRange(): void {
 		];
 
 		$testFiles = [
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-1.ics',
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-2.ics',
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-3.ics',
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-4.ics',
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-5.ics',
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-6.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics',
 		];
 
 		foreach ($testFiles as $testFile) {
@@ -1712,12 +1712,12 @@ public function testSearchWithLimitAndTimeRangeShouldNotReturnMoreObjectsThenLim
 		];
 
 		$testFiles = [
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-1.ics',
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-2.ics',
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-3.ics',
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-4.ics',
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-5.ics',
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-6.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics',
 		];
 
 		foreach ($testFiles as $testFile) {
@@ -1762,12 +1762,12 @@ public function testSearchWithLimitAndTimeRangeShouldReturnObjectsInTheSameOrder
 		];
 
 		$testFiles = [
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-1.ics',
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-2.ics',
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-3.ics',
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-4.ics',
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-6.ics', // <-- intentional!
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-5.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics', // <-- intentional!
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
 		];
 
 		foreach ($testFiles as $testFile) {
@@ -1819,10 +1819,10 @@ public function testSearchShouldReturnObjectsInTheSameOrderMissingDate(): void {
 		];
 
 		$testFiles = [
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-6.ics', // <-- intentional!
-			__DIR__ . '/../../misc/caldav-search-limit-timerange-5.ics',
-			__DIR__ . '/../../misc/caldav-search-missing-start-1.ics',
-			__DIR__ . '/../../misc/caldav-search-missing-start-2.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics', // <-- intentional!
+			__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-missing-start-1.ics',
+			__DIR__ . '/../test_fixtures/caldav-search-missing-start-2.ics',
 		];
 
 		foreach ($testFiles as $testFile) {

apps/dav/tests/unit/phpunit.xml

@@ -26,4 +26,3 @@
 		<log type="coverage-clover" target="./clover.xml"/>
 	</logging>
 </phpunit>
-