Skip to content

Phpunit 5 6 #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
individual-it merged 3 commits into from
Apr 2, 2019
Merged

Phpunit 5 6 #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34317cc
Updating bamarni/composer-bin-plugin (v1.2.0 => v1.3.0)
phil-davis Apr 2, 2019
f243479
Adjust PHPUnit Framework namespace for PHPUnit6
phil-davis Apr 2, 2019
ccd4b51
phpunit enable failOnRisky failOnWarning
phil-davis Apr 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions phpunit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<phpunit bootstrap="../../tests/bootstrap.php"
verbose="true"
failOnRisky="true"
failOnWarning="true"
timeoutForSmallTests="900"
timeoutForMediumTests="900"
timeoutForLargeTests="900"
Expand Down
18 changes: 9 additions & 9 deletions tests/lib/configtest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
* @package OCA\FirstRunWizard\Tests
*/
class ConfigTest extends \PHPUnit_Framework_TestCase {
class ConfigTest extends \PHPUnit\Framework\TestCase {

/**
* @param bool $isUserAvailable
Expand All @@ -22,12 +22,12 @@ class ConfigTest extends \PHPUnit_Framework_TestCase {
*/
public function testEnable($isUserAvailable) {
/**
* @var IConfig | \PHPUnit_Framework_MockObject_MockObject $config
* @var IConfig | \PHPUnit\Framework\MockObject\MockObject $config
*/
$config = $this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()->getMock();
/**
* @var IUserSession | \PHPUnit_Framework_MockObject_MockObject $userSession
* @var IUserSession | \PHPUnit\Framework\MockObject\MockObject $userSession
*/
$userSession = $this->getMockBuilder('\OCP\IUserSession')
->disableOriginalConstructor()->getMock();
Expand Down Expand Up @@ -72,12 +72,12 @@ public function testEnable($isUserAvailable) {
*/
public function testDisable($isUserAvailable) {
/**
* @var IConfig | \PHPUnit_Framework_MockObject_MockObject $config
* @var IConfig | \PHPUnit\Framework\MockObject\MockObject $config
*/
$config = $this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()->getMock();
/**
* @var IUserSession | \PHPUnit_Framework_MockObject_MockObject $userSession
* @var IUserSession | \PHPUnit\Framework\MockObject\MockObject $userSession
*/
$userSession = $this->getMockBuilder('\OCP\IUserSession')
->disableOriginalConstructor()->getMock();
Expand Down Expand Up @@ -132,12 +132,12 @@ public function enableDisableData() {
*/
public function testIsEnabled($isEnabled) {
/**
* @var IConfig | \PHPUnit_Framework_MockObject_MockObject $config
* @var IConfig | \PHPUnit\Framework\MockObject\MockObject $config
*/
$config = $this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()->getMock();
/**
* @var IUserSession | \PHPUnit_Framework_MockObject_MockObject $userSession
* @var IUserSession | \PHPUnit\Framework\MockObject\MockObject $userSession
*/
$userSession = $this->getMockBuilder('\OCP\IUserSession')
->disableOriginalConstructor()->getMock();
Expand Down Expand Up @@ -215,7 +215,7 @@ public function testResetAllUsers() {
$users[] = $this->getMockBuilder('\OCP\IUser')
->disableOriginalConstructor()->getMock();
/**
* @var IConfig | \PHPUnit_Framework_MockObject_MockObject $config
* @var IConfig | \PHPUnit\Framework\MockObject\MockObject $config
*/
$config = $this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()->getMock();
Expand All @@ -225,7 +225,7 @@ public function testResetAllUsers() {
$config->expects($this->exactly(\count($users)))
->method('setUserValue');
/**
* @var IUserSession | \PHPUnit_Framework_MockObject_MockObject $userSession
* @var IUserSession | \PHPUnit\Framework\MockObject\MockObject $userSession
*/
$userSession = $this->getMockBuilder('\OCP\IUserSession')
->disableOriginalConstructor()->getMock();
Expand Down
6 changes: 3 additions & 3 deletions tests/lib/utiltest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use OCP\Defaults;
use OCP\IConfig;

class UtilTest extends \PHPUnit_Framework_TestCase {
class UtilTest extends \PHPUnit\Framework\TestCase {

/**
* same code as in core: tests/lib/UtilTest.php
Expand All @@ -24,10 +24,10 @@ public function testGetSyncClientUrls($configValues, $defaultValues) {
/** @var IAppManager $appManager */
$appManager = $this->getMockBuilder('\OCP\App\IAppManager')
->disableOriginalConstructor()->getMock();
/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject $config */
/** @var IConfig | \PHPUnit\Framework\MockObject\MockObject $config */
$config = $this->getMockBuilder('\OCP\IConfig')
->disableOriginalConstructor()->getMock();
/** @var Defaults | \PHPUnit_Framework_MockObject_MockObject $defaults */
/** @var Defaults | \PHPUnit\Framework\MockObject\MockObject $defaults */
$defaults = $this->getMockBuilder('\OCP\Defaults')
->disableOriginalConstructor()->getMock();

Expand Down