diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-09-28 16:29:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-28 16:29:09 +0200 |
| commit | 19f94ac5f9d08b958602ab07848a5c22d183b027 (patch) | |
| tree | 7004a4a9da3b88d66f94b5252af58316c61b91d0 /tests/lib | |
| parent | 32640c9a5b1a2b6f09511b42b71a8320d28279ce (diff) | |
| parent | 3b7f548b0f17e757810de97b2d098835fccd791b (diff) | |
| download | nextcloud-server-19f94ac5f9d08b958602ab07848a5c22d183b027.tar.gz nextcloud-server-19f94ac5f9d08b958602ab07848a5c22d183b027.zip | |
Merge pull request #1549 from nextcloud/kill-update-simulation
Kill update simulation
Diffstat (limited to 'tests/lib')
| -rw-r--r-- | tests/lib/UpdaterTest.php | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/tests/lib/UpdaterTest.php b/tests/lib/UpdaterTest.php index 0c67a3f7433..80c7c28cd68 100644 --- a/tests/lib/UpdaterTest.php +++ b/tests/lib/UpdaterTest.php @@ -27,25 +27,25 @@ use OCP\IConfig; use OCP\ILogger; use OC\IntegrityCheck\Checker; -class UpdaterTest extends \Test\TestCase { - /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ +class UpdaterTest extends TestCase { + /** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */ private $config; - /** @var ILogger */ + /** @var ILogger | \PHPUnit_Framework_MockObject_MockObject */ private $logger; /** @var Updater */ private $updater; - /** @var Checker */ + /** @var Checker | \PHPUnit_Framework_MockObject_MockObject */ private $checker; public function setUp() { parent::setUp(); - $this->config = $this->getMockBuilder('\\OCP\\IConfig') + $this->config = $this->getMockBuilder(IConfig::class) ->disableOriginalConstructor() ->getMock(); - $this->logger = $this->getMockBuilder('\\OCP\\ILogger') + $this->logger = $this->getMockBuilder(ILogger::class) ->disableOriginalConstructor() ->getMock(); - $this->checker = $this->getMockBuilder('\OC\IntegrityCheck\Checker') + $this->checker = $this->getMockBuilder(Checker::class) ->disableOriginalConstructor() ->getMock(); @@ -169,20 +169,6 @@ class UpdaterTest extends \Test\TestCase { $this->assertSame($result, $this->updater->isUpgradePossible($oldVersion, $newVersion, $allowedVersion)); } - public function testSetSimulateStepEnabled() { - $this->updater->setSimulateStepEnabled(true); - $this->assertSame(true, $this->invokePrivate($this->updater, 'simulateStepEnabled')); - $this->updater->setSimulateStepEnabled(false); - $this->assertSame(false, $this->invokePrivate($this->updater, 'simulateStepEnabled')); - } - - public function testSetUpdateStepEnabled() { - $this->updater->setUpdateStepEnabled(true); - $this->assertSame(true, $this->invokePrivate($this->updater, 'updateStepEnabled')); - $this->updater->setUpdateStepEnabled(false); - $this->assertSame(false, $this->invokePrivate($this->updater, 'updateStepEnabled')); - } - public function testSetSkip3rdPartyAppsDisable() { $this->updater->setSkip3rdPartyAppsDisable(true); $this->assertSame(true, $this->invokePrivate($this->updater, 'skip3rdPartyAppsDisable')); |