From e6363ac580e844c2da3c30db66f6ac44818377fd Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Thu, 19 Sep 2024 18:54:43 +0200
Subject: [PATCH] chore: Get rid of travis in DAV app

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
---
 .github/workflows/integration-dav.yml         |  4 +-
 apps/dav/tests/misc/sharing.xml               | 11 -----
 .../{travis => testsuits}/caldav/install.sh   |  0
 .../caldav/script-new-endpoint.sh             |  0
 .../caldav/script-old-endpoint.sh             |  0
 .../CalDAV/current-user-principal/1.xml       |  0
 .../data/Resource/CalDAV/reports/put/1.txt    |  0
 .../data/Resource/CalDAV/reports/put/1.xml    |  0
 .../data/Resource/CalDAV/reports/put/2.txt    |  0
 .../data/Resource/CalDAV/reports/put/3.txt    |  0
 .../data/Resource/CalDAV/reports/put/4.txt    |  0
 .../data/Resource/CalDAV/reports/put/5.txt    |  0
 .../data/Resource/CalDAV/reports/put/6.txt    |  0
 .../data/Resource/CalDAV/reports/sync/1.xml   |  0
 .../data/Resource/CalDAV/reports/sync/10.xml  |  0
 .../data/Resource/CalDAV/reports/sync/11.xml  |  0
 .../data/Resource/CalDAV/reports/sync/2.xml   |  0
 .../data/Resource/CalDAV/reports/sync/21.xml  |  0
 .../data/Resource/CalDAV/reports/sync/3.xml   |  0
 .../data/Resource/CalDAV/reports/sync/4.xml   |  0
 .../data/Resource/CalDAV/reports/sync/5.xml   |  0
 .../data/Resource/CalDAV/reports/sync/6.xml   |  0
 .../data/Resource/CalDAV/reports/sync/7.xml   |  0
 .../data/Resource/CalDAV/reports/sync/8.xml   |  0
 .../CalDAV/sharing/calendars/read-write/1.xml |  0
 .../CalDAV/sharing/calendars/read-write/4.xml |  0
 .../CalDAV/sharing/calendars/read-write/5.ics |  0
 .../CalDAV/sharing/calendars/read-write/5.xml |  0
 .../CalDAV/sharing/calendars/read-write/6.ics |  0
 .../CalDAV/sharing/calendars/read-write/7.ics |  0
 .../CalDAV/sharing/calendars/read-write/8.ics |  0
 .../CalDAV/sharing/calendars/read-write/9.ics |  0
 .../Resource/CardDAV/sharing/read-write/1.xml |  0
 .../Resource/CardDAV/sharing/read-write/4.xml |  0
 .../Resource/CardDAV/sharing/read-write/6.vcf |  0
 .../Resource/CardDAV/sharing/read-write/7.vcf |  0
 .../Resource/CardDAV/sharing/read-write/8.vcf |  0
 .../Resource/CardDAV/sharing/read-write/9.vcf |  0
 .../CardDAV/vcurrent-user-principal/1.xml     |  0
 .../data/Resource/CardDAV/vreports/put/1.vcf  |  0
 .../data/Resource/CardDAV/vreports/put/2.vcf  |  0
 .../data/Resource/CardDAV/vreports/put/3.vcf  |  0
 .../data/Resource/CardDAV/vreports/sync/1.xml |  0
 .../data/Resource/CardDAV/vreports/sync/2.xml |  0
 .../caldavtest/serverinfo-new-endpoint.xml    |  3 +-
 .../serverinfo-old-caldav-endpoint.xml        |  3 +-
 .../serverinfo-old-carddav-endpoint.xml       |  3 +-
 .../caldavtest/serverinfo.dtd                 |  0
 .../tests/CalDAV/current-user-principal.xml   |  0
 .../tests/CalDAV/sharing-calendars.xml        |  0
 .../caldavtest/tests/CalDAV/sync-report.xml   |  0
 .../tests/CardDAV/current-user-principal.xml  |  0
 .../tests/CardDAV/sharing-addressbooks.xml    |  0
 .../caldavtest/tests/CardDAV/sync-report.xml  |  0
 .../{travis => testsuits}/carddav/install.sh  |  0
 .../carddav/script-new-endpoint.sh            |  0
 .../carddav/script-old-endpoint.sh            |  0
 .../{travis => testsuits}/carddav/script.sh   |  0
 .../{travis => testsuits}/litmus-v1/script.sh |  0
 .../{travis => testsuits}/litmus-v2/script.sh |  0
 .../tests/unit/CalDAV/CalDavBackendTest.php   | 46 +++++++++----------
 apps/dav/tests/unit/phpunit.xml               |  1 -
 .../caldav-search-limit-timerange-1.ics       |  0
 .../caldav-search-limit-timerange-2.ics       |  0
 .../caldav-search-limit-timerange-3.ics       |  0
 .../caldav-search-limit-timerange-4.ics       |  0
 .../caldav-search-limit-timerange-5.ics       |  0
 .../caldav-search-limit-timerange-6.ics       |  0
 .../caldav-search-missing-start-1.ics         |  0
 .../caldav-search-missing-start-2.ics         |  0
 70 files changed, 28 insertions(+), 43 deletions(-)
 delete mode 100644 apps/dav/tests/misc/sharing.xml
 rename apps/dav/tests/{travis => testsuits}/caldav/install.sh (100%)
 rename apps/dav/tests/{travis => testsuits}/caldav/script-new-endpoint.sh (100%)
 rename apps/dav/tests/{travis => testsuits}/caldav/script-old-endpoint.sh (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/current-user-principal/1.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/put/1.txt (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/put/1.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/put/2.txt (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/put/3.txt (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/put/4.txt (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/put/5.txt (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/put/6.txt (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/1.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/10.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/11.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/2.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/21.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/3.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/4.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/5.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/6.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/7.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/8.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/1.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/4.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/sharing/read-write/1.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/sharing/read-write/4.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/vcurrent-user-principal/1.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/vreports/sync/1.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/vreports/sync/2.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/serverinfo-new-endpoint.xml (99%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/serverinfo-old-caldav-endpoint.xml (99%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/serverinfo-old-carddav-endpoint.xml (99%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/serverinfo.dtd (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/tests/CalDAV/current-user-principal.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/tests/CalDAV/sharing-calendars.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/tests/CalDAV/sync-report.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/tests/CardDAV/current-user-principal.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/tests/CardDAV/sharing-addressbooks.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/caldavtest/tests/CardDAV/sync-report.xml (100%)
 rename apps/dav/tests/{travis => testsuits}/carddav/install.sh (100%)
 rename apps/dav/tests/{travis => testsuits}/carddav/script-new-endpoint.sh (100%)
 rename apps/dav/tests/{travis => testsuits}/carddav/script-old-endpoint.sh (100%)
 rename apps/dav/tests/{travis => testsuits}/carddav/script.sh (100%)
 rename apps/dav/tests/{travis => testsuits}/litmus-v1/script.sh (100%)
 rename apps/dav/tests/{travis => testsuits}/litmus-v2/script.sh (100%)
 rename apps/dav/tests/{misc => unit/test_fixtures}/caldav-search-limit-timerange-1.ics (100%)
 rename apps/dav/tests/{misc => unit/test_fixtures}/caldav-search-limit-timerange-2.ics (100%)
 rename apps/dav/tests/{misc => unit/test_fixtures}/caldav-search-limit-timerange-3.ics (100%)
 rename apps/dav/tests/{misc => unit/test_fixtures}/caldav-search-limit-timerange-4.ics (100%)
 rename apps/dav/tests/{misc => unit/test_fixtures}/caldav-search-limit-timerange-5.ics (100%)
 rename apps/dav/tests/{misc => unit/test_fixtures}/caldav-search-limit-timerange-6.ics (100%)
 rename apps/dav/tests/{misc => unit/test_fixtures}/caldav-search-missing-start-1.ics (100%)
 rename apps/dav/tests/{misc => unit/test_fixtures}/caldav-search-missing-start-2.ics (100%)

diff --git a/.github/workflows/integration-dav.yml b/.github/workflows/integration-dav.yml
index ce493ae42b171..41404a82297c8 100644
--- a/.github/workflows/integration-dav.yml
+++ b/.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') || ';' }}
diff --git a/apps/dav/tests/misc/sharing.xml b/apps/dav/tests/misc/sharing.xml
deleted file mode 100644
index 6aa94554d3452..0000000000000
--- a/apps/dav/tests/misc/sharing.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
- - SPDX-FileCopyrightText: 2015 ownCloud, Inc.
- - SPDX-License-Identifier: AGPL-3.0-only
- -->
-		<CS:share xmlns:D="DAV:" xmlns:CS="urn:ietf:params:xml:ns:carddav">
-			     <CS:set>
-	       <D:href>principal:principals/admin</D:href>
-	       <CS:read-write />
-	     </CS:set>
-		   </CS:share>
diff --git a/apps/dav/tests/travis/caldav/install.sh b/apps/dav/tests/testsuits/caldav/install.sh
similarity index 100%
rename from apps/dav/tests/travis/caldav/install.sh
rename to apps/dav/tests/testsuits/caldav/install.sh
diff --git a/apps/dav/tests/travis/caldav/script-new-endpoint.sh b/apps/dav/tests/testsuits/caldav/script-new-endpoint.sh
similarity index 100%
rename from apps/dav/tests/travis/caldav/script-new-endpoint.sh
rename to apps/dav/tests/testsuits/caldav/script-new-endpoint.sh
diff --git a/apps/dav/tests/travis/caldav/script-old-endpoint.sh b/apps/dav/tests/testsuits/caldav/script-old-endpoint.sh
similarity index 100%
rename from apps/dav/tests/travis/caldav/script-old-endpoint.sh
rename to apps/dav/tests/testsuits/caldav/script-old-endpoint.sh
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/current-user-principal/1.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/current-user-principal/1.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/current-user-principal/1.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/current-user-principal/1.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.txt b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/1.txt
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.txt
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/1.txt
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/1.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/1.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/2.txt b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/2.txt
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/2.txt
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/2.txt
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/3.txt b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/3.txt
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/3.txt
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/3.txt
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/4.txt b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/4.txt
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/4.txt
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/4.txt
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/5.txt b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/5.txt
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/5.txt
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/5.txt
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/6.txt b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/6.txt
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/6.txt
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/6.txt
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/1.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/1.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/1.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/1.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/10.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/10.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/10.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/10.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/11.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/11.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/11.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/11.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/2.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/2.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/2.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/2.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/21.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/21.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/21.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/21.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/3.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/3.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/3.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/3.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/4.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/4.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/4.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/4.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/5.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/5.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/5.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/5.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/6.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/6.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/6.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/6.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/7.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/7.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/7.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/7.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/8.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/8.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/8.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/8.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/1.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/1.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/1.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/1.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/4.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/4.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/4.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/4.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/1.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/1.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/1.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/1.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/4.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/4.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/4.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/4.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vcurrent-user-principal/1.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vcurrent-user-principal/1.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vcurrent-user-principal/1.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vcurrent-user-principal/1.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/sync/1.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/sync/1.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/sync/1.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/sync/1.xml
diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/sync/2.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/sync/2.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/sync/2.xml
rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/sync/2.xml
diff --git a/apps/dav/tests/travis/caldavtest/serverinfo-new-endpoint.xml b/apps/dav/tests/testsuits/caldavtest/serverinfo-new-endpoint.xml
similarity index 99%
rename from apps/dav/tests/travis/caldavtest/serverinfo-new-endpoint.xml
rename to apps/dav/tests/testsuits/caldavtest/serverinfo-new-endpoint.xml
index abcae9d7894b3..524f2ef609d29 100644
--- a/apps/dav/tests/travis/caldavtest/serverinfo-new-endpoint.xml
+++ b/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.
diff --git a/apps/dav/tests/travis/caldavtest/serverinfo-old-caldav-endpoint.xml b/apps/dav/tests/testsuits/caldavtest/serverinfo-old-caldav-endpoint.xml
similarity index 99%
rename from apps/dav/tests/travis/caldavtest/serverinfo-old-caldav-endpoint.xml
rename to apps/dav/tests/testsuits/caldavtest/serverinfo-old-caldav-endpoint.xml
index 7dc62ad1bedfe..c95efd2ca0de2 100644
--- a/apps/dav/tests/travis/caldavtest/serverinfo-old-caldav-endpoint.xml
+++ b/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.
diff --git a/apps/dav/tests/travis/caldavtest/serverinfo-old-carddav-endpoint.xml b/apps/dav/tests/testsuits/caldavtest/serverinfo-old-carddav-endpoint.xml
similarity index 99%
rename from apps/dav/tests/travis/caldavtest/serverinfo-old-carddav-endpoint.xml
rename to apps/dav/tests/testsuits/caldavtest/serverinfo-old-carddav-endpoint.xml
index 6a45bab36dc1d..960cc8cdf178d 100644
--- a/apps/dav/tests/travis/caldavtest/serverinfo-old-carddav-endpoint.xml
+++ b/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.
diff --git a/apps/dav/tests/travis/caldavtest/serverinfo.dtd b/apps/dav/tests/testsuits/caldavtest/serverinfo.dtd
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/serverinfo.dtd
rename to apps/dav/tests/testsuits/caldavtest/serverinfo.dtd
diff --git a/apps/dav/tests/travis/caldavtest/tests/CalDAV/current-user-principal.xml b/apps/dav/tests/testsuits/caldavtest/tests/CalDAV/current-user-principal.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/tests/CalDAV/current-user-principal.xml
rename to apps/dav/tests/testsuits/caldavtest/tests/CalDAV/current-user-principal.xml
diff --git a/apps/dav/tests/travis/caldavtest/tests/CalDAV/sharing-calendars.xml b/apps/dav/tests/testsuits/caldavtest/tests/CalDAV/sharing-calendars.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/tests/CalDAV/sharing-calendars.xml
rename to apps/dav/tests/testsuits/caldavtest/tests/CalDAV/sharing-calendars.xml
diff --git a/apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml b/apps/dav/tests/testsuits/caldavtest/tests/CalDAV/sync-report.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml
rename to apps/dav/tests/testsuits/caldavtest/tests/CalDAV/sync-report.xml
diff --git a/apps/dav/tests/travis/caldavtest/tests/CardDAV/current-user-principal.xml b/apps/dav/tests/testsuits/caldavtest/tests/CardDAV/current-user-principal.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/tests/CardDAV/current-user-principal.xml
rename to apps/dav/tests/testsuits/caldavtest/tests/CardDAV/current-user-principal.xml
diff --git a/apps/dav/tests/travis/caldavtest/tests/CardDAV/sharing-addressbooks.xml b/apps/dav/tests/testsuits/caldavtest/tests/CardDAV/sharing-addressbooks.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/tests/CardDAV/sharing-addressbooks.xml
rename to apps/dav/tests/testsuits/caldavtest/tests/CardDAV/sharing-addressbooks.xml
diff --git a/apps/dav/tests/travis/caldavtest/tests/CardDAV/sync-report.xml b/apps/dav/tests/testsuits/caldavtest/tests/CardDAV/sync-report.xml
similarity index 100%
rename from apps/dav/tests/travis/caldavtest/tests/CardDAV/sync-report.xml
rename to apps/dav/tests/testsuits/caldavtest/tests/CardDAV/sync-report.xml
diff --git a/apps/dav/tests/travis/carddav/install.sh b/apps/dav/tests/testsuits/carddav/install.sh
similarity index 100%
rename from apps/dav/tests/travis/carddav/install.sh
rename to apps/dav/tests/testsuits/carddav/install.sh
diff --git a/apps/dav/tests/travis/carddav/script-new-endpoint.sh b/apps/dav/tests/testsuits/carddav/script-new-endpoint.sh
similarity index 100%
rename from apps/dav/tests/travis/carddav/script-new-endpoint.sh
rename to apps/dav/tests/testsuits/carddav/script-new-endpoint.sh
diff --git a/apps/dav/tests/travis/carddav/script-old-endpoint.sh b/apps/dav/tests/testsuits/carddav/script-old-endpoint.sh
similarity index 100%
rename from apps/dav/tests/travis/carddav/script-old-endpoint.sh
rename to apps/dav/tests/testsuits/carddav/script-old-endpoint.sh
diff --git a/apps/dav/tests/travis/carddav/script.sh b/apps/dav/tests/testsuits/carddav/script.sh
similarity index 100%
rename from apps/dav/tests/travis/carddav/script.sh
rename to apps/dav/tests/testsuits/carddav/script.sh
diff --git a/apps/dav/tests/travis/litmus-v1/script.sh b/apps/dav/tests/testsuits/litmus-v1/script.sh
similarity index 100%
rename from apps/dav/tests/travis/litmus-v1/script.sh
rename to apps/dav/tests/testsuits/litmus-v1/script.sh
diff --git a/apps/dav/tests/travis/litmus-v2/script.sh b/apps/dav/tests/testsuits/litmus-v2/script.sh
similarity index 100%
rename from apps/dav/tests/travis/litmus-v2/script.sh
rename to apps/dav/tests/testsuits/litmus-v2/script.sh
diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
index c82ca350c909b..61c03c9e4c1bd 100644
--- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
+++ b/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) {
diff --git a/apps/dav/tests/unit/phpunit.xml b/apps/dav/tests/unit/phpunit.xml
index 0d08d8fe5d674..c85d07c6fcb0f 100644
--- a/apps/dav/tests/unit/phpunit.xml
+++ b/apps/dav/tests/unit/phpunit.xml
@@ -26,4 +26,3 @@
 		<log type="coverage-clover" target="./clover.xml"/>
 	</logging>
 </phpunit>
-
diff --git a/apps/dav/tests/misc/caldav-search-limit-timerange-1.ics b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-1.ics
similarity index 100%
rename from apps/dav/tests/misc/caldav-search-limit-timerange-1.ics
rename to apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-1.ics
diff --git a/apps/dav/tests/misc/caldav-search-limit-timerange-2.ics b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-2.ics
similarity index 100%
rename from apps/dav/tests/misc/caldav-search-limit-timerange-2.ics
rename to apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-2.ics
diff --git a/apps/dav/tests/misc/caldav-search-limit-timerange-3.ics b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-3.ics
similarity index 100%
rename from apps/dav/tests/misc/caldav-search-limit-timerange-3.ics
rename to apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-3.ics
diff --git a/apps/dav/tests/misc/caldav-search-limit-timerange-4.ics b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-4.ics
similarity index 100%
rename from apps/dav/tests/misc/caldav-search-limit-timerange-4.ics
rename to apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-4.ics
diff --git a/apps/dav/tests/misc/caldav-search-limit-timerange-5.ics b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-5.ics
similarity index 100%
rename from apps/dav/tests/misc/caldav-search-limit-timerange-5.ics
rename to apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-5.ics
diff --git a/apps/dav/tests/misc/caldav-search-limit-timerange-6.ics b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-6.ics
similarity index 100%
rename from apps/dav/tests/misc/caldav-search-limit-timerange-6.ics
rename to apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-6.ics
diff --git a/apps/dav/tests/misc/caldav-search-missing-start-1.ics b/apps/dav/tests/unit/test_fixtures/caldav-search-missing-start-1.ics
similarity index 100%
rename from apps/dav/tests/misc/caldav-search-missing-start-1.ics
rename to apps/dav/tests/unit/test_fixtures/caldav-search-missing-start-1.ics
diff --git a/apps/dav/tests/misc/caldav-search-missing-start-2.ics b/apps/dav/tests/unit/test_fixtures/caldav-search-missing-start-2.ics
similarity index 100%
rename from apps/dav/tests/misc/caldav-search-missing-start-2.ics
rename to apps/dav/tests/unit/test_fixtures/caldav-search-missing-start-2.ics