Fix unit tests

This commit is contained in:
Nicolas Le Goff
2013-12-24 15:25:00 +01:00
parent 1ac7a536f9
commit c10c78f740
56 changed files with 167 additions and 241 deletions

View File

@@ -42,9 +42,7 @@ class EmitterTest extends \PhraseanetTestCase
*/
public function testFromUser()
{
$user = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\User')
->disableOriginalConstructor()
->getMock();
$user = $this->createUserMock();
$user->expects($this->any())
->method('getDisplayName')
@@ -54,7 +52,7 @@ class EmitterTest extends \PhraseanetTestCase
->method('getEmail')
->will($this->returnValue($this->email));
$object = Emitter::fromUser($user, self::$DI['app']['translator']);
$object = Emitter::fromUser($user);
$this->assertEquals($this->email, $object->getEmail());
$this->assertEquals($this->name, $object->getName());
}
@@ -64,9 +62,7 @@ class EmitterTest extends \PhraseanetTestCase
*/
public function testFromUserFails()
{
$user = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\User')
->disableOriginalConstructor()
->getMock();
$user = $this->createUserMock();
$user->expects($this->any())
->method('getDisplayName')
@@ -77,7 +73,7 @@ class EmitterTest extends \PhraseanetTestCase
->will($this->returnValue('wrong email'));
try {
Emitter::fromUser($user, self::$DI['app']['translator']);
Emitter::fromUser($user);
$this->fail('Should have raised an exception');
} catch (InvalidArgumentException $e) {

View File

@@ -41,9 +41,7 @@ class MailInfoNewOrderTest extends MailTestCase
$this->getMessage()
);
$user = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\User')
->disableOriginalConstructor()
->getMock();
$user = $this->createUserMock();
$user->expects($this->any())
->method('getDisplayName')

View File

@@ -29,9 +29,7 @@ class MailInfoOrderCancelledTest extends MailTestCase
$this->getMessage()
);
$user = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\User')
->disableOriginalConstructor()
->getMock();
$user = $this->createUserMock();
$user->expects($this->any())
->method('getDisplayName')
@@ -74,9 +72,7 @@ class MailInfoOrderCancelledTest extends MailTestCase
$this->getMessage()
);
$user = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\User')
->disableOriginalConstructor()
->getMock();
$user = $this->createUserMock();
$user->expects($this->any())
->method('getDisplayName')

View File

@@ -53,9 +53,7 @@ class MailInfoOrderDeliveredTest extends MailTestCase
$this->getMessage()
);
$user = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\User')
->disableOriginalConstructor()
->getMock();
$user = $this->createUserMock();
$user->expects($this->any())
->method('getDisplayName')
@@ -88,9 +86,7 @@ class MailInfoOrderDeliveredTest extends MailTestCase
->method('getId')
->will($this->returnValue(42));
$user = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\User')
->disableOriginalConstructor()
->getMock();
$user = $this->createUserMock();
$user->expects($this->any())
->method('getDisplayName')

View File

@@ -28,9 +28,7 @@ class MailInfoPushReceivedTest extends MailWithLinkTestCase
$this->getExpiration()
);
$user = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\User')
->disableOriginalConstructor()
->getMock();
$user = $this->createUserMock();
$user->expects($this->any())
->method('getFirstName')
@@ -110,9 +108,7 @@ class MailInfoPushReceivedTest extends MailWithLinkTestCase
->method('getElements')
->will($this->returnValue($collection));
$user = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\User')
->disableOriginalConstructor()
->getMock();
$user = $this->createUserMock();
$user->expects($this->any())
->method('getDisplayName')

View File

@@ -46,9 +46,7 @@ class MailInfoUserRegisteredTest extends MailTestCase
$this->getMessage()
);
$user = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\User')
->disableOriginalConstructor()
->getMock();
$user = $this->createUserMock();
$user->expects($this->any())
->method('getFirstName')

View File

@@ -38,9 +38,7 @@ class MailInfoValidationDoneTest extends MailWithLinkTestCase
$this->getExpiration()
);
$user = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\User')
->disableOriginalConstructor()
->getMock();
$user = $this->createUserMock();
$user->expects($this->any())
->method('getDisplayName')
@@ -95,9 +93,7 @@ class MailInfoValidationDoneTest extends MailWithLinkTestCase
$this->getExpiration()
);
$user = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\User')
->disableOriginalConstructor()
->getMock();
$user = $this->createUserMock();
$user->expects($this->any())
->method('getDisplayName')

View File

@@ -47,9 +47,7 @@ class MailInfoValidationRequestTest extends MailWithLinkTestCase
$this->getExpiration()
);
$user = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\User')
->disableOriginalConstructor()
->getMock();
$user = $this->createUserMock();
$user->expects($this->any())
->method('getDisplayName')
@@ -81,9 +79,7 @@ class MailInfoValidationRequestTest extends MailWithLinkTestCase
$this->getExpiration()
);
$user = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\User')
->disableOriginalConstructor()
->getMock();
$user = $this->createUserMock();
$user->expects($this->any())
->method('getDisplayName')

View File

@@ -42,9 +42,7 @@ class ReceiverTest extends \PhraseanetTestCase
*/
public function testFromUser()
{
$user = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\User')
->disableOriginalConstructor()
->getMock();
$user = $this->createUserMock();
$user->expects($this->any())
->method('getDisplayName')
@@ -54,7 +52,7 @@ class ReceiverTest extends \PhraseanetTestCase
->method('getEmail')
->will($this->returnValue($this->email));
$object = Receiver::fromUser($user, self::$DI['app']['translator']);
$object = Receiver::fromUser($user);
$this->assertEquals($this->email, $object->getEmail());
$this->assertEquals($this->name, $object->getName());
}
@@ -64,9 +62,7 @@ class ReceiverTest extends \PhraseanetTestCase
*/
public function testFromUserFailed()
{
$user = $this->getMockBuilder('Alchemy\Phrasea\Model\Entities\User')
->disableOriginalConstructor()
->getMock();
$user = $this->createUserMock();
$user->expects($this->any())
->method('getDisplayName')
@@ -77,7 +73,7 @@ class ReceiverTest extends \PhraseanetTestCase
->will($this->returnValue('wrong user'));
try {
Receiver::fromUser($user, self::$DI['app']['translator']);
Receiver::fromUser($user);
$this->fail('Should have raised an exception');
} catch (InvalidArgumentException $e) {