Rewrote code & fix tests

This commit is contained in:
Jeremy Benoist
2017-06-01 11:31:45 +02:00
parent 843182c7cf
commit 6acadf8e98
11 changed files with 71 additions and 101 deletions

View File

@ -89,7 +89,7 @@ class ChromeImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->exactly(1))
->method('importEntry')
->method('updateEntry')
->willReturn($entry);
$res = $chromeImport->import();
@ -118,7 +118,7 @@ class ChromeImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->exactly(1))
->method('importEntry')
->method('updateEntry')
->willReturn(new Entry($this->user));
// check that every entry persisted are archived
@ -158,7 +158,7 @@ class ChromeImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->never())
->method('importEntry');
->method('updateEntry');
$producer = $this->getMockBuilder('OldSound\RabbitMqBundle\RabbitMq\Producer')
->disableOriginalConstructor()
@ -198,7 +198,7 @@ class ChromeImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->never())
->method('importEntry');
->method('updateEntry');
$factory = new RedisMockFactory();
$redisMock = $factory->getAdapter('Predis\Client', true);

View File

@ -89,7 +89,7 @@ class FirefoxImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->exactly(2))
->method('importEntry')
->method('updateEntry')
->willReturn($entry);
$res = $firefoxImport->import();
@ -118,7 +118,7 @@ class FirefoxImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->exactly(1))
->method('importEntry')
->method('updateEntry')
->willReturn(new Entry($this->user));
// check that every entry persisted are archived
@ -158,7 +158,7 @@ class FirefoxImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->never())
->method('importEntry');
->method('updateEntry');
$producer = $this->getMockBuilder('OldSound\RabbitMqBundle\RabbitMq\Producer')
->disableOriginalConstructor()
@ -198,7 +198,7 @@ class FirefoxImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->never())
->method('importEntry');
->method('updateEntry');
$factory = new RedisMockFactory();
$redisMock = $factory->getAdapter('Predis\Client', true);

View File

@ -104,7 +104,7 @@ class InstapaperImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->exactly(4))
->method('importEntry')
->method('updateEntry')
->willReturn($entry);
$res = $instapaperImport->import();
@ -133,7 +133,7 @@ class InstapaperImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->once())
->method('importEntry')
->method('updateEntry')
->willReturn(new Entry($this->user));
// check that every entry persisted are archived
@ -173,7 +173,7 @@ class InstapaperImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->never())
->method('importEntry');
->method('updateEntry');
$producer = $this->getMockBuilder('OldSound\RabbitMqBundle\RabbitMq\Producer')
->disableOriginalConstructor()
@ -213,7 +213,7 @@ class InstapaperImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->never())
->method('importEntry');
->method('updateEntry');
$factory = new RedisMockFactory();
$redisMock = $factory->getAdapter('Predis\Client', true);

View File

@ -282,7 +282,7 @@ class PocketImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->once())
->method('importEntry')
->method('updateEntry')
->willReturn($entry);
$pocketImport->setClient($client);
@ -377,7 +377,7 @@ class PocketImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->exactly(2))
->method('importEntry')
->method('updateEntry')
->willReturn($entry);
$pocketImport->setClient($client);
@ -450,7 +450,7 @@ JSON;
$this->contentProxy
->expects($this->never())
->method('importEntry');
->method('updateEntry');
$producer = $this->getMockBuilder('OldSound\RabbitMqBundle\RabbitMq\Producer')
->disableOriginalConstructor()
@ -536,7 +536,7 @@ JSON;
$this->contentProxy
->expects($this->never())
->method('ImportEntry');
->method('updateEntry');
$factory = new RedisMockFactory();
$redisMock = $factory->getAdapter('Predis\Client', true);
@ -621,7 +621,7 @@ JSON;
$this->contentProxy
->expects($this->once())
->method('importEntry')
->method('updateEntry')
->will($this->throwException(new \Exception()));
$pocketImport->setClient($client);

View File

@ -89,7 +89,7 @@ class ReadabilityImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->exactly(3))
->method('importEntry')
->method('updateEntry')
->willReturn($entry);
$res = $readabilityImport->import();
@ -118,7 +118,7 @@ class ReadabilityImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->exactly(1))
->method('importEntry')
->method('updateEntry')
->willReturn(new Entry($this->user));
// check that every entry persisted are archived
@ -158,7 +158,7 @@ class ReadabilityImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->never())
->method('importEntry');
->method('updateEntry');
$producer = $this->getMockBuilder('OldSound\RabbitMqBundle\RabbitMq\Producer')
->disableOriginalConstructor()
@ -198,7 +198,7 @@ class ReadabilityImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->never())
->method('importEntry');
->method('updateEntry');
$factory = new RedisMockFactory();
$redisMock = $factory->getAdapter('Predis\Client', true);

View File

@ -113,7 +113,7 @@ class WallabagV1ImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->exactly(1))
->method('importEntry')
->method('updateEntry')
->willReturn($entry);
$res = $wallabagV1Import->import();
@ -142,7 +142,7 @@ class WallabagV1ImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->exactly(3))
->method('importEntry')
->method('updateEntry')
->willReturn(new Entry($this->user));
// check that every entry persisted are archived
@ -182,7 +182,7 @@ class WallabagV1ImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->never())
->method('importEntry');
->method('updateEntry');
$producer = $this->getMockBuilder('OldSound\RabbitMqBundle\RabbitMq\Producer')
->disableOriginalConstructor()
@ -222,7 +222,7 @@ class WallabagV1ImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->never())
->method('importEntry');
->method('updateEntry');
$factory = new RedisMockFactory();
$redisMock = $factory->getAdapter('Predis\Client', true);

View File

@ -100,7 +100,7 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->exactly(2))
->method('importEntry')
->method('updateEntry')
->willReturn(new Entry($this->user));
$res = $wallabagV2Import->import();
@ -129,7 +129,7 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->exactly(2))
->method('importEntry')
->method('updateEntry')
->willReturn(new Entry($this->user));
// check that every entry persisted are archived
@ -165,7 +165,7 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->never())
->method('importEntry');
->method('updateEntry');
$producer = $this->getMockBuilder('OldSound\RabbitMqBundle\RabbitMq\Producer')
->disableOriginalConstructor()
@ -201,7 +201,7 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->never())
->method('importEntry');
->method('updateEntry');
$factory = new RedisMockFactory();
$redisMock = $factory->getAdapter('Predis\Client', true);
@ -278,7 +278,7 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
$this->contentProxy
->expects($this->exactly(2))
->method('importEntry')
->method('updateEntry')
->will($this->throwException(new \Exception()));
$res = $wallabagV2Import->import();