diff options
author | LEDfan <LEDfan@users.noreply.github.com> | 2018-02-08 16:11:15 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-08 16:11:15 +0300 |
commit | 104cd914973b5c4884eecf6936b2a088eb403b62 (patch) | |
tree | 0dad2289b7ec18557f87bdb8b6e93454de88063f /tests/unit | |
parent | b3ac678d3b02f022f8315ad8f7991c50c2365bdf (diff) |
Update Travis config for new Nextcloud versions (+ compatibility) (#86)
* Update travis configuration for new Nextcloud versions
- stable10 is EOL
- stable13 is released
- master/NC14 requires PHP 7 and supports PHP 7.1 and 7.2
- Update composer to install compatible version of phpunit with php + remove use of old class name
- Install any compatible version of php-cs-fixer
Diffstat (limited to 'tests/unit')
-rw-r--r-- | tests/unit/HooksTest.php | 4 | ||||
-rw-r--r-- | tests/unit/NewContentContainerTest.php | 5 | ||||
-rw-r--r-- | tests/unit/RosterPushTest.php | 4 | ||||
-rw-r--r-- | tests/unit/controller/HttpBindControllerTest.php | 4 | ||||
-rw-r--r-- | tests/unit/http/XMPPResponseTest.php | 7 | ||||
-rw-r--r-- | tests/unit/stanzahandlers/IQTest.php | 3 | ||||
-rw-r--r-- | tests/unit/stanzahandlers/MessageTest.php | 3 | ||||
-rw-r--r-- | tests/unit/stanzahandlers/PresenceTest.php | 3 |
8 files changed, 19 insertions, 14 deletions
diff --git a/tests/unit/HooksTest.php b/tests/unit/HooksTest.php index f8a6f90..d8616a8 100644 --- a/tests/unit/HooksTest.php +++ b/tests/unit/HooksTest.php @@ -9,9 +9,9 @@ use OCA\OJSXC\Db\StanzaMapper; use OCP\IUserManager; use OCP\IUserSession; use PHPUnit_Framework_MockObject_MockObject; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; -class HooksTest extends PHPUnit_Framework_TestCase +class HooksTest extends TestCase { /** diff --git a/tests/unit/NewContentContainerTest.php b/tests/unit/NewContentContainerTest.php index ded45c3..6ee637f 100644 --- a/tests/unit/NewContentContainerTest.php +++ b/tests/unit/NewContentContainerTest.php @@ -4,9 +4,10 @@ namespace OCA\OJSXC; use OCA\OJSXC\Db\Message; use OCA\OJSXC\Db\Stanza; -use PHPUnit_Framework_TestCase; +//use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; -class NewContentContainerTest extends PHPUnit_Framework_TestCase +class NewContentContainerTest extends TestCase { /** diff --git a/tests/unit/RosterPushTest.php b/tests/unit/RosterPushTest.php index 1021a9f..4c45914 100644 --- a/tests/unit/RosterPushTest.php +++ b/tests/unit/RosterPushTest.php @@ -7,9 +7,9 @@ use OCA\OJSXC\Db\IQRosterPushMapper; use OCP\IDBConnection; use OCP\IUserManager; use OCP\IUserSession; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; -class RosterPushTest extends PHPUnit_Framework_TestCase +class RosterPushTest extends TestCase { /** diff --git a/tests/unit/controller/HttpBindControllerTest.php b/tests/unit/controller/HttpBindControllerTest.php index c611292..6d08c75 100644 --- a/tests/unit/controller/HttpBindControllerTest.php +++ b/tests/unit/controller/HttpBindControllerTest.php @@ -9,11 +9,11 @@ use OCA\OJSXC\Http\XMPPResponse; use OCA\OJSXC\StanzaHandlers\IQ; use OCA\OJSXC\StanzaLogger; use OCP\AppFramework\Db\DoesNotExistException; -use PHPUnit_Framework_TestCase; +use PHPUnit\Framework\TestCase; use Sabre\Xml\Writer; use PHPUnit_Framework_MockObject_MockObject; -class HttpBindControllerTest extends PHPUnit_Framework_TestCase +class HttpBindControllerTest extends TestCase { /** diff --git a/tests/unit/http/XMPPResponseTest.php b/tests/unit/http/XMPPResponseTest.php index 2ec52b9..90878d9 100644 --- a/tests/unit/http/XMPPResponseTest.php +++ b/tests/unit/http/XMPPResponseTest.php @@ -12,9 +12,10 @@ namespace OCA\OJSXC\Http { use OCA\OJSXC\Db\Message; use OCA\OJSXC\Db\Stanza; + use PHPUnit\Framework\TestCase; use PHPUnit_Framework_TestCase; - class XMPPResponseTest extends PHPUnit_Framework_TestCase + class XMPPResponseTest extends TestCase { public function writingProvider() { @@ -51,8 +52,8 @@ namespace OCA\OJSXC\Http { } /** - * @dataProvider writingProvider - */ + * @dataProvider writingProvider + */ public function testWriting($stanzas, $expected) { $stanzaLogger = $this->getMockBuilder('OCA\OJSXC\StanzaLogger')->disableOriginalConstructor()->getMock(); diff --git a/tests/unit/stanzahandlers/IQTest.php b/tests/unit/stanzahandlers/IQTest.php index 50824bf..f093177 100644 --- a/tests/unit/stanzahandlers/IQTest.php +++ b/tests/unit/stanzahandlers/IQTest.php @@ -4,10 +4,11 @@ namespace OCA\OJSXC\StanzaHandlers; use OCA\OJSXC\Db\IQRoster; use OCP\IConfig; +use PHPUnit\Framework\TestCase; use PHPUnit_Framework_MockObject_MockObject; use PHPUnit_Framework_TestCase; -class IQTest extends PHPUnit_Framework_TestCase +class IQTest extends TestCase { /** diff --git a/tests/unit/stanzahandlers/MessageTest.php b/tests/unit/stanzahandlers/MessageTest.php index 01670d0..36eb31a 100644 --- a/tests/unit/stanzahandlers/MessageTest.php +++ b/tests/unit/stanzahandlers/MessageTest.php @@ -3,10 +3,11 @@ namespace OCA\OJSXC\StanzaHandlers; use OCA\OJSXC\Db\Message as MessageEntity; +use PHPUnit\Framework\TestCase; use PHPUnit_Framework_TestCase; use PHPUnit_Framework_MockObject_MockObject; -class MessageTest extends PHPUnit_Framework_TestCase +class MessageTest extends TestCase { /** diff --git a/tests/unit/stanzahandlers/PresenceTest.php b/tests/unit/stanzahandlers/PresenceTest.php index 1f24f35..f5c6cf9 100644 --- a/tests/unit/stanzahandlers/PresenceTest.php +++ b/tests/unit/stanzahandlers/PresenceTest.php @@ -4,10 +4,11 @@ namespace OCA\OJSXC\StanzaHandlers; use OCA\OJSXC\StanzaHandlers\Presence; use OCA\OJSXC\Db\Presence as PresenceEntity; +use PHPUnit\Framework\TestCase; use PHPUnit_Framework_MockObject_MockObject; use PHPUnit_Framework_TestCase; -class PresenceTest extends PHPUnit_Framework_TestCase +class PresenceTest extends TestCase { private $host; |