Skip to content

Commit

Permalink
chore: Get rid of travis in DAV app
Browse files Browse the repository at this point in the history
Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
susnux committed Sep 19, 2024
1 parent 76bc541 commit e6363ac
Show file tree
Hide file tree
Showing 70 changed files with 28 additions and 43 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration-dav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') || ';' }}
Expand Down
11 changes: 0 additions & 11 deletions apps/dav/tests/misc/sharing.xml

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
46 changes: 23 additions & 23 deletions apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion apps/dav/tests/unit/phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@
<log type="coverage-clover" target="./clover.xml"/>
</logging>
</phpunit>

0 comments on commit e6363ac

Please sign in to comment.