diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2017-05-31 12:32:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-31 12:32:09 +0200 |
commit | 4423b88c5b2c2d530b0a83a822f521a61ca4d4b8 (patch) | |
tree | 26f8cf2ead0107ac74a7cd9eeb522f222eecbd53 /tests/Wallabag/ImportBundle/Import | |
parent | d61fd8be4ffdbba8d0fd02468075602a26dfde1a (diff) | |
parent | bad7df8c0048285e7a6bd539e5e501ce6675d663 (diff) | |
download | wallabag-4423b88c5b2c2d530b0a83a822f521a61ca4d4b8.tar.gz wallabag-4423b88c5b2c2d530b0a83a822f521a61ca4d4b8.tar.zst wallabag-4423b88c5b2c2d530b0a83a822f521a61ca4d4b8.zip |
Merge pull request #3168 from wallabag/instapaper-tags-import
Add support for tag in Instapaper import
Diffstat (limited to 'tests/Wallabag/ImportBundle/Import')
-rw-r--r-- | tests/Wallabag/ImportBundle/Import/InstapaperImportTest.php | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/tests/Wallabag/ImportBundle/Import/InstapaperImportTest.php b/tests/Wallabag/ImportBundle/Import/InstapaperImportTest.php index 6777a02e..9158c8a2 100644 --- a/tests/Wallabag/ImportBundle/Import/InstapaperImportTest.php +++ b/tests/Wallabag/ImportBundle/Import/InstapaperImportTest.php | |||
@@ -18,6 +18,7 @@ class InstapaperImportTest extends \PHPUnit_Framework_TestCase | |||
18 | protected $logHandler; | 18 | protected $logHandler; |
19 | protected $contentProxy; | 19 | protected $contentProxy; |
20 | protected $tagsAssigner; | 20 | protected $tagsAssigner; |
21 | protected $uow; | ||
21 | 22 | ||
22 | private function getInstapaperImport($unsetUser = false, $dispatched = 0) | 23 | private function getInstapaperImport($unsetUser = false, $dispatched = 0) |
23 | { | 24 | { |
@@ -27,6 +28,20 @@ class InstapaperImportTest extends \PHPUnit_Framework_TestCase | |||
27 | ->disableOriginalConstructor() | 28 | ->disableOriginalConstructor() |
28 | ->getMock(); | 29 | ->getMock(); |
29 | 30 | ||
31 | $this->uow = $this->getMockBuilder('Doctrine\ORM\UnitOfWork') | ||
32 | ->disableOriginalConstructor() | ||
33 | ->getMock(); | ||
34 | |||
35 | $this->em | ||
36 | ->expects($this->any()) | ||
37 | ->method('getUnitOfWork') | ||
38 | ->willReturn($this->uow); | ||
39 | |||
40 | $this->uow | ||
41 | ->expects($this->any()) | ||
42 | ->method('getScheduledEntityInsertions') | ||
43 | ->willReturn([]); | ||
44 | |||
30 | $this->contentProxy = $this->getMockBuilder('Wallabag\CoreBundle\Helper\ContentProxy') | 45 | $this->contentProxy = $this->getMockBuilder('Wallabag\CoreBundle\Helper\ContentProxy') |
31 | ->disableOriginalConstructor() | 46 | ->disableOriginalConstructor() |
32 | ->getMock(); | 47 | ->getMock(); |
@@ -67,14 +82,14 @@ class InstapaperImportTest extends \PHPUnit_Framework_TestCase | |||
67 | 82 | ||
68 | public function testImport() | 83 | public function testImport() |
69 | { | 84 | { |
70 | $instapaperImport = $this->getInstapaperImport(false, 3); | 85 | $instapaperImport = $this->getInstapaperImport(false, 4); |
71 | $instapaperImport->setFilepath(__DIR__.'/../fixtures/instapaper-export.csv'); | 86 | $instapaperImport->setFilepath(__DIR__.'/../fixtures/instapaper-export.csv'); |
72 | 87 | ||
73 | $entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository') | 88 | $entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository') |
74 | ->disableOriginalConstructor() | 89 | ->disableOriginalConstructor() |
75 | ->getMock(); | 90 | ->getMock(); |
76 | 91 | ||
77 | $entryRepo->expects($this->exactly(3)) | 92 | $entryRepo->expects($this->exactly(4)) |
78 | ->method('findByUrlAndUserId') | 93 | ->method('findByUrlAndUserId') |
79 | ->willReturn(false); | 94 | ->willReturn(false); |
80 | 95 | ||
@@ -88,14 +103,14 @@ class InstapaperImportTest extends \PHPUnit_Framework_TestCase | |||
88 | ->getMock(); | 103 | ->getMock(); |
89 | 104 | ||
90 | $this->contentProxy | 105 | $this->contentProxy |
91 | ->expects($this->exactly(3)) | 106 | ->expects($this->exactly(4)) |
92 | ->method('updateEntry') | 107 | ->method('updateEntry') |
93 | ->willReturn($entry); | 108 | ->willReturn($entry); |
94 | 109 | ||
95 | $res = $instapaperImport->import(); | 110 | $res = $instapaperImport->import(); |
96 | 111 | ||
97 | $this->assertTrue($res); | 112 | $this->assertTrue($res); |
98 | $this->assertEquals(['skipped' => 0, 'imported' => 3, 'queued' => 0], $instapaperImport->getSummary()); | 113 | $this->assertEquals(['skipped' => 0, 'imported' => 4, 'queued' => 0], $instapaperImport->getSummary()); |
99 | } | 114 | } |
100 | 115 | ||
101 | public function testImportAndMarkAllAsRead() | 116 | public function testImportAndMarkAllAsRead() |
@@ -107,9 +122,9 @@ class InstapaperImportTest extends \PHPUnit_Framework_TestCase | |||
107 | ->disableOriginalConstructor() | 122 | ->disableOriginalConstructor() |
108 | ->getMock(); | 123 | ->getMock(); |
109 | 124 | ||
110 | $entryRepo->expects($this->exactly(3)) | 125 | $entryRepo->expects($this->exactly(4)) |
111 | ->method('findByUrlAndUserId') | 126 | ->method('findByUrlAndUserId') |
112 | ->will($this->onConsecutiveCalls(false, true, true)); | 127 | ->will($this->onConsecutiveCalls(false, true, true, true)); |
113 | 128 | ||
114 | $this->em | 129 | $this->em |
115 | ->expects($this->any()) | 130 | ->expects($this->any()) |
@@ -133,7 +148,7 @@ class InstapaperImportTest extends \PHPUnit_Framework_TestCase | |||
133 | 148 | ||
134 | $this->assertTrue($res); | 149 | $this->assertTrue($res); |
135 | 150 | ||
136 | $this->assertEquals(['skipped' => 2, 'imported' => 1, 'queued' => 0], $instapaperImport->getSummary()); | 151 | $this->assertEquals(['skipped' => 3, 'imported' => 1, 'queued' => 0], $instapaperImport->getSummary()); |
137 | } | 152 | } |
138 | 153 | ||
139 | public function testImportWithRabbit() | 154 | public function testImportWithRabbit() |
@@ -165,7 +180,7 @@ class InstapaperImportTest extends \PHPUnit_Framework_TestCase | |||
165 | ->getMock(); | 180 | ->getMock(); |
166 | 181 | ||
167 | $producer | 182 | $producer |
168 | ->expects($this->exactly(3)) | 183 | ->expects($this->exactly(4)) |
169 | ->method('publish'); | 184 | ->method('publish'); |
170 | 185 | ||
171 | $instapaperImport->setProducer($producer); | 186 | $instapaperImport->setProducer($producer); |
@@ -173,7 +188,7 @@ class InstapaperImportTest extends \PHPUnit_Framework_TestCase | |||
173 | $res = $instapaperImport->setMarkAsRead(true)->import(); | 188 | $res = $instapaperImport->setMarkAsRead(true)->import(); |
174 | 189 | ||
175 | $this->assertTrue($res); | 190 | $this->assertTrue($res); |
176 | $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 3], $instapaperImport->getSummary()); | 191 | $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 4], $instapaperImport->getSummary()); |
177 | } | 192 | } |
178 | 193 | ||
179 | public function testImportWithRedis() | 194 | public function testImportWithRedis() |
@@ -211,7 +226,7 @@ class InstapaperImportTest extends \PHPUnit_Framework_TestCase | |||
211 | $res = $instapaperImport->setMarkAsRead(true)->import(); | 226 | $res = $instapaperImport->setMarkAsRead(true)->import(); |
212 | 227 | ||
213 | $this->assertTrue($res); | 228 | $this->assertTrue($res); |
214 | $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 3], $instapaperImport->getSummary()); | 229 | $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 4], $instapaperImport->getSummary()); |
215 | 230 | ||
216 | $this->assertNotEmpty($redisMock->lpop('instapaper')); | 231 | $this->assertNotEmpty($redisMock->lpop('instapaper')); |
217 | } | 232 | } |