diff --git a/tests/Sabre/DAVServerTest.php b/tests/Sabre/AbstractDAVServerTestCase.php similarity index 96% rename from tests/Sabre/DAVServerTest.php rename to tests/Sabre/AbstractDAVServerTestCase.php index d9908be822..40dcb41dfa 100644 --- a/tests/Sabre/DAVServerTest.php +++ b/tests/Sabre/AbstractDAVServerTestCase.php @@ -4,6 +4,10 @@ namespace Sabre; +use PHPUnit\Framework\TestCase; +use Sabre\CalDAV\SharingPlugin; +use Sabre\DAV\Server; +use Sabre\DAV\Sharing\Plugin; use Sabre\HTTP\Request; use Sabre\HTTP\Response; @@ -17,7 +21,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -abstract class DAVServerTest extends \PHPUnit\Framework\TestCase +abstract class AbstractDAVServerTestCase extends TestCase { protected $setupCalDAV = false; protected $setupCardDAV = false; @@ -43,7 +47,7 @@ abstract class DAVServerTest extends \PHPUnit\Framework\TestCase protected $carddavCards = []; /** - * @var \Sabre\DAV\Server + * @var Server */ protected $server; protected $tree = []; @@ -70,7 +74,7 @@ abstract class DAVServerTest extends \PHPUnit\Framework\TestCase protected $aclPlugin; /** - * @var \Sabre\CalDAV\SharingPlugin + * @var SharingPlugin */ protected $caldavSharingPlugin; @@ -99,7 +103,7 @@ abstract class DAVServerTest extends \PHPUnit\Framework\TestCase /** * Sharing plugin. * - * @var \Sabre\DAV\Sharing\Plugin + * @var Plugin */ protected $sharingPlugin; @@ -190,10 +194,10 @@ public function initializeEverything() * the returned response. If it doesn't match, we'll immediately fail * the test. * - * @param array|\Sabre\HTTP\Request $request - * @param int $expectedStatus + * @param array|Request $request + * @param int $expectedStatus * - * @return \Sabre\HTTP\Response + * @return Response */ public function request($request, $expectedStatus = null) { diff --git a/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php b/tests/Sabre/CalDAV/Backend/AbstractPDOTestCase.php similarity index 93% rename from tests/Sabre/CalDAV/Backend/AbstractPDOTest.php rename to tests/Sabre/CalDAV/Backend/AbstractPDOTestCase.php index 769d215264..f25773e00f 100644 --- a/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php +++ b/tests/Sabre/CalDAV/Backend/AbstractPDOTestCase.php @@ -4,12 +4,16 @@ namespace Sabre\CalDAV\Backend; +use DateTime; +use PHPUnit\Framework\TestCase; use Sabre\CalDAV; use Sabre\DAV; use Sabre\DAV\PropPatch; +use Sabre\DAV\Sharing\Plugin; use Sabre\DAV\Xml\Element\Sharee; +use Sabre\DAV\Xml\Property\Href; -abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase +abstract class AbstractPDOTestCase extends TestCase { use DAV\DbTestHelperTrait; @@ -64,7 +68,7 @@ public function testCreateCalendarAndFetch() '{DAV:}displayname' => 'Hello!', '{urn:ietf:params:xml:ns:caldav}calendar-description' => '', '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp' => new CalDAV\Xml\Property\ScheduleCalendarTransp('transparent'), - 'share-access' => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER, + 'share-access' => Plugin::ACCESS_SHAREDOWNER, ]; self::assertIsArray($calendars); @@ -765,8 +769,8 @@ public function testCalendarQueryTimeRange() 'prop-filters' => [], 'is-not-defined' => false, 'time-range' => [ - 'start' => new \DateTime('20120103'), - 'end' => new \DateTime('20120104'), + 'start' => new DateTime('20120103'), + 'end' => new DateTime('20120104'), ], ], ], @@ -796,7 +800,7 @@ public function testCalendarQueryTimeRangeEndNull() 'prop-filters' => [], 'is-not-defined' => false, 'time-range' => [ - 'start' => new \DateTime('20120102'), + 'start' => new DateTime('20120102'), 'end' => null, ], ], @@ -827,7 +831,7 @@ public function testCalendarQueryTimeRangeNoEnd() 'prop-filters' => [], 'is-not-defined' => false, 'time-range' => [ - 'start' => new \DateTime('20120102'), + 'start' => new DateTime('20120102'), ], ], ], @@ -857,7 +861,7 @@ public function testCalendarQueryTimeRangeNoStart() 'prop-filters' => [], 'is-not-defined' => false, 'time-range' => [ - 'end' => new \DateTime('20120102'), + 'end' => new DateTime('20120102'), ], ], ], @@ -991,7 +995,7 @@ public function testGetChangesBadId() public function testCreateSubscriptions() { $props = [ - '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics'), + '{http://calendarserver.org/ns/}source' => new Href('http://example.org/cal.ics'), '{DAV:}displayname' => 'cal', '{http://apple.com/ns/ical/}refreshrate' => 'P1W', '{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF', @@ -1032,7 +1036,7 @@ public function testCreateSubscriptionFail() public function testUpdateSubscriptions() { $props = [ - '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics'), + '{http://calendarserver.org/ns/}source' => new Href('http://example.org/cal.ics'), '{DAV:}displayname' => 'cal', '{http://apple.com/ns/ical/}refreshrate' => 'P1W', '{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF', @@ -1046,7 +1050,7 @@ public function testUpdateSubscriptions() $newProps = [ '{DAV:}displayname' => 'new displayname', - '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics'), + '{http://calendarserver.org/ns/}source' => new Href('http://example.org/cal2.ics'), ]; $propPatch = new DAV\PropPatch($newProps); @@ -1074,7 +1078,7 @@ public function testUpdateSubscriptions() public function testUpdateSubscriptionsFail() { $props = [ - '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics'), + '{http://calendarserver.org/ns/}source' => new Href('http://example.org/cal.ics'), '{DAV:}displayname' => 'cal', '{http://apple.com/ns/ical/}refreshrate' => 'P1W', '{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF', @@ -1088,7 +1092,7 @@ public function testUpdateSubscriptionsFail() $propPatch = new DAV\PropPatch([ '{DAV:}displayname' => 'new displayname', - '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics'), + '{http://calendarserver.org/ns/}source' => new Href('http://example.org/cal2.ics'), '{DAV:}unknown' => 'foo', ]); @@ -1105,7 +1109,7 @@ public function testUpdateSubscriptionsFail() public function testDeleteSubscriptions() { $props = [ - '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal.ics'), + '{http://calendarserver.org/ns/}source' => new Href('http://example.org/cal.ics'), '{DAV:}displayname' => 'cal', '{http://apple.com/ns/ical/}refreshrate' => 'P1W', '{http://apple.com/ns/ical/}calendar-color' => '#FF00FFFF', @@ -1119,7 +1123,7 @@ public function testDeleteSubscriptions() $newProps = [ '{DAV:}displayname' => 'new displayname', - '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics'), + '{http://calendarserver.org/ns/}source' => new Href('http://example.org/cal2.ics'), ]; $backend->deleteSubscription(1); @@ -1213,8 +1217,8 @@ public function testGetInvites() new Sharee([ 'href' => 'principals/user1', 'principal' => 'principals/user1', - 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER, - 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED, + 'access' => Plugin::ACCESS_SHAREDOWNER, + 'inviteStatus' => Plugin::INVITE_ACCEPTED, ]), ]; @@ -1250,8 +1254,8 @@ public function testUpdateInvites() $ownerSharee = new Sharee([ 'href' => 'principals/user1', 'principal' => 'principals/user1', - 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER, - 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED, + 'access' => Plugin::ACCESS_SHAREDOWNER, + 'inviteStatus' => Plugin::INVITE_ACCEPTED, ]); // Add a new invite @@ -1261,8 +1265,8 @@ public function testUpdateInvites() new Sharee([ 'href' => 'mailto:user@example.org', 'principal' => 'principals/user2', - 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READ, - 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED, + 'access' => Plugin::ACCESS_READ, + 'inviteStatus' => Plugin::INVITE_ACCEPTED, 'properties' => ['{DAV:}displayname' => 'User 2'], ]), ] @@ -1274,8 +1278,8 @@ public function testUpdateInvites() new Sharee([ 'href' => 'mailto:user@example.org', 'principal' => 'principals/user2', - 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READ, - 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED, + 'access' => Plugin::ACCESS_READ, + 'inviteStatus' => Plugin::INVITE_ACCEPTED, 'properties' => [ '{DAV:}displayname' => 'User 2', ], @@ -1289,7 +1293,7 @@ public function testUpdateInvites() 'principaluri' => 'principals/user2', '{http://calendarserver.org/ns/}getctag' => 'http://sabre.io/ns/sync/1', '{http://sabredav.org/ns}sync-token' => '1', - 'share-access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READ, + 'share-access' => Plugin::ACCESS_READ, 'read-only' => true, 'share-resource-uri' => '/ns/share/1', ]; @@ -1310,8 +1314,8 @@ public function testUpdateInvites() new Sharee([ 'href' => 'mailto:user@example.org', 'principal' => 'principals/user2', - 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE, - 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED, + 'access' => Plugin::ACCESS_READWRITE, + 'inviteStatus' => Plugin::INVITE_ACCEPTED, ]), ] ); @@ -1322,8 +1326,8 @@ public function testUpdateInvites() new Sharee([ 'href' => 'mailto:user@example.org', 'principal' => 'principals/user2', - 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE, - 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED, + 'access' => Plugin::ACCESS_READWRITE, + 'inviteStatus' => Plugin::INVITE_ACCEPTED, 'properties' => [ '{DAV:}displayname' => 'User 2', ], @@ -1337,7 +1341,7 @@ public function testUpdateInvites() [ new Sharee([ 'href' => 'mailto:user@example.org', - 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_NOACCESS, + 'access' => Plugin::ACCESS_NOACCESS, ]), ] ); @@ -1354,7 +1358,7 @@ public function testUpdateInvites() [ new Sharee([ 'href' => 'principals/user2', - 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_NOACCESS, + 'access' => Plugin::ACCESS_NOACCESS, ]), ] ); @@ -1364,8 +1368,8 @@ public function testUpdateInvites() new Sharee([ 'href' => 'principals/user1', 'principal' => 'principals/user1', - 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER, - 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED, + 'access' => Plugin::ACCESS_SHAREDOWNER, + 'inviteStatus' => Plugin::INVITE_ACCEPTED, ]), ]; self::assertEquals($expected, $result); @@ -1399,8 +1403,8 @@ public function testUpdateInvitesNoPrincipal() $ownerSharee = new Sharee([ 'href' => 'principals/user1', 'principal' => 'principals/user1', - 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER, - 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED, + 'access' => Plugin::ACCESS_SHAREDOWNER, + 'inviteStatus' => Plugin::INVITE_ACCEPTED, ]); // Add a new invite @@ -1410,8 +1414,8 @@ public function testUpdateInvitesNoPrincipal() new Sharee([ 'href' => 'mailto:user@example.org', 'principal' => null, - 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READ, - 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED, + 'access' => Plugin::ACCESS_READ, + 'inviteStatus' => Plugin::INVITE_ACCEPTED, 'properties' => ['{DAV:}displayname' => 'User 2'], ]), ] @@ -1423,8 +1427,8 @@ public function testUpdateInvitesNoPrincipal() new Sharee([ 'href' => 'mailto:user@example.org', 'principal' => null, - 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READ, - 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_INVALID, + 'access' => Plugin::ACCESS_READ, + 'inviteStatus' => Plugin::INVITE_INVALID, 'properties' => [ '{DAV:}displayname' => 'User 2', ], @@ -1447,8 +1451,8 @@ public function testDeleteSharedCalendar() $ownerSharee = new Sharee([ 'href' => 'principals/user1', 'principal' => 'principals/user1', - 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER, - 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED, + 'access' => Plugin::ACCESS_SHAREDOWNER, + 'inviteStatus' => Plugin::INVITE_ACCEPTED, ]); // Add a new invite @@ -1458,8 +1462,8 @@ public function testDeleteSharedCalendar() new Sharee([ 'href' => 'mailto:user@example.org', 'principal' => 'principals/user2', - 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READ, - 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED, + 'access' => Plugin::ACCESS_READ, + 'inviteStatus' => Plugin::INVITE_ACCEPTED, 'properties' => ['{DAV:}displayname' => 'User 2'], ]), ] @@ -1470,7 +1474,7 @@ public function testDeleteSharedCalendar() 'principaluri' => 'principals/user2', '{http://calendarserver.org/ns/}getctag' => 'http://sabre.io/ns/sync/1', '{http://sabredav.org/ns}sync-token' => '1', - 'share-access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READ, + 'share-access' => Plugin::ACCESS_READ, 'read-only' => true, 'share-resource-uri' => '/ns/share/1', ]; @@ -1497,8 +1501,8 @@ public function testDeleteSharedCalendar() new Sharee([ 'href' => 'principals/user1', 'principal' => 'principals/user1', - 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER, - 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED, + 'access' => Plugin::ACCESS_SHAREDOWNER, + 'inviteStatus' => Plugin::INVITE_ACCEPTED, ]), ]; self::assertEquals($expected, $result); diff --git a/tests/Sabre/CalDAV/Backend/PDOMySQLTest.php b/tests/Sabre/CalDAV/Backend/PDOMySQLTestCase.php similarity index 66% rename from tests/Sabre/CalDAV/Backend/PDOMySQLTest.php rename to tests/Sabre/CalDAV/Backend/PDOMySQLTestCase.php index 66388def4f..05e8e9c561 100644 --- a/tests/Sabre/CalDAV/Backend/PDOMySQLTest.php +++ b/tests/Sabre/CalDAV/Backend/PDOMySQLTestCase.php @@ -4,7 +4,7 @@ namespace Sabre\CalDAV\Backend; -class PDOMySQLTest extends AbstractPDOTest +class PDOMySQLTestCase extends AbstractPDOTestCase { public $driver = 'mysql'; } diff --git a/tests/Sabre/CalDAV/Backend/PDOPgSqlTest.php b/tests/Sabre/CalDAV/Backend/PDOPgSqlTestCase.php similarity index 66% rename from tests/Sabre/CalDAV/Backend/PDOPgSqlTest.php rename to tests/Sabre/CalDAV/Backend/PDOPgSqlTestCase.php index feffedfa49..6be44ce35a 100644 --- a/tests/Sabre/CalDAV/Backend/PDOPgSqlTest.php +++ b/tests/Sabre/CalDAV/Backend/PDOPgSqlTestCase.php @@ -4,7 +4,7 @@ namespace Sabre\CalDAV\Backend; -class PDOPgSqlTest extends AbstractPDOTest +class PDOPgSqlTestCase extends AbstractPDOTestCase { public $driver = 'pgsql'; } diff --git a/tests/Sabre/CalDAV/Backend/PDOSqliteTest.php b/tests/Sabre/CalDAV/Backend/PDOSqliteTestCase.php similarity index 66% rename from tests/Sabre/CalDAV/Backend/PDOSqliteTest.php rename to tests/Sabre/CalDAV/Backend/PDOSqliteTestCase.php index 4470e58109..c8337c7d40 100644 --- a/tests/Sabre/CalDAV/Backend/PDOSqliteTest.php +++ b/tests/Sabre/CalDAV/Backend/PDOSqliteTestCase.php @@ -4,7 +4,7 @@ namespace Sabre\CalDAV\Backend; -class PDOSqliteTest extends AbstractPDOTest +class PDOSqliteTestCase extends AbstractPDOTestCase { public $driver = 'sqlite'; } diff --git a/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php b/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTestAbstract.php similarity index 97% rename from tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php rename to tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTestAbstract.php index 77714f0aae..e17ac40477 100644 --- a/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php +++ b/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTestAbstract.php @@ -14,7 +14,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -class ExpandEventsDTSTARTandDTENDTest extends \Sabre\DAVServerTest +class ExpandEventsDTSTARTandDTENDTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCalDAV = true; diff --git a/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php b/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTestAbstract.php similarity index 97% rename from tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php rename to tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTestAbstract.php index fe4691e33f..23b9fe486d 100644 --- a/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php +++ b/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTestAbstract.php @@ -14,7 +14,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -class ExpandEventsDTSTARTandDTENDbyDayTest extends \Sabre\DAVServerTest +class ExpandEventsDTSTARTandDTENDbyDayTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCalDAV = true; diff --git a/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php b/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTestAbstract.php similarity index 97% rename from tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php rename to tests/Sabre/CalDAV/ExpandEventsDoubleEventsTestAbstract.php index acbf05c7db..348398150d 100644 --- a/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php +++ b/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTestAbstract.php @@ -17,7 +17,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -class ExpandEventsDoubleEventsTest extends \Sabre\DAVServerTest +class ExpandEventsDoubleEventsTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCalDAV = true; diff --git a/tests/Sabre/CalDAV/ExpandEventsFloatingTimeTest.php b/tests/Sabre/CalDAV/ExpandEventsFloatingTimeTestAbstract.php similarity index 98% rename from tests/Sabre/CalDAV/ExpandEventsFloatingTimeTest.php rename to tests/Sabre/CalDAV/ExpandEventsFloatingTimeTestAbstract.php index 2251c7e5d1..f752959041 100644 --- a/tests/Sabre/CalDAV/ExpandEventsFloatingTimeTest.php +++ b/tests/Sabre/CalDAV/ExpandEventsFloatingTimeTestAbstract.php @@ -11,7 +11,7 @@ * This unittest is created to check if expand() works correctly with * floating times (using calendar-timezone information). */ -class ExpandEventsFloatingTimeTest extends \Sabre\DAVServerTest +class ExpandEventsFloatingTimeTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCalDAV = true; diff --git a/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php b/tests/Sabre/CalDAV/GetEventsByTimerangeTestAbstract.php similarity index 96% rename from tests/Sabre/CalDAV/GetEventsByTimerangeTest.php rename to tests/Sabre/CalDAV/GetEventsByTimerangeTestAbstract.php index 0e265f38bb..0c388c212d 100644 --- a/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php +++ b/tests/Sabre/CalDAV/GetEventsByTimerangeTestAbstract.php @@ -13,7 +13,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -class GetEventsByTimerangeTest extends \Sabre\DAVServerTest +class GetEventsByTimerangeTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCalDAV = true; diff --git a/tests/Sabre/CalDAV/ICSExportPluginTest.php b/tests/Sabre/CalDAV/ICSExportPluginTestAbstract.php similarity index 99% rename from tests/Sabre/CalDAV/ICSExportPluginTest.php rename to tests/Sabre/CalDAV/ICSExportPluginTestAbstract.php index b90a0eac44..eae98d8aad 100644 --- a/tests/Sabre/CalDAV/ICSExportPluginTest.php +++ b/tests/Sabre/CalDAV/ICSExportPluginTestAbstract.php @@ -9,7 +9,7 @@ use Sabre\HTTP; use Sabre\VObject; -class ICSExportPluginTest extends \Sabre\DAVServerTest +class ICSExportPluginTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCalDAV = true; diff --git a/tests/Sabre/CalDAV/Issue203Test.php b/tests/Sabre/CalDAV/Issue203TestAbstract.php similarity index 98% rename from tests/Sabre/CalDAV/Issue203Test.php rename to tests/Sabre/CalDAV/Issue203TestAbstract.php index 902bab0ac9..fb2332d713 100644 --- a/tests/Sabre/CalDAV/Issue203Test.php +++ b/tests/Sabre/CalDAV/Issue203TestAbstract.php @@ -14,7 +14,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -class Issue203Test extends \Sabre\DAVServerTest +class Issue203TestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCalDAV = true; diff --git a/tests/Sabre/CalDAV/Issue205Test.php b/tests/Sabre/CalDAV/Issue205TestAbstract.php similarity index 97% rename from tests/Sabre/CalDAV/Issue205Test.php rename to tests/Sabre/CalDAV/Issue205TestAbstract.php index 67611c5868..0f67cee46d 100644 --- a/tests/Sabre/CalDAV/Issue205Test.php +++ b/tests/Sabre/CalDAV/Issue205TestAbstract.php @@ -14,7 +14,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -class Issue205Test extends \Sabre\DAVServerTest +class Issue205TestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCalDAV = true; diff --git a/tests/Sabre/CalDAV/Issue211Test.php b/tests/Sabre/CalDAV/Issue211TestAbstract.php similarity index 97% rename from tests/Sabre/CalDAV/Issue211Test.php rename to tests/Sabre/CalDAV/Issue211TestAbstract.php index b9a103d3c7..1bfe695ae0 100644 --- a/tests/Sabre/CalDAV/Issue211Test.php +++ b/tests/Sabre/CalDAV/Issue211TestAbstract.php @@ -13,7 +13,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -class Issue211Test extends \Sabre\DAVServerTest +class Issue211TestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCalDAV = true; diff --git a/tests/Sabre/CalDAV/Issue220Test.php b/tests/Sabre/CalDAV/Issue220TestAbstract.php similarity index 97% rename from tests/Sabre/CalDAV/Issue220Test.php rename to tests/Sabre/CalDAV/Issue220TestAbstract.php index 5ad3ebe917..2b1f1104fe 100644 --- a/tests/Sabre/CalDAV/Issue220Test.php +++ b/tests/Sabre/CalDAV/Issue220TestAbstract.php @@ -13,7 +13,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -class Issue220Test extends \Sabre\DAVServerTest +class Issue220TestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCalDAV = true; diff --git a/tests/Sabre/CalDAV/Issue228Test.php b/tests/Sabre/CalDAV/Issue228TestAbstract.php similarity index 96% rename from tests/Sabre/CalDAV/Issue228Test.php rename to tests/Sabre/CalDAV/Issue228TestAbstract.php index 9e88251c7c..04907fc240 100644 --- a/tests/Sabre/CalDAV/Issue228Test.php +++ b/tests/Sabre/CalDAV/Issue228TestAbstract.php @@ -13,7 +13,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -class Issue228Test extends \Sabre\DAVServerTest +class Issue228TestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCalDAV = true; diff --git a/tests/Sabre/CalDAV/JCalTransformTest.php b/tests/Sabre/CalDAV/JCalTransformTestAbstract.php similarity index 98% rename from tests/Sabre/CalDAV/JCalTransformTest.php rename to tests/Sabre/CalDAV/JCalTransformTestAbstract.php index 605f980198..627332248a 100644 --- a/tests/Sabre/CalDAV/JCalTransformTest.php +++ b/tests/Sabre/CalDAV/JCalTransformTestAbstract.php @@ -7,7 +7,7 @@ use Sabre\HTTP\Request; use Sabre\VObject; -class JCalTransformTest extends \Sabre\DAVServerTest +class JCalTransformTestAbstract extends \Sabre\AbstractDAVServerTestCase { use VObject\PHPUnitAssertions; diff --git a/tests/Sabre/CalDAV/Schedule/DeliverNewEventTest.php b/tests/Sabre/CalDAV/Schedule/DeliverNewEventTestAbstract.php similarity index 97% rename from tests/Sabre/CalDAV/Schedule/DeliverNewEventTest.php rename to tests/Sabre/CalDAV/Schedule/DeliverNewEventTestAbstract.php index 5fa6120ad8..0c111b4ed0 100644 --- a/tests/Sabre/CalDAV/Schedule/DeliverNewEventTest.php +++ b/tests/Sabre/CalDAV/Schedule/DeliverNewEventTestAbstract.php @@ -7,7 +7,7 @@ use Sabre\HTTP\Request; use Sabre\VObject; -class DeliverNewEventTest extends \Sabre\DAVServerTest +class DeliverNewEventTestAbstract extends \Sabre\AbstractDAVServerTestCase { public $setupCalDAV = true; public $setupCalDAVScheduling = true; diff --git a/tests/Sabre/CalDAV/Schedule/OutboxPostTest.php b/tests/Sabre/CalDAV/Schedule/OutboxPostTestAbstract.php similarity index 98% rename from tests/Sabre/CalDAV/Schedule/OutboxPostTest.php rename to tests/Sabre/CalDAV/Schedule/OutboxPostTestAbstract.php index 6e53abc700..b5ce138864 100644 --- a/tests/Sabre/CalDAV/Schedule/OutboxPostTest.php +++ b/tests/Sabre/CalDAV/Schedule/OutboxPostTestAbstract.php @@ -6,7 +6,7 @@ use Sabre\HTTP; -class OutboxPostTest extends \Sabre\DAVServerTest +class OutboxPostTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCalDAV = true; protected $setupACL = true; diff --git a/tests/Sabre/CalDAV/Schedule/PluginBasicTest.php b/tests/Sabre/CalDAV/Schedule/PluginBasicTestAbstract.php similarity index 92% rename from tests/Sabre/CalDAV/Schedule/PluginBasicTest.php rename to tests/Sabre/CalDAV/Schedule/PluginBasicTestAbstract.php index 083d141153..d6d020088e 100644 --- a/tests/Sabre/CalDAV/Schedule/PluginBasicTest.php +++ b/tests/Sabre/CalDAV/Schedule/PluginBasicTestAbstract.php @@ -4,7 +4,7 @@ namespace Sabre\CalDAV\Schedule; -class PluginBasicTest extends \Sabre\DAVServerTest +class PluginBasicTestAbstract extends \Sabre\AbstractDAVServerTestCase { public $setupCalDAV = true; public $setupCalDAVScheduling = true; diff --git a/tests/Sabre/CalDAV/Schedule/PluginPropertiesTest.php b/tests/Sabre/CalDAV/Schedule/PluginPropertiesTestAbstract.php similarity index 98% rename from tests/Sabre/CalDAV/Schedule/PluginPropertiesTest.php rename to tests/Sabre/CalDAV/Schedule/PluginPropertiesTestAbstract.php index 6fed3ee4f2..0ccb6907bb 100644 --- a/tests/Sabre/CalDAV/Schedule/PluginPropertiesTest.php +++ b/tests/Sabre/CalDAV/Schedule/PluginPropertiesTestAbstract.php @@ -6,7 +6,7 @@ use Sabre\DAV; -class PluginPropertiesTest extends \Sabre\DAVServerTest +class PluginPropertiesTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCalDAV = true; protected $setupCalDAVScheduling = true; diff --git a/tests/Sabre/CalDAV/Schedule/PluginPropertiesWithSharedCalendarTest.php b/tests/Sabre/CalDAV/Schedule/PluginPropertiesWithSharedCalendarTestAbstract.php similarity index 96% rename from tests/Sabre/CalDAV/Schedule/PluginPropertiesWithSharedCalendarTest.php rename to tests/Sabre/CalDAV/Schedule/PluginPropertiesWithSharedCalendarTestAbstract.php index 0388d0b0ee..be276bd5a4 100644 --- a/tests/Sabre/CalDAV/Schedule/PluginPropertiesWithSharedCalendarTest.php +++ b/tests/Sabre/CalDAV/Schedule/PluginPropertiesWithSharedCalendarTestAbstract.php @@ -6,7 +6,7 @@ use Sabre\DAV; -class PluginPropertiesWithSharedCalendarTest extends \Sabre\DAVServerTest +class PluginPropertiesWithSharedCalendarTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCalDAV = true; protected $setupCalDAVScheduling = true; diff --git a/tests/Sabre/CalDAV/Schedule/ScheduleDeliverTest.php b/tests/Sabre/CalDAV/Schedule/ScheduleDeliverTestAbstract.php similarity index 99% rename from tests/Sabre/CalDAV/Schedule/ScheduleDeliverTest.php rename to tests/Sabre/CalDAV/Schedule/ScheduleDeliverTestAbstract.php index 912ee3b854..87f88b2bbc 100644 --- a/tests/Sabre/CalDAV/Schedule/ScheduleDeliverTest.php +++ b/tests/Sabre/CalDAV/Schedule/ScheduleDeliverTestAbstract.php @@ -8,7 +8,7 @@ use Sabre\Uri; use Sabre\VObject; -class ScheduleDeliverTest extends \Sabre\DAVServerTest +class ScheduleDeliverTestAbstract extends \Sabre\AbstractDAVServerTestCase { use VObject\PHPUnitAssertions; diff --git a/tests/Sabre/CalDAV/SharingPluginTest.php b/tests/Sabre/CalDAV/SharingPluginTestAbstract.php similarity index 99% rename from tests/Sabre/CalDAV/SharingPluginTest.php rename to tests/Sabre/CalDAV/SharingPluginTestAbstract.php index b8fac8b0c5..a10834cd3f 100644 --- a/tests/Sabre/CalDAV/SharingPluginTest.php +++ b/tests/Sabre/CalDAV/SharingPluginTestAbstract.php @@ -4,12 +4,12 @@ namespace Sabre\CalDAV; +use Sabre\AbstractDAVServerTestCase; use Sabre\DAV; use Sabre\DAV\Xml\Element\Sharee; -use Sabre\DAVServerTest; use Sabre\HTTP; -class SharingPluginTest extends DAVServerTest +class SharingPluginTestAbstract extends AbstractDAVServerTestCase { protected $setupCalDAV = true; protected $setupCalDAVSharing = true; diff --git a/tests/Sabre/CalDAV/Subscriptions/CreateSubscriptionTest.php b/tests/Sabre/CalDAV/Subscriptions/CreateSubscriptionTestAbstract.php similarity index 98% rename from tests/Sabre/CalDAV/Subscriptions/CreateSubscriptionTest.php rename to tests/Sabre/CalDAV/Subscriptions/CreateSubscriptionTestAbstract.php index 5c5ab5f558..3875fe48b0 100644 --- a/tests/Sabre/CalDAV/Subscriptions/CreateSubscriptionTest.php +++ b/tests/Sabre/CalDAV/Subscriptions/CreateSubscriptionTestAbstract.php @@ -6,7 +6,7 @@ use Sabre\HTTP\Request; -class CreateSubscriptionTest extends \Sabre\DAVServerTest +class CreateSubscriptionTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCalDAV = true; protected $setupCalDAVSubscriptions = true; diff --git a/tests/Sabre/CalDAV/Xml/Notification/InviteTest.php b/tests/Sabre/CalDAV/Xml/Notification/InviteTestAbstract.php similarity index 98% rename from tests/Sabre/CalDAV/Xml/Notification/InviteTest.php rename to tests/Sabre/CalDAV/Xml/Notification/InviteTestAbstract.php index 2e3d6e42ea..2e575f18c6 100644 --- a/tests/Sabre/CalDAV/Xml/Notification/InviteTest.php +++ b/tests/Sabre/CalDAV/Xml/Notification/InviteTestAbstract.php @@ -7,7 +7,7 @@ use Sabre\DAV; use Sabre\Xml\Writer; -class InviteTest extends DAV\Xml\XmlTest +class InviteTestAbstract extends DAV\Xml\AbstractXmlTestCase { /** * @param array $notification diff --git a/tests/Sabre/CalDAV/Xml/Property/AllowedSharingModesTest.php b/tests/Sabre/CalDAV/Xml/Property/AllowedSharingModesTestAbstract.php similarity index 92% rename from tests/Sabre/CalDAV/Xml/Property/AllowedSharingModesTest.php rename to tests/Sabre/CalDAV/Xml/Property/AllowedSharingModesTestAbstract.php index 75409dce2a..4cc321d82d 100644 --- a/tests/Sabre/CalDAV/Xml/Property/AllowedSharingModesTest.php +++ b/tests/Sabre/CalDAV/Xml/Property/AllowedSharingModesTestAbstract.php @@ -7,7 +7,7 @@ use Sabre\CalDAV; use Sabre\DAV; -class AllowedSharingModesTest extends DAV\Xml\XmlTest +class AllowedSharingModesTestAbstract extends DAV\Xml\AbstractXmlTestCase { public function testSimple() { diff --git a/tests/Sabre/CalDAV/Xml/Property/EmailAddressSetTest.php b/tests/Sabre/CalDAV/Xml/Property/EmailAddressSetTestAbstract.php similarity index 89% rename from tests/Sabre/CalDAV/Xml/Property/EmailAddressSetTest.php rename to tests/Sabre/CalDAV/Xml/Property/EmailAddressSetTestAbstract.php index b732b26c53..2cddf4e32a 100644 --- a/tests/Sabre/CalDAV/Xml/Property/EmailAddressSetTest.php +++ b/tests/Sabre/CalDAV/Xml/Property/EmailAddressSetTestAbstract.php @@ -4,9 +4,9 @@ namespace Sabre\CalDAV\Xml\Property; -use Sabre\DAV\Xml\XmlTest; +use Sabre\DAV\Xml\AbstractXmlTestCase; -class EmailAddressSetTest extends XmlTest +class EmailAddressSetTestAbstract extends AbstractXmlTestCase { protected $namespaceMap = [ \Sabre\CalDAV\Plugin::NS_CALENDARSERVER => 'cs', diff --git a/tests/Sabre/CalDAV/Xml/Property/InviteTest.php b/tests/Sabre/CalDAV/Xml/Property/InviteTestAbstract.php similarity index 98% rename from tests/Sabre/CalDAV/Xml/Property/InviteTest.php rename to tests/Sabre/CalDAV/Xml/Property/InviteTestAbstract.php index 11a26c28e3..8fdc5a35f9 100644 --- a/tests/Sabre/CalDAV/Xml/Property/InviteTest.php +++ b/tests/Sabre/CalDAV/Xml/Property/InviteTestAbstract.php @@ -9,7 +9,7 @@ use Sabre\DAV\Sharing\Plugin as SP; use Sabre\DAV\Xml\Element\Sharee; -class InviteTest extends DAV\Xml\XmlTest +class InviteTestAbstract extends DAV\Xml\AbstractXmlTestCase { public function setup(): void { diff --git a/tests/Sabre/CalDAV/Xml/Property/ScheduleCalendarTranspTest.php b/tests/Sabre/CalDAV/Xml/Property/ScheduleCalendarTranspTestAbstract.php similarity index 97% rename from tests/Sabre/CalDAV/Xml/Property/ScheduleCalendarTranspTest.php rename to tests/Sabre/CalDAV/Xml/Property/ScheduleCalendarTranspTestAbstract.php index fe6170146f..62073a5e53 100644 --- a/tests/Sabre/CalDAV/Xml/Property/ScheduleCalendarTranspTest.php +++ b/tests/Sabre/CalDAV/Xml/Property/ScheduleCalendarTranspTestAbstract.php @@ -7,7 +7,7 @@ use Sabre\CalDAV; use Sabre\DAV; -class ScheduleCalendarTranspTest extends DAV\Xml\XmlTest +class ScheduleCalendarTranspTestAbstract extends DAV\Xml\AbstractXmlTestCase { public function setup(): void { diff --git a/tests/Sabre/CalDAV/Xml/Property/SupportedCalendarComponentSetTest.php b/tests/Sabre/CalDAV/Xml/Property/SupportedCalendarComponentSetTestAbstract.php similarity index 96% rename from tests/Sabre/CalDAV/Xml/Property/SupportedCalendarComponentSetTest.php rename to tests/Sabre/CalDAV/Xml/Property/SupportedCalendarComponentSetTestAbstract.php index 4be33a7959..72a3269c95 100644 --- a/tests/Sabre/CalDAV/Xml/Property/SupportedCalendarComponentSetTest.php +++ b/tests/Sabre/CalDAV/Xml/Property/SupportedCalendarComponentSetTestAbstract.php @@ -7,7 +7,7 @@ use Sabre\CalDAV; use Sabre\DAV; -class SupportedCalendarComponentSetTest extends DAV\Xml\XmlTest +class SupportedCalendarComponentSetTestAbstract extends DAV\Xml\AbstractXmlTestCase { public function setup(): void { diff --git a/tests/Sabre/CalDAV/Xml/Property/SupportedCalendarDataTest.php b/tests/Sabre/CalDAV/Xml/Property/SupportedCalendarDataTestAbstract.php similarity index 91% rename from tests/Sabre/CalDAV/Xml/Property/SupportedCalendarDataTest.php rename to tests/Sabre/CalDAV/Xml/Property/SupportedCalendarDataTestAbstract.php index 6a41a01965..d8a831a57d 100644 --- a/tests/Sabre/CalDAV/Xml/Property/SupportedCalendarDataTest.php +++ b/tests/Sabre/CalDAV/Xml/Property/SupportedCalendarDataTestAbstract.php @@ -7,7 +7,7 @@ use Sabre\CalDAV; use Sabre\DAV; -class SupportedCalendarDataTest extends DAV\Xml\XmlTest +class SupportedCalendarDataTestAbstract extends DAV\Xml\AbstractXmlTestCase { public function testSimple() { diff --git a/tests/Sabre/CalDAV/Xml/Property/SupportedCollationSetTest.php b/tests/Sabre/CalDAV/Xml/Property/SupportedCollationSetTestAbstract.php similarity index 92% rename from tests/Sabre/CalDAV/Xml/Property/SupportedCollationSetTest.php rename to tests/Sabre/CalDAV/Xml/Property/SupportedCollationSetTestAbstract.php index e4737b0cd4..52c4544a3a 100644 --- a/tests/Sabre/CalDAV/Xml/Property/SupportedCollationSetTest.php +++ b/tests/Sabre/CalDAV/Xml/Property/SupportedCollationSetTestAbstract.php @@ -7,7 +7,7 @@ use Sabre\CalDAV; use Sabre\DAV; -class SupportedCollationSetTest extends DAV\Xml\XmlTest +class SupportedCollationSetTestAbstract extends DAV\Xml\AbstractXmlTestCase { public function testSimple() { diff --git a/tests/Sabre/CalDAV/Xml/Request/CalendarQueryReportTest.php b/tests/Sabre/CalDAV/Xml/Request/CalendarQueryReportTestAbstract.php similarity index 99% rename from tests/Sabre/CalDAV/Xml/Request/CalendarQueryReportTest.php rename to tests/Sabre/CalDAV/Xml/Request/CalendarQueryReportTestAbstract.php index a7a03f976b..fda40f24e4 100644 --- a/tests/Sabre/CalDAV/Xml/Request/CalendarQueryReportTest.php +++ b/tests/Sabre/CalDAV/Xml/Request/CalendarQueryReportTestAbstract.php @@ -6,9 +6,9 @@ use DateTimeImmutable; use DateTimeZone; -use Sabre\DAV\Xml\XmlTest; +use Sabre\DAV\Xml\AbstractXmlTestCase; -class CalendarQueryReportTest extends XmlTest +class CalendarQueryReportTestAbstract extends AbstractXmlTestCase { protected $elementMap = [ '{urn:ietf:params:xml:ns:caldav}calendar-query' => 'Sabre\\CalDAV\\Xml\\Request\CalendarQueryReport', diff --git a/tests/Sabre/CalDAV/Xml/Request/InviteReplyTest.php b/tests/Sabre/CalDAV/Xml/Request/InviteReplyTestAbstract.php similarity index 95% rename from tests/Sabre/CalDAV/Xml/Request/InviteReplyTest.php rename to tests/Sabre/CalDAV/Xml/Request/InviteReplyTestAbstract.php index aea49fd219..4d8e48da57 100644 --- a/tests/Sabre/CalDAV/Xml/Request/InviteReplyTest.php +++ b/tests/Sabre/CalDAV/Xml/Request/InviteReplyTestAbstract.php @@ -5,9 +5,9 @@ namespace Sabre\CalDAV\Xml\Request; use Sabre\DAV; -use Sabre\DAV\Xml\XmlTest; +use Sabre\DAV\Xml\AbstractXmlTestCase; -class InviteReplyTest extends XmlTest +class InviteReplyTestAbstract extends AbstractXmlTestCase { protected $elementMap = [ '{http://calendarserver.org/ns/}invite-reply' => 'Sabre\\CalDAV\\Xml\\Request\\InviteReply', diff --git a/tests/Sabre/CalDAV/Xml/Request/ShareTest.php b/tests/Sabre/CalDAV/Xml/Request/ShareTestAbstract.php similarity index 95% rename from tests/Sabre/CalDAV/Xml/Request/ShareTest.php rename to tests/Sabre/CalDAV/Xml/Request/ShareTestAbstract.php index 0ea00a8009..bb821da677 100644 --- a/tests/Sabre/CalDAV/Xml/Request/ShareTest.php +++ b/tests/Sabre/CalDAV/Xml/Request/ShareTestAbstract.php @@ -4,10 +4,10 @@ namespace Sabre\CalDAV\Xml\Request; +use Sabre\DAV\Xml\AbstractXmlTestCase; use Sabre\DAV\Xml\Element\Sharee; -use Sabre\DAV\Xml\XmlTest; -class ShareTest extends XmlTest +class ShareTestAbstract extends AbstractXmlTestCase { protected $elementMap = [ '{http://calendarserver.org/ns/}share' => 'Sabre\\CalDAV\\Xml\\Request\\Share', diff --git a/tests/Sabre/CardDAV/AbstractPluginTest.php b/tests/Sabre/CardDAV/AbstractPluginTestCase.php similarity index 76% rename from tests/Sabre/CardDAV/AbstractPluginTest.php rename to tests/Sabre/CardDAV/AbstractPluginTestCase.php index 6565fc4592..6d5e588cd3 100644 --- a/tests/Sabre/CardDAV/AbstractPluginTest.php +++ b/tests/Sabre/CardDAV/AbstractPluginTestCase.php @@ -4,22 +4,24 @@ namespace Sabre\CardDAV; -use Sabre\DAV; +use PHPUnit\Framework\TestCase; +use Sabre\CardDAV\Backend\Mock; +use Sabre\DAV\Server; use Sabre\DAVACL; use Sabre\HTTP; -abstract class AbstractPluginTest extends \PHPUnit\Framework\TestCase +abstract class AbstractPluginTestCase extends TestCase { /** - * @var Sabre\CardDAV\Plugin + * @var Plugin */ protected $plugin; /** - * @var Sabre\DAV\Server + * @var Server */ protected $server; /** - * @var Sabre\CardDAV\Backend\Mock; + * @var Mock; */ protected $backend; @@ -35,7 +37,7 @@ public function setup(): void $this->plugin = new Plugin(); $this->plugin->directories = ['directory']; - $this->server = new DAV\Server($tree); + $this->server = new Server($tree); $this->server->sapi = new HTTP\SapiMock(); $this->server->addPlugin($this->plugin); $this->server->debugExceptions = true; diff --git a/tests/Sabre/CardDAV/AddressBookQueryTest.php b/tests/Sabre/CardDAV/AddressBookQueryTestCase.php similarity index 99% rename from tests/Sabre/CardDAV/AddressBookQueryTest.php rename to tests/Sabre/CardDAV/AddressBookQueryTestCase.php index 7404b50dca..10f514c606 100644 --- a/tests/Sabre/CardDAV/AddressBookQueryTest.php +++ b/tests/Sabre/CardDAV/AddressBookQueryTestCase.php @@ -7,7 +7,7 @@ use Sabre\DAV; use Sabre\HTTP; -class AddressBookQueryTest extends AbstractPluginTest +class AddressBookQueryTestCase extends AbstractPluginTestCase { public function testQuery() { diff --git a/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php b/tests/Sabre/CardDAV/Backend/AbstractPDOTestCase.php similarity index 98% rename from tests/Sabre/CardDAV/Backend/AbstractPDOTest.php rename to tests/Sabre/CardDAV/Backend/AbstractPDOTestCase.php index ad1d4ddeae..aa77b4b1f4 100644 --- a/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php +++ b/tests/Sabre/CardDAV/Backend/AbstractPDOTestCase.php @@ -4,12 +4,14 @@ namespace Sabre\CardDAV\Backend; +use PHPUnit\Framework\TestCase; use Sabre\CardDAV; +use Sabre\DAV\DbTestHelperTrait; use Sabre\DAV\PropPatch; -abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase +abstract class AbstractPDOTestCase extends TestCase { - use \Sabre\DAV\DbTestHelperTrait; + use DbTestHelperTrait; /** * @var CardDAV\Backend\PDO diff --git a/tests/Sabre/CardDAV/Backend/PDOMySQLTest.php b/tests/Sabre/CardDAV/Backend/PDOMySQLTestCase.php similarity index 66% rename from tests/Sabre/CardDAV/Backend/PDOMySQLTest.php rename to tests/Sabre/CardDAV/Backend/PDOMySQLTestCase.php index 718eec6be7..8b6d0febfc 100644 --- a/tests/Sabre/CardDAV/Backend/PDOMySQLTest.php +++ b/tests/Sabre/CardDAV/Backend/PDOMySQLTestCase.php @@ -4,7 +4,7 @@ namespace Sabre\CardDAV\Backend; -class PDOMySQLTest extends AbstractPDOTest +class PDOMySQLTestCase extends AbstractPDOTestCase { public $driver = 'mysql'; } diff --git a/tests/Sabre/CardDAV/Backend/PDOPgSqlTest.php b/tests/Sabre/CardDAV/Backend/PDOPgSqlTestCase.php similarity index 66% rename from tests/Sabre/CardDAV/Backend/PDOPgSqlTest.php rename to tests/Sabre/CardDAV/Backend/PDOPgSqlTestCase.php index 5db6da0a9c..7ee0a5f327 100644 --- a/tests/Sabre/CardDAV/Backend/PDOPgSqlTest.php +++ b/tests/Sabre/CardDAV/Backend/PDOPgSqlTestCase.php @@ -4,7 +4,7 @@ namespace Sabre\CardDAV\Backend; -class PDOPgSqlTest extends AbstractPDOTest +class PDOPgSqlTestCase extends AbstractPDOTestCase { public $driver = 'pgsql'; } diff --git a/tests/Sabre/CardDAV/Backend/PDOSqliteTest.php b/tests/Sabre/CardDAV/Backend/PDOSqliteTestCase.php similarity index 66% rename from tests/Sabre/CardDAV/Backend/PDOSqliteTest.php rename to tests/Sabre/CardDAV/Backend/PDOSqliteTestCase.php index b16a00ce28..afcf485007 100644 --- a/tests/Sabre/CardDAV/Backend/PDOSqliteTest.php +++ b/tests/Sabre/CardDAV/Backend/PDOSqliteTestCase.php @@ -4,7 +4,7 @@ namespace Sabre\CardDAV\Backend; -class PDOSqliteTest extends AbstractPDOTest +class PDOSqliteTestCase extends AbstractPDOTestCase { public $driver = 'sqlite'; } diff --git a/tests/Sabre/CardDAV/MultiGetTest.php b/tests/Sabre/CardDAV/MultiGetTestCase.php similarity index 98% rename from tests/Sabre/CardDAV/MultiGetTest.php rename to tests/Sabre/CardDAV/MultiGetTestCase.php index e2ee12b657..73716a76aa 100644 --- a/tests/Sabre/CardDAV/MultiGetTest.php +++ b/tests/Sabre/CardDAV/MultiGetTestCase.php @@ -7,7 +7,7 @@ use Sabre\DAV; use Sabre\HTTP; -class MultiGetTest extends AbstractPluginTest +class MultiGetTestCase extends AbstractPluginTestCase { public function testMultiGet() { diff --git a/tests/Sabre/CardDAV/PluginTest.php b/tests/Sabre/CardDAV/PluginTestCase.php similarity index 98% rename from tests/Sabre/CardDAV/PluginTest.php rename to tests/Sabre/CardDAV/PluginTestCase.php index c3a41daf96..0540825900 100644 --- a/tests/Sabre/CardDAV/PluginTest.php +++ b/tests/Sabre/CardDAV/PluginTestCase.php @@ -6,7 +6,7 @@ use Sabre\DAV; -class PluginTest extends AbstractPluginTest +class PluginTestCase extends AbstractPluginTestCase { public function testConstruct() { diff --git a/tests/Sabre/CardDAV/SogoStripContentTypeTest.php b/tests/Sabre/CardDAV/SogoStripContentTypeTestAbstract.php similarity index 96% rename from tests/Sabre/CardDAV/SogoStripContentTypeTest.php rename to tests/Sabre/CardDAV/SogoStripContentTypeTestAbstract.php index 9410653628..0293218745 100644 --- a/tests/Sabre/CardDAV/SogoStripContentTypeTest.php +++ b/tests/Sabre/CardDAV/SogoStripContentTypeTestAbstract.php @@ -7,7 +7,7 @@ use Sabre\DAV\PropFind; use Sabre\HTTP; -class SogoStripContentTypeTest extends \Sabre\DAVServerTest +class SogoStripContentTypeTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCardDAV = true; protected $carddavAddressBooks = [ diff --git a/tests/Sabre/CardDAV/VCFExportTest.php b/tests/Sabre/CardDAV/VCFExportTestAbstract.php similarity index 98% rename from tests/Sabre/CardDAV/VCFExportTest.php rename to tests/Sabre/CardDAV/VCFExportTestAbstract.php index 2e4eeacf66..dbc44310f2 100644 --- a/tests/Sabre/CardDAV/VCFExportTest.php +++ b/tests/Sabre/CardDAV/VCFExportTestAbstract.php @@ -6,7 +6,7 @@ use Sabre\HTTP; -class VCFExportTest extends \Sabre\DAVServerTest +class VCFExportTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupCardDAV = true; protected $autoLogin = 'user1'; diff --git a/tests/Sabre/CardDAV/ValidateFilterTest.php b/tests/Sabre/CardDAV/ValidateFilterTestCase.php similarity index 99% rename from tests/Sabre/CardDAV/ValidateFilterTest.php rename to tests/Sabre/CardDAV/ValidateFilterTestCase.php index b56893bafe..0ec5366921 100644 --- a/tests/Sabre/CardDAV/ValidateFilterTest.php +++ b/tests/Sabre/CardDAV/ValidateFilterTestCase.php @@ -4,7 +4,7 @@ namespace Sabre\CardDAV; -class ValidateFilterTest extends AbstractPluginTest +class ValidateFilterTestCase extends AbstractPluginTestCase { /** * @param string $input diff --git a/tests/Sabre/CardDAV/Xml/Property/SupportedAddressDataTest.php b/tests/Sabre/CardDAV/Xml/Property/SupportedAddressDataTestAbstract.php similarity index 92% rename from tests/Sabre/CardDAV/Xml/Property/SupportedAddressDataTest.php rename to tests/Sabre/CardDAV/Xml/Property/SupportedAddressDataTestAbstract.php index e5dc36e9cb..c31c4a88a5 100644 --- a/tests/Sabre/CardDAV/Xml/Property/SupportedAddressDataTest.php +++ b/tests/Sabre/CardDAV/Xml/Property/SupportedAddressDataTestAbstract.php @@ -7,7 +7,7 @@ use Sabre\CardDAV; use Sabre\DAV; -class SupportedAddressDataTest extends DAV\Xml\XmlTest +class SupportedAddressDataTestAbstract extends DAV\Xml\AbstractXmlTestCase { public function testSimple() { diff --git a/tests/Sabre/CardDAV/Xml/Property/SupportedCollationSetTest.php b/tests/Sabre/CardDAV/Xml/Property/SupportedCollationSetTestAbstract.php similarity index 92% rename from tests/Sabre/CardDAV/Xml/Property/SupportedCollationSetTest.php rename to tests/Sabre/CardDAV/Xml/Property/SupportedCollationSetTestAbstract.php index dd6e2d4843..69e048a315 100644 --- a/tests/Sabre/CardDAV/Xml/Property/SupportedCollationSetTest.php +++ b/tests/Sabre/CardDAV/Xml/Property/SupportedCollationSetTestAbstract.php @@ -7,7 +7,7 @@ use Sabre\CardDAV; use Sabre\DAV; -class SupportedCollationSetTest extends DAV\Xml\XmlTest +class SupportedCollationSetTestAbstract extends DAV\Xml\AbstractXmlTestCase { public function testSimple() { diff --git a/tests/Sabre/CardDAV/Xml/Request/AddressBookMultiGetReportTest.php b/tests/Sabre/CardDAV/Xml/Request/AddressBookMultiGetReportTestAbstract.php similarity index 96% rename from tests/Sabre/CardDAV/Xml/Request/AddressBookMultiGetReportTest.php rename to tests/Sabre/CardDAV/Xml/Request/AddressBookMultiGetReportTestAbstract.php index 29291578c0..61e21da3ee 100644 --- a/tests/Sabre/CardDAV/Xml/Request/AddressBookMultiGetReportTest.php +++ b/tests/Sabre/CardDAV/Xml/Request/AddressBookMultiGetReportTestAbstract.php @@ -2,9 +2,9 @@ namespace Sabre\CardDAV\Xml\Request; -use Sabre\DAV\Xml\XmlTest; +use Sabre\DAV\Xml\AbstractXmlTestCase; -class AddressBookMultiGetReportTest extends XmlTest +class AddressBookMultiGetReportTestAbstract extends AbstractXmlTestCase { protected $elementMap = [ '{urn:ietf:params:xml:ns:carddav}addressbook-multiget' => 'Sabre\\CardDAV\\Xml\\Request\AddressBookMultiGetReport', diff --git a/tests/Sabre/CardDAV/Xml/Request/AddressBookQueryReportTest.php b/tests/Sabre/CardDAV/Xml/Request/AddressBookQueryReportTestAbstract.php similarity index 98% rename from tests/Sabre/CardDAV/Xml/Request/AddressBookQueryReportTest.php rename to tests/Sabre/CardDAV/Xml/Request/AddressBookQueryReportTestAbstract.php index b9fb036ecf..38932df388 100644 --- a/tests/Sabre/CardDAV/Xml/Request/AddressBookQueryReportTest.php +++ b/tests/Sabre/CardDAV/Xml/Request/AddressBookQueryReportTestAbstract.php @@ -4,9 +4,9 @@ namespace Sabre\CardDAV\Xml\Request; -use Sabre\DAV\Xml\XmlTest; +use Sabre\DAV\Xml\AbstractXmlTestCase; -class AddressBookQueryReportTest extends XmlTest +class AddressBookQueryReportTestAbstract extends AbstractXmlTestCase { protected $elementMap = [ '{urn:ietf:params:xml:ns:carddav}addressbook-query' => 'Sabre\\CardDAV\\Xml\\Request\AddressBookQueryReport', diff --git a/tests/Sabre/DAV/AbstractServer.php b/tests/Sabre/DAV/AbstractServerTestCase.php similarity index 66% rename from tests/Sabre/DAV/AbstractServer.php rename to tests/Sabre/DAV/AbstractServerTestCase.php index ee321fd4c6..053a229dbc 100644 --- a/tests/Sabre/DAV/AbstractServer.php +++ b/tests/Sabre/DAV/AbstractServerTestCase.php @@ -4,42 +4,45 @@ namespace Sabre\DAV; +use PHPUnit\Framework\TestCase; use Sabre\HTTP; +use Sabre\HTTP\ResponseMock; +use Sabre\TestUtil; -abstract class AbstractServer extends \PHPUnit\Framework\TestCase +abstract class AbstractServerTestCase extends TestCase { /** - * @var \Sabre\HTTP\ResponseMock + * @var ResponseMock */ protected $response; protected $request; /** - * @var \Sabre\DAV\Server + * @var Server */ protected $server; - protected $tempDir = \Sabre\TestUtil::SABRE_TEMPDIR; + protected $tempDir = TestUtil::SABRE_TEMPDIR; public function setup(): void { - $this->response = new HTTP\ResponseMock(); + $this->response = new ResponseMock(); $this->server = new Server($this->getRootNode()); $this->server->sapi = new HTTP\SapiMock(); $this->server->httpResponse = $this->response; $this->server->debugExceptions = true; - $this->deleteTree(\Sabre\TestUtil::SABRE_TEMPDIR, false); - file_put_contents(\Sabre\TestUtil::SABRE_TEMPDIR.'/test.txt', 'Test contents'); - mkdir(\Sabre\TestUtil::SABRE_TEMPDIR.'/dir'); - file_put_contents(\Sabre\TestUtil::SABRE_TEMPDIR.'/dir/child.txt', 'Child contents'); + $this->deleteTree(TestUtil::SABRE_TEMPDIR, false); + file_put_contents(TestUtil::SABRE_TEMPDIR.'/test.txt', 'Test contents'); + mkdir(TestUtil::SABRE_TEMPDIR.'/dir'); + file_put_contents(TestUtil::SABRE_TEMPDIR.'/dir/child.txt', 'Child contents'); } public function teardown(): void { - $this->deleteTree(\Sabre\TestUtil::SABRE_TEMPDIR, false); + $this->deleteTree(TestUtil::SABRE_TEMPDIR, false); } protected function getRootNode() { - return new FS\Directory(\Sabre\TestUtil::SABRE_TEMPDIR); + return new FS\Directory(TestUtil::SABRE_TEMPDIR); } protected function getSanitizedBody() diff --git a/tests/Sabre/DAV/Auth/Backend/AbstractPDOBasicAuthTest.php b/tests/Sabre/DAV/Auth/Backend/AbstractPDOBasicAuthTestCase.php similarity index 96% rename from tests/Sabre/DAV/Auth/Backend/AbstractPDOBasicAuthTest.php rename to tests/Sabre/DAV/Auth/Backend/AbstractPDOBasicAuthTestCase.php index 3a5d9164d0..9ec8f06cab 100644 --- a/tests/Sabre/DAV/Auth/Backend/AbstractPDOBasicAuthTest.php +++ b/tests/Sabre/DAV/Auth/Backend/AbstractPDOBasicAuthTestCase.php @@ -4,11 +4,13 @@ namespace Sabre\DAV\Auth\Backend; +use PHPUnit\Framework\TestCase; +use Sabre\DAV\DbTestHelperTrait; use Sabre\HTTP; -abstract class AbstractPDOBasicAuthTest extends \PHPUnit\Framework\TestCase +abstract class AbstractPDOBasicAuthTestCase extends TestCase { - use \Sabre\DAV\DbTestHelperTrait; + use DbTestHelperTrait; public function setup(): void { diff --git a/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php b/tests/Sabre/DAV/Auth/Backend/AbstractPDOTestCaseCase.php similarity index 84% rename from tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php rename to tests/Sabre/DAV/Auth/Backend/AbstractPDOTestCaseCase.php index 66a04719d3..65deddcc38 100644 --- a/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php +++ b/tests/Sabre/DAV/Auth/Backend/AbstractPDOTestCaseCase.php @@ -4,9 +4,12 @@ namespace Sabre\DAV\Auth\Backend; -abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase +use PHPUnit\Framework\TestCase; +use Sabre\DAV\DbTestHelperTrait; + +abstract class AbstractPDOTestCaseCase extends TestCase { - use \Sabre\DAV\DbTestHelperTrait; + use DbTestHelperTrait; public function setup(): void { diff --git a/tests/Sabre/DAV/Auth/Backend/PDOBasicAuthSqliteTest.php b/tests/Sabre/DAV/Auth/Backend/PDOBasicAuthSqliteTestCase.php similarity index 59% rename from tests/Sabre/DAV/Auth/Backend/PDOBasicAuthSqliteTest.php rename to tests/Sabre/DAV/Auth/Backend/PDOBasicAuthSqliteTestCase.php index e961bf0abb..4a0107d574 100644 --- a/tests/Sabre/DAV/Auth/Backend/PDOBasicAuthSqliteTest.php +++ b/tests/Sabre/DAV/Auth/Backend/PDOBasicAuthSqliteTestCase.php @@ -4,7 +4,7 @@ namespace Sabre\DAV\Auth\Backend; -class PDOBasicAuthSqliteTest extends AbstractPDOBasicAuthTest +class PDOBasicAuthSqliteTestCase extends AbstractPDOBasicAuthTestCase { public $driver = 'sqlite'; } diff --git a/tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php b/tests/Sabre/DAV/Auth/Backend/PDOMySQLTestCaseCase.php similarity index 63% rename from tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php rename to tests/Sabre/DAV/Auth/Backend/PDOMySQLTestCaseCase.php index 6ad7906c4f..c897813777 100644 --- a/tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php +++ b/tests/Sabre/DAV/Auth/Backend/PDOMySQLTestCaseCase.php @@ -4,7 +4,7 @@ namespace Sabre\DAV\Auth\Backend; -class PDOMySQLTest extends AbstractPDOTest +class PDOMySQLTestCaseCase extends AbstractPDOTestCaseCase { public $driver = 'mysql'; } diff --git a/tests/Sabre/DAV/Auth/Backend/PDOPgSqlTest.php b/tests/Sabre/DAV/Auth/Backend/PDOPgSqlTestCaseCase.php similarity index 63% rename from tests/Sabre/DAV/Auth/Backend/PDOPgSqlTest.php rename to tests/Sabre/DAV/Auth/Backend/PDOPgSqlTestCaseCase.php index b82b07698c..5881137c20 100644 --- a/tests/Sabre/DAV/Auth/Backend/PDOPgSqlTest.php +++ b/tests/Sabre/DAV/Auth/Backend/PDOPgSqlTestCaseCase.php @@ -4,7 +4,7 @@ namespace Sabre\DAV\Auth\Backend; -class PDOPgSqlTest extends AbstractPDOTest +class PDOPgSqlTestCaseCase extends AbstractPDOTestCaseCase { public $driver = 'pgsql'; } diff --git a/tests/Sabre/DAV/Auth/Backend/PDOSqliteTest.php b/tests/Sabre/DAV/Auth/Backend/PDOSqliteTestCaseCase.php similarity index 63% rename from tests/Sabre/DAV/Auth/Backend/PDOSqliteTest.php rename to tests/Sabre/DAV/Auth/Backend/PDOSqliteTestCaseCase.php index b42b40eff0..179d16adb6 100644 --- a/tests/Sabre/DAV/Auth/Backend/PDOSqliteTest.php +++ b/tests/Sabre/DAV/Auth/Backend/PDOSqliteTestCaseCase.php @@ -4,7 +4,7 @@ namespace Sabre\DAV\Auth\Backend; -class PDOSqliteTest extends AbstractPDOTest +class PDOSqliteTestCaseCase extends AbstractPDOTestCaseCase { public $driver = 'sqlite'; } diff --git a/tests/Sabre/DAV/Browser/GuessContentTypeTest.php b/tests/Sabre/DAV/Browser/GuessContentTypeTest.php index 3da77f8b33..a918171cf3 100644 --- a/tests/Sabre/DAV/Browser/GuessContentTypeTest.php +++ b/tests/Sabre/DAV/Browser/GuessContentTypeTest.php @@ -6,7 +6,7 @@ use Sabre\DAV; -class GuessContentTypeTest extends DAV\AbstractServer +class GuessContentTypeTest extends DAV\AbstractServerTestCase { public function setUp(): void { diff --git a/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php b/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php index b128289c4d..68193ce6d0 100644 --- a/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php +++ b/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php @@ -7,7 +7,7 @@ use Sabre\DAV; use Sabre\HTTP; -class MapGetToPropFindTest extends DAV\AbstractServer +class MapGetToPropFindTest extends DAV\AbstractServerTestCase { public function setUp(): void { diff --git a/tests/Sabre/DAV/Browser/PluginTest.php b/tests/Sabre/DAV/Browser/PluginTest.php index 9e2cfd692e..6efb00b081 100644 --- a/tests/Sabre/DAV/Browser/PluginTest.php +++ b/tests/Sabre/DAV/Browser/PluginTest.php @@ -7,7 +7,7 @@ use Sabre\DAV; use Sabre\HTTP; -class PluginTest extends DAV\AbstractServer +class PluginTest extends DAV\AbstractServerTestCase { protected $plugin; diff --git a/tests/Sabre/DAV/FSExt/ServerTest.php b/tests/Sabre/DAV/FSExt/ServerTestTestCase.php similarity index 99% rename from tests/Sabre/DAV/FSExt/ServerTest.php rename to tests/Sabre/DAV/FSExt/ServerTestTestCase.php index d6aeaf82f9..b5b07ec3ee 100644 --- a/tests/Sabre/DAV/FSExt/ServerTest.php +++ b/tests/Sabre/DAV/FSExt/ServerTestTestCase.php @@ -7,7 +7,7 @@ use Sabre\DAV; use Sabre\HTTP; -class ServerTest extends DAV\AbstractServer +class ServerTestTestCase extends DAV\AbstractServerTestCase { protected function getRootNode() { diff --git a/tests/Sabre/DAV/GetIfConditionsTest.php b/tests/Sabre/DAV/GetIfConditionsTest.php index 9f613398fc..afee554377 100644 --- a/tests/Sabre/DAV/GetIfConditionsTest.php +++ b/tests/Sabre/DAV/GetIfConditionsTest.php @@ -6,7 +6,7 @@ use Sabre\HTTP; -class GetIfConditionsTest extends AbstractServer +class GetIfConditionsTest extends AbstractServerTestCase { public function testNoConditions() { diff --git a/tests/Sabre/DAV/HTTPPreferParsingTest.php b/tests/Sabre/DAV/HTTPPreferParsingTestAbstract.php similarity index 98% rename from tests/Sabre/DAV/HTTPPreferParsingTest.php rename to tests/Sabre/DAV/HTTPPreferParsingTestAbstract.php index d91882eae6..91577403c4 100644 --- a/tests/Sabre/DAV/HTTPPreferParsingTest.php +++ b/tests/Sabre/DAV/HTTPPreferParsingTestAbstract.php @@ -6,7 +6,7 @@ use Sabre\HTTP; -class HTTPPreferParsingTest extends \Sabre\DAVServerTest +class HTTPPreferParsingTestAbstract extends \Sabre\AbstractDAVServerTestCase { public function assertParseResult($input, $expected) { diff --git a/tests/Sabre/DAV/HttpCopyTest.php b/tests/Sabre/DAV/HttpCopyTestAbstract.php similarity index 98% rename from tests/Sabre/DAV/HttpCopyTest.php rename to tests/Sabre/DAV/HttpCopyTestAbstract.php index 96a516a3b8..8b039b78fe 100644 --- a/tests/Sabre/DAV/HttpCopyTest.php +++ b/tests/Sabre/DAV/HttpCopyTestAbstract.php @@ -4,7 +4,7 @@ namespace Sabre\DAV; -use Sabre\DAVServerTest; +use Sabre\AbstractDAVServerTestCase; use Sabre\HTTP; /** @@ -14,7 +14,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -class HttpCopyTest extends DAVServerTest +class HttpCopyTestAbstract extends AbstractDAVServerTestCase { /** * Sets up the DAV tree. diff --git a/tests/Sabre/DAV/HttpDeleteTest.php b/tests/Sabre/DAV/HttpDeleteTestAbstract.php similarity index 96% rename from tests/Sabre/DAV/HttpDeleteTest.php rename to tests/Sabre/DAV/HttpDeleteTestAbstract.php index 2fc29ee0f6..6b3927526f 100644 --- a/tests/Sabre/DAV/HttpDeleteTest.php +++ b/tests/Sabre/DAV/HttpDeleteTestAbstract.php @@ -4,7 +4,7 @@ namespace Sabre\DAV; -use Sabre\DAVServerTest; +use Sabre\AbstractDAVServerTestCase; use Sabre\HTTP; /** @@ -14,7 +14,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -class HttpDeleteTest extends DAVServerTest +class HttpDeleteTestAbstract extends AbstractDAVServerTestCase { /** * Sets up the DAV tree. diff --git a/tests/Sabre/DAV/HttpGetTest.php b/tests/Sabre/DAV/HttpGetTestAbstract.php similarity index 97% rename from tests/Sabre/DAV/HttpGetTest.php rename to tests/Sabre/DAV/HttpGetTestAbstract.php index 61e8f58251..c3be61c056 100644 --- a/tests/Sabre/DAV/HttpGetTest.php +++ b/tests/Sabre/DAV/HttpGetTestAbstract.php @@ -4,7 +4,7 @@ namespace Sabre\DAV; -use Sabre\DAVServerTest; +use Sabre\AbstractDAVServerTestCase; use Sabre\HTTP; /** @@ -14,7 +14,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -class HttpGetTest extends DAVServerTest +class HttpGetTestAbstract extends AbstractDAVServerTestCase { /** * Sets up the DAV tree. diff --git a/tests/Sabre/DAV/HttpHeadTest.php b/tests/Sabre/DAV/HttpHeadTestAbstract.php similarity index 96% rename from tests/Sabre/DAV/HttpHeadTest.php rename to tests/Sabre/DAV/HttpHeadTestAbstract.php index e719ef3cf6..2cb03916a7 100644 --- a/tests/Sabre/DAV/HttpHeadTest.php +++ b/tests/Sabre/DAV/HttpHeadTestAbstract.php @@ -4,7 +4,7 @@ namespace Sabre\DAV; -use Sabre\DAVServerTest; +use Sabre\AbstractDAVServerTestCase; use Sabre\HTTP; /** @@ -14,7 +14,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -class HttpHeadTest extends DAVServerTest +class HttpHeadTestAbstract extends AbstractDAVServerTestCase { /** * Sets up the DAV tree. diff --git a/tests/Sabre/DAV/HttpMoveTest.php b/tests/Sabre/DAV/HttpMoveTestAbstract.php similarity index 97% rename from tests/Sabre/DAV/HttpMoveTest.php rename to tests/Sabre/DAV/HttpMoveTestAbstract.php index cd3cce58fc..3992192f05 100644 --- a/tests/Sabre/DAV/HttpMoveTest.php +++ b/tests/Sabre/DAV/HttpMoveTestAbstract.php @@ -4,7 +4,7 @@ namespace Sabre\DAV; -use Sabre\DAVServerTest; +use Sabre\AbstractDAVServerTestCase; use Sabre\HTTP; /** @@ -14,7 +14,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -class HttpMoveTest extends DAVServerTest +class HttpMoveTestAbstract extends AbstractDAVServerTestCase { /** * Sets up the DAV tree. diff --git a/tests/Sabre/DAV/HttpPutTest.php b/tests/Sabre/DAV/HttpPutTestAbstract.php similarity index 98% rename from tests/Sabre/DAV/HttpPutTest.php rename to tests/Sabre/DAV/HttpPutTestAbstract.php index cdc567c944..2c24462ec0 100644 --- a/tests/Sabre/DAV/HttpPutTest.php +++ b/tests/Sabre/DAV/HttpPutTestAbstract.php @@ -4,7 +4,7 @@ namespace Sabre\DAV; -use Sabre\DAVServerTest; +use Sabre\AbstractDAVServerTestCase; use Sabre\HTTP; /** @@ -14,7 +14,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -class HttpPutTest extends DAVServerTest +class HttpPutTestAbstract extends AbstractDAVServerTestCase { /** * Sets up the DAV tree. diff --git a/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php b/tests/Sabre/DAV/Locks/Backend/AbstractPDOMySQLTest.php similarity index 65% rename from tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php rename to tests/Sabre/DAV/Locks/Backend/AbstractPDOMySQLTest.php index 86ffc0bb32..e9d611dd8a 100644 --- a/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php +++ b/tests/Sabre/DAV/Locks/Backend/AbstractPDOMySQLTest.php @@ -4,7 +4,7 @@ namespace Sabre\DAV\Locks\Backend; -class PDOMySQLTest extends PDOTest +class AbstractPDOMySQLTest extends AbstractPDOTestCase { public $driver = 'mysql'; } diff --git a/tests/Sabre/DAV/Locks/Backend/PDOPgSqlTest.php b/tests/Sabre/DAV/Locks/Backend/AbstractPDOPgSqlTest.php similarity index 65% rename from tests/Sabre/DAV/Locks/Backend/PDOPgSqlTest.php rename to tests/Sabre/DAV/Locks/Backend/AbstractPDOPgSqlTest.php index 4ab0579444..0a6bc6353a 100644 --- a/tests/Sabre/DAV/Locks/Backend/PDOPgSqlTest.php +++ b/tests/Sabre/DAV/Locks/Backend/AbstractPDOPgSqlTest.php @@ -4,7 +4,7 @@ namespace Sabre\DAV\Locks\Backend; -class PDOPgSqlTest extends PDOTest +class AbstractPDOPgSqlTest extends AbstractPDOTestCase { public $driver = 'pgsql'; } diff --git a/tests/Sabre/DAV/Locks/Backend/PDOSqliteTest.php b/tests/Sabre/DAV/Locks/Backend/AbstractPDOSqliteTest.php similarity index 65% rename from tests/Sabre/DAV/Locks/Backend/PDOSqliteTest.php rename to tests/Sabre/DAV/Locks/Backend/AbstractPDOSqliteTest.php index f0c384d4c2..fb82a702ce 100644 --- a/tests/Sabre/DAV/Locks/Backend/PDOSqliteTest.php +++ b/tests/Sabre/DAV/Locks/Backend/AbstractPDOSqliteTest.php @@ -4,7 +4,7 @@ namespace Sabre\DAV\Locks\Backend; -class PDOSqliteTest extends PDOTest +class AbstractPDOSqliteTest extends AbstractPDOTestCase { public $driver = 'sqlite'; } diff --git a/tests/Sabre/DAV/Locks/Backend/PDOTest.php b/tests/Sabre/DAV/Locks/Backend/AbstractPDOTestCase.php similarity index 83% rename from tests/Sabre/DAV/Locks/Backend/PDOTest.php rename to tests/Sabre/DAV/Locks/Backend/AbstractPDOTestCase.php index f5ed98f507..b2b23ccd6b 100644 --- a/tests/Sabre/DAV/Locks/Backend/PDOTest.php +++ b/tests/Sabre/DAV/Locks/Backend/AbstractPDOTestCase.php @@ -4,7 +4,7 @@ namespace Sabre\DAV\Locks\Backend; -abstract class PDOTest extends AbstractTest +abstract class AbstractPDOTestCase extends AbstractTestCase { use \Sabre\DAV\DbTestHelperTrait; diff --git a/tests/Sabre/DAV/Locks/Backend/AbstractTest.php b/tests/Sabre/DAV/Locks/Backend/AbstractTestCase.php similarity index 98% rename from tests/Sabre/DAV/Locks/Backend/AbstractTest.php rename to tests/Sabre/DAV/Locks/Backend/AbstractTestCase.php index 1a7c5fa94a..73425e6b8f 100644 --- a/tests/Sabre/DAV/Locks/Backend/AbstractTest.php +++ b/tests/Sabre/DAV/Locks/Backend/AbstractTestCase.php @@ -4,9 +4,10 @@ namespace Sabre\DAV\Locks\Backend; +use PHPUnit\Framework\TestCase; use Sabre\DAV; -abstract class AbstractTest extends \PHPUnit\Framework\TestCase +abstract class AbstractTestCase extends TestCase { /** * @abstract diff --git a/tests/Sabre/DAV/Locks/Backend/FileTest.php b/tests/Sabre/DAV/Locks/Backend/FileTestCase.php similarity index 88% rename from tests/Sabre/DAV/Locks/Backend/FileTest.php rename to tests/Sabre/DAV/Locks/Backend/FileTestCase.php index f96c09e282..5d38ebcbed 100644 --- a/tests/Sabre/DAV/Locks/Backend/FileTest.php +++ b/tests/Sabre/DAV/Locks/Backend/FileTestCase.php @@ -4,7 +4,7 @@ namespace Sabre\DAV\Locks\Backend; -class FileTest extends AbstractTest +class FileTestCase extends AbstractTestCase { public function getBackend() { diff --git a/tests/Sabre/DAV/Locks/Plugin2Test.php b/tests/Sabre/DAV/Locks/Plugin2TestAbstract.php similarity index 95% rename from tests/Sabre/DAV/Locks/Plugin2Test.php rename to tests/Sabre/DAV/Locks/Plugin2TestAbstract.php index 9548363e9d..4ea259c297 100644 --- a/tests/Sabre/DAV/Locks/Plugin2Test.php +++ b/tests/Sabre/DAV/Locks/Plugin2TestAbstract.php @@ -6,7 +6,7 @@ use Sabre\HTTP\Request; -class Plugin2Test extends \Sabre\DAVServerTest +class Plugin2TestAbstract extends \Sabre\AbstractDAVServerTestCase { public $setupLocks = true; diff --git a/tests/Sabre/DAV/Locks/PluginTest.php b/tests/Sabre/DAV/Locks/PluginTest.php index 70530d2f53..66f16abd81 100644 --- a/tests/Sabre/DAV/Locks/PluginTest.php +++ b/tests/Sabre/DAV/Locks/PluginTest.php @@ -7,7 +7,7 @@ use Sabre\DAV; use Sabre\HTTP; -class PluginTest extends DAV\AbstractServer +class PluginTest extends DAV\AbstractServerTestCase { /** * @var Plugin diff --git a/tests/Sabre/DAV/Mount/PluginTest.php b/tests/Sabre/DAV/Mount/PluginTest.php index 12f75cb363..e630d561f8 100644 --- a/tests/Sabre/DAV/Mount/PluginTest.php +++ b/tests/Sabre/DAV/Mount/PluginTest.php @@ -7,7 +7,7 @@ use Sabre\DAV; use Sabre\HTTP; -class PluginTest extends DAV\AbstractServer +class PluginTest extends DAV\AbstractServerTestCase { public function setup(): void { diff --git a/tests/Sabre/DAV/PartialUpdate/PluginTest.php b/tests/Sabre/DAV/PartialUpdate/PluginTestAbstract.php similarity index 98% rename from tests/Sabre/DAV/PartialUpdate/PluginTest.php rename to tests/Sabre/DAV/PartialUpdate/PluginTestAbstract.php index deb18b5a4a..55560921bf 100644 --- a/tests/Sabre/DAV/PartialUpdate/PluginTest.php +++ b/tests/Sabre/DAV/PartialUpdate/PluginTestAbstract.php @@ -6,7 +6,7 @@ use Sabre\HTTP; -class PluginTest extends \Sabre\DAVServerTest +class PluginTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $node; protected $plugin; diff --git a/tests/Sabre/DAV/PropertyStorage/Backend/AbstractPDOTest.php b/tests/Sabre/DAV/PropertyStorage/Backend/AbstractPDOTestCase.php similarity index 97% rename from tests/Sabre/DAV/PropertyStorage/Backend/AbstractPDOTest.php rename to tests/Sabre/DAV/PropertyStorage/Backend/AbstractPDOTestCase.php index 79dcdb6dd9..0c8571080f 100644 --- a/tests/Sabre/DAV/PropertyStorage/Backend/AbstractPDOTest.php +++ b/tests/Sabre/DAV/PropertyStorage/Backend/AbstractPDOTestCase.php @@ -4,14 +4,16 @@ namespace Sabre\DAV\PropertyStorage\Backend; +use PHPUnit\Framework\TestCase; +use Sabre\DAV\DbTestHelperTrait; use Sabre\DAV\PropFind; use Sabre\DAV\PropPatch; use Sabre\DAV\Xml\Property\Complex; use Sabre\DAV\Xml\Property\Href; -abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase +abstract class AbstractPDOTestCase extends TestCase { - use \Sabre\DAV\DbTestHelperTrait; + use DbTestHelperTrait; public function getBackend() { diff --git a/tests/Sabre/DAV/PropertyStorage/Backend/PDOMysqlTest.php b/tests/Sabre/DAV/PropertyStorage/Backend/PDOMysqlTestCase.php similarity index 68% rename from tests/Sabre/DAV/PropertyStorage/Backend/PDOMysqlTest.php rename to tests/Sabre/DAV/PropertyStorage/Backend/PDOMysqlTestCase.php index 6e11317c20..f9ccf4412d 100644 --- a/tests/Sabre/DAV/PropertyStorage/Backend/PDOMysqlTest.php +++ b/tests/Sabre/DAV/PropertyStorage/Backend/PDOMysqlTestCase.php @@ -4,7 +4,7 @@ namespace Sabre\DAV\PropertyStorage\Backend; -class PDOMysqlTest extends AbstractPDOTest +class PDOMysqlTestCase extends AbstractPDOTestCase { public $driver = 'mysql'; } diff --git a/tests/Sabre/DAV/PropertyStorage/Backend/PDOPgSqlTest.php b/tests/Sabre/DAV/PropertyStorage/Backend/PDOPgSqlTestCase.php similarity index 68% rename from tests/Sabre/DAV/PropertyStorage/Backend/PDOPgSqlTest.php rename to tests/Sabre/DAV/PropertyStorage/Backend/PDOPgSqlTestCase.php index 23955f35d8..4c11b1a135 100644 --- a/tests/Sabre/DAV/PropertyStorage/Backend/PDOPgSqlTest.php +++ b/tests/Sabre/DAV/PropertyStorage/Backend/PDOPgSqlTestCase.php @@ -4,7 +4,7 @@ namespace Sabre\DAV\PropertyStorage\Backend; -class PDOPgSqlTest extends AbstractPDOTest +class PDOPgSqlTestCase extends AbstractPDOTestCase { public $driver = 'pgsql'; } diff --git a/tests/Sabre/DAV/PropertyStorage/Backend/PDOSqliteTest.php b/tests/Sabre/DAV/PropertyStorage/Backend/PDOSqliteTestCase.php similarity index 68% rename from tests/Sabre/DAV/PropertyStorage/Backend/PDOSqliteTest.php rename to tests/Sabre/DAV/PropertyStorage/Backend/PDOSqliteTestCase.php index 37b0ed205d..956937bb8d 100644 --- a/tests/Sabre/DAV/PropertyStorage/Backend/PDOSqliteTest.php +++ b/tests/Sabre/DAV/PropertyStorage/Backend/PDOSqliteTestCase.php @@ -4,7 +4,7 @@ namespace Sabre\DAV\PropertyStorage\Backend; -class PDOSqliteTest extends AbstractPDOTest +class PDOSqliteTestCase extends AbstractPDOTestCase { public $driver = 'sqlite'; } diff --git a/tests/Sabre/DAV/PropertyStorage/PluginTest.php b/tests/Sabre/DAV/PropertyStorage/PluginTestAbstract.php similarity index 97% rename from tests/Sabre/DAV/PropertyStorage/PluginTest.php rename to tests/Sabre/DAV/PropertyStorage/PluginTestAbstract.php index 7a5d417f48..7e78126df8 100644 --- a/tests/Sabre/DAV/PropertyStorage/PluginTest.php +++ b/tests/Sabre/DAV/PropertyStorage/PluginTestAbstract.php @@ -4,7 +4,7 @@ namespace Sabre\DAV\PropertyStorage; -class PluginTest extends \Sabre\DAVServerTest +class PluginTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $backend; protected $plugin; diff --git a/tests/Sabre/DAV/ServerEventsTest.php b/tests/Sabre/DAV/ServerEventsTestTestCase.php similarity index 98% rename from tests/Sabre/DAV/ServerEventsTest.php rename to tests/Sabre/DAV/ServerEventsTestTestCase.php index e4db38ce44..971b7d05a5 100644 --- a/tests/Sabre/DAV/ServerEventsTest.php +++ b/tests/Sabre/DAV/ServerEventsTestTestCase.php @@ -6,7 +6,7 @@ use Sabre\HTTP; -class ServerEventsTest extends AbstractServer +class ServerEventsTestTestCase extends AbstractServerTestCase { private $tempPath; diff --git a/tests/Sabre/DAV/ServerMKCOLTest.php b/tests/Sabre/DAV/ServerMKCOLTestTestCase.php similarity index 99% rename from tests/Sabre/DAV/ServerMKCOLTest.php rename to tests/Sabre/DAV/ServerMKCOLTestTestCase.php index 56653dc7db..35d32509d5 100644 --- a/tests/Sabre/DAV/ServerMKCOLTest.php +++ b/tests/Sabre/DAV/ServerMKCOLTestTestCase.php @@ -6,7 +6,7 @@ use Sabre\HTTP; -class ServerMKCOLTest extends AbstractServer +class ServerMKCOLTestTestCase extends AbstractServerTestCase { public function testMkcol() { diff --git a/tests/Sabre/DAV/ServerPluginTest.php b/tests/Sabre/DAV/ServerPluginTestTestCase.php similarity index 96% rename from tests/Sabre/DAV/ServerPluginTest.php rename to tests/Sabre/DAV/ServerPluginTestTestCase.php index fc613beef5..71a018c079 100644 --- a/tests/Sabre/DAV/ServerPluginTest.php +++ b/tests/Sabre/DAV/ServerPluginTestTestCase.php @@ -6,10 +6,10 @@ use Sabre\HTTP; -class ServerPluginTest extends AbstractServer +class ServerPluginTestTestCase extends AbstractServerTestCase { /** - * @var Sabre\DAV\TestPlugin + * @var TestPlugin */ protected $testPlugin; diff --git a/tests/Sabre/DAV/ServerPropsInfiniteDepthTest.php b/tests/Sabre/DAV/ServerPropsInfiniteDepthTestTestCase.php similarity index 99% rename from tests/Sabre/DAV/ServerPropsInfiniteDepthTest.php rename to tests/Sabre/DAV/ServerPropsInfiniteDepthTestTestCase.php index db28680816..0252c69e49 100644 --- a/tests/Sabre/DAV/ServerPropsInfiniteDepthTest.php +++ b/tests/Sabre/DAV/ServerPropsInfiniteDepthTestTestCase.php @@ -6,7 +6,7 @@ use Sabre\HTTP; -class ServerPropsInfiniteDepthTest extends AbstractServer +class ServerPropsInfiniteDepthTestTestCase extends AbstractServerTestCase { protected function getRootNode() { diff --git a/tests/Sabre/DAV/ServerPropsTest.php b/tests/Sabre/DAV/ServerPropsTestTestCase.php similarity index 99% rename from tests/Sabre/DAV/ServerPropsTest.php rename to tests/Sabre/DAV/ServerPropsTestTestCase.php index 6f4626f0fd..9c7bab1a6c 100644 --- a/tests/Sabre/DAV/ServerPropsTest.php +++ b/tests/Sabre/DAV/ServerPropsTestTestCase.php @@ -6,7 +6,7 @@ use Sabre\HTTP; -class ServerPropsTest extends AbstractServer +class ServerPropsTestTestCase extends AbstractServerTestCase { protected function getRootNode() { diff --git a/tests/Sabre/DAV/ServerRangeTest.php b/tests/Sabre/DAV/ServerRangeTestAbstract.php similarity index 99% rename from tests/Sabre/DAV/ServerRangeTest.php rename to tests/Sabre/DAV/ServerRangeTestAbstract.php index d06a4ad6a4..4aca2d30e3 100644 --- a/tests/Sabre/DAV/ServerRangeTest.php +++ b/tests/Sabre/DAV/ServerRangeTestAbstract.php @@ -14,7 +14,7 @@ * @author Evert Pot (http://evertpot.com/) * @license http://sabre.io/license/ Modified BSD License */ -class ServerRangeTest extends \Sabre\DAVServerTest +class ServerRangeTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupFiles = true; diff --git a/tests/Sabre/DAV/ServerSimpleTest.php b/tests/Sabre/DAV/ServerSimpleTestTestCase.php similarity index 99% rename from tests/Sabre/DAV/ServerSimpleTest.php rename to tests/Sabre/DAV/ServerSimpleTestTestCase.php index c8222227f8..4edd7275c7 100644 --- a/tests/Sabre/DAV/ServerSimpleTest.php +++ b/tests/Sabre/DAV/ServerSimpleTestTestCase.php @@ -6,7 +6,7 @@ use Sabre\HTTP; -class ServerSimpleTest extends AbstractServer +class ServerSimpleTestTestCase extends AbstractServerTestCase { public function testConstructArray() { diff --git a/tests/Sabre/DAV/Sharing/PluginTest.php b/tests/Sabre/DAV/Sharing/PluginTestAbstract.php similarity index 98% rename from tests/Sabre/DAV/Sharing/PluginTest.php rename to tests/Sabre/DAV/Sharing/PluginTestAbstract.php index 71767050e8..74c5df3fdf 100644 --- a/tests/Sabre/DAV/Sharing/PluginTest.php +++ b/tests/Sabre/DAV/Sharing/PluginTestAbstract.php @@ -7,7 +7,7 @@ use Sabre\DAV\Mock; use Sabre\DAV\Xml\Property; -class PluginTest extends \Sabre\DAVServerTest +class PluginTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupSharing = true; protected $setupACL = true; diff --git a/tests/Sabre/DAV/Sharing/ShareResourceTest.php b/tests/Sabre/DAV/Sharing/ShareResourceTestAbstract.php similarity index 98% rename from tests/Sabre/DAV/Sharing/ShareResourceTest.php rename to tests/Sabre/DAV/Sharing/ShareResourceTestAbstract.php index 2f39febbe2..6a52b7c71e 100644 --- a/tests/Sabre/DAV/Sharing/ShareResourceTest.php +++ b/tests/Sabre/DAV/Sharing/ShareResourceTestAbstract.php @@ -8,7 +8,7 @@ use Sabre\DAV\Xml\Element\Sharee; use Sabre\HTTP\Request; -class ShareResourceTest extends \Sabre\DAVServerTest +class ShareResourceTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $setupSharing = true; protected $sharingNodeMock; diff --git a/tests/Sabre/DAV/Sync/PluginTest.php b/tests/Sabre/DAV/Sync/PluginTestAbstract.php similarity index 99% rename from tests/Sabre/DAV/Sync/PluginTest.php rename to tests/Sabre/DAV/Sync/PluginTestAbstract.php index b5bc96e3eb..4bc0038ae7 100644 --- a/tests/Sabre/DAV/Sync/PluginTest.php +++ b/tests/Sabre/DAV/Sync/PluginTestAbstract.php @@ -7,7 +7,7 @@ use Sabre\DAV; use Sabre\HTTP; -class PluginTest extends \Sabre\DAVServerTest +class PluginTestAbstract extends \Sabre\AbstractDAVServerTestCase { protected $collection; diff --git a/tests/Sabre/DAV/SyncTokenPropertyTest.php b/tests/Sabre/DAV/SyncTokenPropertyTestAbstract.php similarity index 97% rename from tests/Sabre/DAV/SyncTokenPropertyTest.php rename to tests/Sabre/DAV/SyncTokenPropertyTestAbstract.php index ece6f59b82..080d2493b7 100644 --- a/tests/Sabre/DAV/SyncTokenPropertyTest.php +++ b/tests/Sabre/DAV/SyncTokenPropertyTestAbstract.php @@ -4,7 +4,7 @@ namespace Sabre\DAV; -class SyncTokenPropertyTest extends \Sabre\DAVServerTest +class SyncTokenPropertyTestAbstract extends \Sabre\AbstractDAVServerTestCase { /** * The assumption in these tests is that a PROPFIND is going on, and to diff --git a/tests/Sabre/DAV/TemporaryFileFilterTest.php b/tests/Sabre/DAV/TemporaryFileFilterTest.php index 95469141e5..5082a0f73f 100644 --- a/tests/Sabre/DAV/TemporaryFileFilterTest.php +++ b/tests/Sabre/DAV/TemporaryFileFilterTest.php @@ -6,7 +6,7 @@ use Sabre\HTTP; -class TemporaryFileFilterTest extends AbstractServer +class TemporaryFileFilterTest extends AbstractServerTestCase { public function setup(): void { diff --git a/tests/Sabre/DAV/Xml/XmlTest.php b/tests/Sabre/DAV/Xml/AbstractXmlTestCase.php similarity index 92% rename from tests/Sabre/DAV/Xml/XmlTest.php rename to tests/Sabre/DAV/Xml/AbstractXmlTestCase.php index c556767adf..d44fff59a5 100644 --- a/tests/Sabre/DAV/Xml/XmlTest.php +++ b/tests/Sabre/DAV/Xml/AbstractXmlTestCase.php @@ -4,10 +4,11 @@ namespace Sabre\DAV\Xml; +use PHPUnit\Framework\TestCase; use Sabre\Xml\Reader; use Sabre\Xml\Writer; -abstract class XmlTest extends \PHPUnit\Framework\TestCase +abstract class AbstractXmlTestCase extends TestCase { protected $elementMap = []; protected $namespaceMap = ['DAV:' => 'd']; diff --git a/tests/Sabre/DAV/Xml/Element/PropTest.php b/tests/Sabre/DAV/Xml/Element/PropTestAbstract.php similarity index 96% rename from tests/Sabre/DAV/Xml/Element/PropTest.php rename to tests/Sabre/DAV/Xml/Element/PropTestAbstract.php index 91bd2a92cb..b180b5e175 100644 --- a/tests/Sabre/DAV/Xml/Element/PropTest.php +++ b/tests/Sabre/DAV/Xml/Element/PropTestAbstract.php @@ -4,11 +4,11 @@ namespace Sabre\DAV\Xml\Element; +use Sabre\DAV\Xml\AbstractXmlTestCase; use Sabre\DAV\Xml\Property\Complex; use Sabre\DAV\Xml\Property\Href; -use Sabre\DAV\Xml\XmlTest; -class PropTest extends XmlTest +class PropTestAbstract extends AbstractXmlTestCase { public function testDeserializeSimple() { diff --git a/tests/Sabre/DAV/Xml/Element/ResponseTest.php b/tests/Sabre/DAV/Xml/Element/ResponseTestAbstract.php similarity index 99% rename from tests/Sabre/DAV/Xml/Element/ResponseTest.php rename to tests/Sabre/DAV/Xml/Element/ResponseTestAbstract.php index 0950acce61..28d6c6f92c 100644 --- a/tests/Sabre/DAV/Xml/Element/ResponseTest.php +++ b/tests/Sabre/DAV/Xml/Element/ResponseTestAbstract.php @@ -6,7 +6,7 @@ use Sabre\DAV; -class ResponseTest extends DAV\Xml\XmlTest +class ResponseTestAbstract extends DAV\Xml\AbstractXmlTestCase { public function testSimple() { diff --git a/tests/Sabre/DAV/Xml/Element/ShareeTest.php b/tests/Sabre/DAV/Xml/Element/ShareeTestAbstract.php similarity index 95% rename from tests/Sabre/DAV/Xml/Element/ShareeTest.php rename to tests/Sabre/DAV/Xml/Element/ShareeTestAbstract.php index 22c21d5897..3676d73d8c 100644 --- a/tests/Sabre/DAV/Xml/Element/ShareeTest.php +++ b/tests/Sabre/DAV/Xml/Element/ShareeTestAbstract.php @@ -5,9 +5,9 @@ namespace Sabre\DAV\Xml\Element; use Sabre\DAV\Sharing\Plugin; -use Sabre\DAV\Xml\XmlTest; +use Sabre\DAV\Xml\AbstractXmlTestCase; -class ShareeTest extends XmlTest +class ShareeTestAbstract extends AbstractXmlTestCase { public function testShareeUnknownPropertyInConstructor() { diff --git a/tests/Sabre/DAV/Xml/Property/HrefTest.php b/tests/Sabre/DAV/Xml/Property/HrefTestAbstract.php similarity index 96% rename from tests/Sabre/DAV/Xml/Property/HrefTest.php rename to tests/Sabre/DAV/Xml/Property/HrefTestAbstract.php index b2c9ac8b75..6b56dfbcbd 100644 --- a/tests/Sabre/DAV/Xml/Property/HrefTest.php +++ b/tests/Sabre/DAV/Xml/Property/HrefTestAbstract.php @@ -5,9 +5,9 @@ namespace Sabre\DAV\Xml\Property; use Sabre\DAV\Browser\HtmlOutputHelper; -use Sabre\DAV\Xml\XmlTest; +use Sabre\DAV\Xml\AbstractXmlTestCase; -class HrefTest extends XmlTest +class HrefTestAbstract extends AbstractXmlTestCase { public function testConstruct() { diff --git a/tests/Sabre/DAV/Xml/Property/InviteTest.php b/tests/Sabre/DAV/Xml/Property/InviteTestAbstract.php similarity index 95% rename from tests/Sabre/DAV/Xml/Property/InviteTest.php rename to tests/Sabre/DAV/Xml/Property/InviteTestAbstract.php index 0a18649bcb..8a949d4f30 100644 --- a/tests/Sabre/DAV/Xml/Property/InviteTest.php +++ b/tests/Sabre/DAV/Xml/Property/InviteTestAbstract.php @@ -5,10 +5,10 @@ namespace Sabre\DAV\Xml\Property; use Sabre\DAV\Sharing\Plugin; +use Sabre\DAV\Xml\AbstractXmlTestCase; use Sabre\DAV\Xml\Element\Sharee; -use Sabre\DAV\Xml\XmlTest; -class InviteTest extends XmlTest +class InviteTestAbstract extends AbstractXmlTestCase { public function testSerialize() { diff --git a/tests/Sabre/DAV/Xml/Property/LastModifiedTest.php b/tests/Sabre/DAV/Xml/Property/LastModifiedTestAbstract.php similarity index 94% rename from tests/Sabre/DAV/Xml/Property/LastModifiedTest.php rename to tests/Sabre/DAV/Xml/Property/LastModifiedTestAbstract.php index 4fda0771a3..c853e64d04 100644 --- a/tests/Sabre/DAV/Xml/Property/LastModifiedTest.php +++ b/tests/Sabre/DAV/Xml/Property/LastModifiedTestAbstract.php @@ -6,9 +6,9 @@ use DateTime; use DateTimeZone; -use Sabre\DAV\Xml\XmlTest; +use Sabre\DAV\Xml\AbstractXmlTestCase; -class LastModifiedTest extends XmlTest +class LastModifiedTestAbstract extends AbstractXmlTestCase { public function testSerializeDateTime() { diff --git a/tests/Sabre/DAV/Xml/Property/LocalHrefTest.php b/tests/Sabre/DAV/Xml/Property/LocalHrefTestAbstract.php similarity index 94% rename from tests/Sabre/DAV/Xml/Property/LocalHrefTest.php rename to tests/Sabre/DAV/Xml/Property/LocalHrefTestAbstract.php index 42a4017b83..6ec152b8c0 100644 --- a/tests/Sabre/DAV/Xml/Property/LocalHrefTest.php +++ b/tests/Sabre/DAV/Xml/Property/LocalHrefTestAbstract.php @@ -5,9 +5,9 @@ namespace Sabre\DAV\Xml\Property; use Sabre\DAV\Browser\HtmlOutputHelper; -use Sabre\DAV\Xml\XmlTest; +use Sabre\DAV\Xml\AbstractXmlTestCase; -class LocalHrefTest extends XmlTest +class LocalHrefTestAbstract extends AbstractXmlTestCase { public function testConstruct() { diff --git a/tests/Sabre/DAV/Xml/Property/LockDiscoveryTest.php b/tests/Sabre/DAV/Xml/Property/LockDiscoveryTestAbstract.php similarity index 97% rename from tests/Sabre/DAV/Xml/Property/LockDiscoveryTest.php rename to tests/Sabre/DAV/Xml/Property/LockDiscoveryTestAbstract.php index 1cc279e153..011407f254 100644 --- a/tests/Sabre/DAV/Xml/Property/LockDiscoveryTest.php +++ b/tests/Sabre/DAV/Xml/Property/LockDiscoveryTestAbstract.php @@ -5,9 +5,9 @@ namespace Sabre\DAV\Xml\Property; use Sabre\DAV\Locks\LockInfo; -use Sabre\DAV\Xml\XmlTest; +use Sabre\DAV\Xml\AbstractXmlTestCase; -class LockDiscoveryTest extends XmlTest +class LockDiscoveryTestAbstract extends AbstractXmlTestCase { public function testSerialize() { diff --git a/tests/Sabre/DAV/Xml/Property/ShareAccessTest.php b/tests/Sabre/DAV/Xml/Property/ShareAccessTestAbstract.php similarity index 97% rename from tests/Sabre/DAV/Xml/Property/ShareAccessTest.php rename to tests/Sabre/DAV/Xml/Property/ShareAccessTestAbstract.php index 716f5ecbd0..65c3e3ab15 100644 --- a/tests/Sabre/DAV/Xml/Property/ShareAccessTest.php +++ b/tests/Sabre/DAV/Xml/Property/ShareAccessTestAbstract.php @@ -5,9 +5,9 @@ namespace Sabre\DAV\Xml\Property; use Sabre\DAV\Sharing\Plugin; -use Sabre\DAV\Xml\XmlTest; +use Sabre\DAV\Xml\AbstractXmlTestCase; -class ShareAccessTest extends XmlTest +class ShareAccessTestAbstract extends AbstractXmlTestCase { public function testSerialize() { diff --git a/tests/Sabre/DAV/Xml/Property/SupportedMethodSetTest.php b/tests/Sabre/DAV/Xml/Property/SupportedMethodSetTestAbstract.php similarity index 90% rename from tests/Sabre/DAV/Xml/Property/SupportedMethodSetTest.php rename to tests/Sabre/DAV/Xml/Property/SupportedMethodSetTestAbstract.php index 2efedd2e8c..7df0dfd46d 100644 --- a/tests/Sabre/DAV/Xml/Property/SupportedMethodSetTest.php +++ b/tests/Sabre/DAV/Xml/Property/SupportedMethodSetTestAbstract.php @@ -4,9 +4,9 @@ namespace Sabre\DAV\Xml\Property; -use Sabre\DAV\Xml\XmlTest; +use Sabre\DAV\Xml\AbstractXmlTestCase; -class SupportedMethodSetTest extends XmlTest +class SupportedMethodSetTestAbstract extends AbstractXmlTestCase { public function testSimple() { diff --git a/tests/Sabre/DAV/Xml/Property/SupportedReportSetTest.php b/tests/Sabre/DAV/Xml/Property/SupportedReportSetTest.php index 18124f3c07..6200e48b20 100644 --- a/tests/Sabre/DAV/Xml/Property/SupportedReportSetTest.php +++ b/tests/Sabre/DAV/Xml/Property/SupportedReportSetTest.php @@ -7,7 +7,7 @@ use Sabre\DAV; use Sabre\HTTP; -class SupportedReportSetTest extends DAV\AbstractServer +class SupportedReportSetTest extends DAV\AbstractServerTestCase { public function sendPROPFIND($body) { diff --git a/tests/Sabre/DAV/Xml/Request/PropFindTest.php b/tests/Sabre/DAV/Xml/Request/PropFindTestAbstract.php similarity index 90% rename from tests/Sabre/DAV/Xml/Request/PropFindTest.php rename to tests/Sabre/DAV/Xml/Request/PropFindTestAbstract.php index 48e212f554..bbf9ce70ae 100644 --- a/tests/Sabre/DAV/Xml/Request/PropFindTest.php +++ b/tests/Sabre/DAV/Xml/Request/PropFindTestAbstract.php @@ -4,9 +4,9 @@ namespace Sabre\DAV\Xml\Request; -use Sabre\DAV\Xml\XmlTest; +use Sabre\DAV\Xml\AbstractXmlTestCase; -class PropFindTest extends XmlTest +class PropFindTestAbstract extends AbstractXmlTestCase { public function testDeserializeProp() { diff --git a/tests/Sabre/DAV/Xml/Request/PropPatchTest.php b/tests/Sabre/DAV/Xml/Request/PropPatchTestAbstract.php similarity index 91% rename from tests/Sabre/DAV/Xml/Request/PropPatchTest.php rename to tests/Sabre/DAV/Xml/Request/PropPatchTestAbstract.php index 674b76bd24..6e7355ffc7 100644 --- a/tests/Sabre/DAV/Xml/Request/PropPatchTest.php +++ b/tests/Sabre/DAV/Xml/Request/PropPatchTestAbstract.php @@ -4,10 +4,10 @@ namespace Sabre\DAV\Xml\Request; +use Sabre\DAV\Xml\AbstractXmlTestCase; use Sabre\DAV\Xml\Property\Href; -use Sabre\DAV\Xml\XmlTest; -class PropPatchTest extends XmlTest +class PropPatchTestAbstract extends AbstractXmlTestCase { public function testSerialize() { diff --git a/tests/Sabre/DAV/Xml/Request/ShareResourceTest.php b/tests/Sabre/DAV/Xml/Request/ShareResourceTestAbstract.php similarity index 94% rename from tests/Sabre/DAV/Xml/Request/ShareResourceTest.php rename to tests/Sabre/DAV/Xml/Request/ShareResourceTestAbstract.php index f089048cab..9f46237dba 100644 --- a/tests/Sabre/DAV/Xml/Request/ShareResourceTest.php +++ b/tests/Sabre/DAV/Xml/Request/ShareResourceTestAbstract.php @@ -5,10 +5,10 @@ namespace Sabre\DAV\Xml\Request; use Sabre\DAV\Sharing\Plugin; +use Sabre\DAV\Xml\AbstractXmlTestCase; use Sabre\DAV\Xml\Element\Sharee; -use Sabre\DAV\Xml\XmlTest; -class ShareResourceTest extends XmlTest +class ShareResourceTestAbstract extends AbstractXmlTestCase { public function testDeserialize() { diff --git a/tests/Sabre/DAV/Xml/Request/SyncCollectionTest.php b/tests/Sabre/DAV/Xml/Request/SyncCollectionTestAbstract.php similarity index 95% rename from tests/Sabre/DAV/Xml/Request/SyncCollectionTest.php rename to tests/Sabre/DAV/Xml/Request/SyncCollectionTestAbstract.php index 7cc2d3806e..47018e2d72 100644 --- a/tests/Sabre/DAV/Xml/Request/SyncCollectionTest.php +++ b/tests/Sabre/DAV/Xml/Request/SyncCollectionTestAbstract.php @@ -4,9 +4,9 @@ namespace Sabre\DAV\Xml\Request; -use Sabre\DAV\Xml\XmlTest; +use Sabre\DAV\Xml\AbstractXmlTestCase; -class SyncCollectionTest extends XmlTest +class SyncCollectionTestAbstract extends AbstractXmlTestCase { public function testDeserializeProp() { diff --git a/tests/Sabre/DAVACL/AclPrincipalPropSetReportTest.php b/tests/Sabre/DAVACL/AclPrincipalPropSetReportTestAbstract.php similarity index 94% rename from tests/Sabre/DAVACL/AclPrincipalPropSetReportTest.php rename to tests/Sabre/DAVACL/AclPrincipalPropSetReportTestAbstract.php index 03b621dc9e..576679a99c 100644 --- a/tests/Sabre/DAVACL/AclPrincipalPropSetReportTest.php +++ b/tests/Sabre/DAVACL/AclPrincipalPropSetReportTestAbstract.php @@ -6,7 +6,7 @@ use Sabre\HTTP\Request; -class AclPrincipalPropSetReportTest extends \Sabre\DAVServerTest +class AclPrincipalPropSetReportTestAbstract extends \Sabre\AbstractDAVServerTestCase { public $setupACL = true; public $autoLogin = 'admin'; diff --git a/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php b/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTestCase.php similarity index 88% rename from tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php rename to tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTestCase.php index 476a608c40..ac5af45aab 100644 --- a/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php +++ b/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTestCase.php @@ -4,9 +4,10 @@ namespace Sabre\DAVACL\PrincipalBackend; +use PHPUnit\Framework\TestCase; use Sabre\DAV; -abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase +abstract class AbstractPDOTestCase extends TestCase { use DAV\DbTestHelperTrait; @@ -23,17 +24,17 @@ public function setup(): void $pdo->query('INSERT INTO groupmembers (principal_id,member_id) VALUES (5,4)'); } - public function testConstruct() + public function testConstruct(): void { $pdo = $this->getPDO(); $backend = new PDO($pdo); - self::assertTrue($backend instanceof PDO); + self::assertInstanceOf(PDO::class, $backend); } /** * @depends testConstruct */ - public function testGetPrincipalsByPrefix() + public function testGetPrincipalsByPrefix(): void { $pdo = $this->getPDO(); $backend = new PDO($pdo); @@ -63,7 +64,7 @@ public function testGetPrincipalsByPrefix() /** * @depends testConstruct */ - public function testGetPrincipalByPath() + public function testGetPrincipalByPath(): void { $pdo = $this->getPDO(); $backend = new PDO($pdo); @@ -79,7 +80,7 @@ public function testGetPrincipalByPath() self::assertEquals(null, $backend->getPrincipalByPath('foo')); } - public function testGetGroupMemberSet() + public function testGetGroupMemberSet(): void { $pdo = $this->getPDO(); $backend = new PDO($pdo); @@ -88,7 +89,7 @@ public function testGetGroupMemberSet() self::assertEquals($expected, $backend->getGroupMemberSet('principals/group')); } - public function testGetGroupMembership() + public function testGetGroupMembership(): void { $pdo = $this->getPDO(); $backend = new PDO($pdo); @@ -97,7 +98,7 @@ public function testGetGroupMembership() self::assertEquals($expected, $backend->getGroupMembership('principals/user')); } - public function testSetGroupMemberSet() + public function testSetGroupMemberSet(): void { $pdo = $this->getPDO(); @@ -114,7 +115,7 @@ public function testSetGroupMemberSet() self::assertEquals(['principals/user'], $backend->getGroupMemberSet('principals/group')); } - public function testSearchPrincipals() + public function testSearchPrincipals(): void { $pdo = $this->getPDO(); @@ -133,7 +134,7 @@ public function testSearchPrincipals() self::assertEquals([], $result); } - public function testUpdatePrincipal() + public function testUpdatePrincipal(): void { $pdo = $this->getPDO(); $backend = new PDO($pdo); @@ -155,7 +156,7 @@ public function testUpdatePrincipal() ], $backend->getPrincipalByPath('principals/user')); } - public function testUpdatePrincipalUnknownField() + public function testUpdatePrincipalUnknownField(): void { $pdo = $this->getPDO(); $backend = new PDO($pdo); @@ -183,14 +184,14 @@ public function testUpdatePrincipalUnknownField() ], $backend->getPrincipalByPath('principals/user')); } - public function testFindByUriUnknownScheme() + public function testFindByUriUnknownScheme(): void { $pdo = $this->getPDO(); $backend = new PDO($pdo); self::assertNull($backend->findByUri('http://foo', 'principals')); } - public function testFindByUriWithMailtoAddress() + public function testFindByUriWithMailtoAddress(): void { $pdo = $this->getPDO(); $backend = new PDO($pdo); @@ -200,7 +201,7 @@ public function testFindByUriWithMailtoAddress() ); } - public function testFindByUriWithUri() + public function testFindByUriWithUri(): void { $pdo = $this->getPDO(); $backend = new PDO($pdo); @@ -210,7 +211,7 @@ public function testFindByUriWithUri() ); } - public function testFindByUriWithUnknownUri() + public function testFindByUriWithUnknownUri(): void { $pdo = $this->getPDO(); $backend = new PDO($pdo); diff --git a/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php b/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTestCase.php similarity index 68% rename from tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php rename to tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTestCase.php index 54795cf4d8..fe3b684fda 100644 --- a/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php +++ b/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTestCase.php @@ -4,7 +4,7 @@ namespace Sabre\DAVACL\PrincipalBackend; -class PDOMySQLTest extends AbstractPDOTest +class PDOMySQLTestCase extends AbstractPDOTestCase { public $driver = 'mysql'; } diff --git a/tests/Sabre/DAVACL/PrincipalBackend/PDOPgSqlTest.php b/tests/Sabre/DAVACL/PrincipalBackend/PDOPgSqlTestCase.php similarity index 68% rename from tests/Sabre/DAVACL/PrincipalBackend/PDOPgSqlTest.php rename to tests/Sabre/DAVACL/PrincipalBackend/PDOPgSqlTestCase.php index 7abc816ff1..6de140a1d3 100644 --- a/tests/Sabre/DAVACL/PrincipalBackend/PDOPgSqlTest.php +++ b/tests/Sabre/DAVACL/PrincipalBackend/PDOPgSqlTestCase.php @@ -4,7 +4,7 @@ namespace Sabre\DAVACL\PrincipalBackend; -class PDOPgSqlTest extends AbstractPDOTest +class PDOPgSqlTestCase extends AbstractPDOTestCase { public $driver = 'pgsql'; } diff --git a/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php b/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTestCase.php similarity index 67% rename from tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php rename to tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTestCase.php index 549e0bd60e..efc26a3aca 100644 --- a/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php +++ b/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTestCase.php @@ -4,7 +4,7 @@ namespace Sabre\DAVACL\PrincipalBackend; -class PDOSqliteTest extends AbstractPDOTest +class PDOSqliteTestCase extends AbstractPDOTestCase { public $driver = 'sqlite'; } diff --git a/tests/Sabre/DAVACL/PrincipalMatchTest.php b/tests/Sabre/DAVACL/PrincipalMatchTestAbstract.php similarity index 97% rename from tests/Sabre/DAVACL/PrincipalMatchTest.php rename to tests/Sabre/DAVACL/PrincipalMatchTestAbstract.php index b4515863d7..2a7bf7ab3c 100644 --- a/tests/Sabre/DAVACL/PrincipalMatchTest.php +++ b/tests/Sabre/DAVACL/PrincipalMatchTestAbstract.php @@ -6,7 +6,7 @@ use Sabre\HTTP\Request; -class PrincipalMatchTest extends \Sabre\DAVServerTest +class PrincipalMatchTestAbstract extends \Sabre\AbstractDAVServerTestCase { public $setupACL = true; public $autoLogin = 'user1'; diff --git a/tests/Sabre/DAVACL/Xml/Request/AclPrincipalPropSetReportTest.php b/tests/Sabre/DAVACL/Xml/Request/AclPrincipalPropSetReportTestAbstract.php similarity index 86% rename from tests/Sabre/DAVACL/Xml/Request/AclPrincipalPropSetReportTest.php rename to tests/Sabre/DAVACL/Xml/Request/AclPrincipalPropSetReportTestAbstract.php index de24d9aba6..72e753d019 100644 --- a/tests/Sabre/DAVACL/Xml/Request/AclPrincipalPropSetReportTest.php +++ b/tests/Sabre/DAVACL/Xml/Request/AclPrincipalPropSetReportTestAbstract.php @@ -4,7 +4,7 @@ namespace Sabre\DAVACL\Xml\Request; -class AclPrincipalPropSetReportTest extends \Sabre\DAV\Xml\XmlTest +class AclPrincipalPropSetReportTestAbstract extends \Sabre\DAV\Xml\AbstractXmlTestCase { protected $elementMap = [ '{DAV:}acl-principal-prop-set' => 'Sabre\DAVACL\Xml\Request\AclPrincipalPropSetReport', diff --git a/tests/Sabre/DAVACL/Xml/Request/PrincipalMatchReportTest.php b/tests/Sabre/DAVACL/Xml/Request/PrincipalMatchReportTestAbstract.php similarity index 93% rename from tests/Sabre/DAVACL/Xml/Request/PrincipalMatchReportTest.php rename to tests/Sabre/DAVACL/Xml/Request/PrincipalMatchReportTestAbstract.php index 209b21259c..e82d336dd0 100644 --- a/tests/Sabre/DAVACL/Xml/Request/PrincipalMatchReportTest.php +++ b/tests/Sabre/DAVACL/Xml/Request/PrincipalMatchReportTestAbstract.php @@ -4,7 +4,7 @@ namespace Sabre\DAVACL\Xml\Request; -class PrincipalMatchReportTest extends \Sabre\DAV\Xml\XmlTest +class PrincipalMatchReportTestAbstract extends \Sabre\DAV\Xml\AbstractXmlTestCase { protected $elementMap = [ '{DAV:}principal-match' => 'Sabre\DAVACL\Xml\Request\PrincipalMatchReport',