pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Rewrote code & fix tests

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
View File

@ -123,7 +123,7 @@ class TagControllerTest extends WallabagCoreTestCase
$this->assertEquals(302, $client->getResponse()->getStatusCode());
$this->assertEquals($entryUri, $client->getResponse()->getTargetUrl());
// re-retrieve the entry to be sure to get fresh data from database (mostly for tags)
// re-retrieve the entry to be sure to get fresh data from database (mostly for tags)
$entry = $this->getEntityManager()->getRepository(Entry::class)->find($entry->getId());
$this->assertNotContains($this->tagName, $entry->getTags());

37
tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
View File

@ -11,8 +11,6 @@ use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Helper\RuleBasedTagger;
use Graby\Graby;
use Monolog\Handler\TestHandler;
use Monolog\Logger;
class ContentProxyTest extends \PHPUnit_Framework_TestCase
{
@ -259,12 +257,13 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
->method('tag');
$logHandler = new TestHandler();
$logger = new Logger('test', array($logHandler));
$logger = new Logger('test', [$logHandler]);
$proxy = new ContentProxy((new Graby()), $tagger, $logger, $this->fetchingErrorMessage);
$entry = new Entry(new User());
$proxy->importEntry(
$proxy->updateEntry(
$entry,
'http://1.1.1.1',
[
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
@ -299,6 +298,7 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
$entry = new Entry(new User());
$proxy->updateEntry(
$entry,
'http://1.1.1.1',
[
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
@ -326,26 +326,24 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
public function testTaggerThrowException()
{
$graby = $this->getMockBuilder('Graby\Graby')
->disableOriginalConstructor()
->getMock();
$tagger = $this->getTaggerMock();
$tagger->expects($this->once())
->method('tag')
->will($this->throwException(new \Exception()));
$proxy = new ContentProxy($graby, $tagger, $this->getLogger(), $this->fetchingErrorMessage);
$proxy = new ContentProxy((new Graby()), $tagger, $this->getLogger(), $this->fetchingErrorMessage);
$entry = new Entry(new User());
$content = array(
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
'content_type' => 'text/html',
'language' => 'fr',
$proxy->updateEntry(
$entry,
'http://1.1.1.1',
[
'html' => str_repeat('this is my content', 325),
'title' => 'this is my title',
'url' => 'http://1.1.1.1',
'content_type' => 'text/html',
'language' => 'fr',
]
);
$proxy->importEntry($entry, $content, true);
$this->assertCount(0, $entry->getTags());
}
@ -374,8 +372,9 @@ class ContentProxyTest extends \PHPUnit_Framework_TestCase
->method('tag');
$proxy = new ContentProxy((new Graby()), $tagger, $this->getLogger(), $this->fetchingErrorMessage);
$entry = $proxy->updateEntry(
new Entry(new User()),
$entry = new Entry(new User());
$proxy->updateEntry(
$entry,
'http://1.1.1.1',
[
'html' => $html,

8
tests/Wallabag/ImportBundle/Import/ChromeImportTest.php
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);

8
tests/Wallabag/ImportBundle/Import/FirefoxImportTest.php
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);

8
tests/Wallabag/ImportBundle/Import/InstapaperImportTest.php
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);

10
tests/Wallabag/ImportBundle/Import/PocketImportTest.php
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);

8
tests/Wallabag/ImportBundle/Import/ReadabilityImportTest.php
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);

8
tests/Wallabag/ImportBundle/Import/WallabagV1ImportTest.php
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);

10
tests/Wallabag/ImportBundle/Import/WallabagV2ImportTest.php
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();