Browse Source

General tests cleanup

1.0
Jakub Turek 10 years ago
parent
commit
a91060a16f
  1. 12
      tests/MageTest/Command/BuiltIn/CompileCommandTest.php
  2. 16
      tests/MageTest/Command/BuiltIn/ListCommandTest.php
  3. 1
      tests/MageTest/Command/BuiltIn/UnlockCommandTest.php

12
tests/MageTest/Command/BuiltIn/CompileCommandTest.php

@ -31,12 +31,6 @@ class CompileCommandTest extends BaseTest
*/
private $iniGetValue;
/**
* @var Mock
*/
private $iniGetMock;
/**
* @before
*/
@ -46,12 +40,12 @@ class CompileCommandTest extends BaseTest
$this->iniGetValue = new FixedValueFunction();
$mockBuilder = new MockBuilder();
$this->iniGetMock = $mockBuilder->setNamespace('Mage\Command\BuiltIn')
$iniGetMock = $mockBuilder->setNamespace('Mage\Command\BuiltIn')
->setName("ini_get")
->setCallableProvider($this->iniGetValue)
->build();
$this->iniGetMock->disable();
$this->iniGetMock->enable();
$iniGetMock->disable();
$iniGetMock->enable();
$this->setUpConsoleStatics();
}

16
tests/MageTest/Command/BuiltIn/ListCommandTest.php

@ -26,11 +26,6 @@ class ListCommandTest extends BaseTest
*/
private $listCommand;
/**
* @var Mock
*/
private $scandirMock;
/**
* @var FixedValueFunction
*/
@ -45,12 +40,12 @@ class ListCommandTest extends BaseTest
$this->scandirValueObj = new FixedValueFunction();
$mockBuilder = new MockBuilder();
$this->scandirMock = $mockBuilder->setNamespace('Mage\Command\BuiltIn')
$scandirMock = $mockBuilder->setNamespace('Mage\Command\BuiltIn')
->setName("scandir")
->setCallableProvider($this->scandirValueObj)
->build();
$this->scandirMock->disable();
$this->scandirMock->enable();
$scandirMock->disable();
$scandirMock->enable();
$this->setUpConsoleStatics();
}
@ -128,6 +123,11 @@ class ListCommandTest extends BaseTest
$this->assertEquals($expectedExitCode, $actualExitCode);
}
/**
* Stub Config::getArgument to return desired value
*
* @param String $argumentValue Input argument
*/
private function mockInputArgument($argumentValue)
{
$configMock = $this->getMock('Mage\Config');

1
tests/MageTest/Command/BuiltIn/UnlockCommandTest.php

@ -72,7 +72,6 @@ class UnlockCommandTest extends BaseTest
$unlinkMock->disable();
$getCwdMock->disable();
$fileExistsMock->enable();
$unlinkMock->enable();
$getCwdMock->enable();

Loading…
Cancel
Save