From c32ae320fec4135f5b32d57ef88349317a3b1f3f Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 13 Feb 2016 16:20:00 +0100
Subject: cs & tests for wllbg v1 import

---
 .../Tests/Import/WallabagV2ImportTest.php          | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php')

diff --git a/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php b/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php
index 3268cd3e..8728364b 100644
--- a/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php
+++ b/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php
@@ -72,6 +72,36 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(['skipped' => 1, 'imported' => 2], $wallabagV2Import->getSummary());
     }
 
+    public function testImportAndMarkAllAsRead()
+    {
+        $wallabagV2Import = $this->getWallabagV2Import();
+        $wallabagV2Import->setFilepath(__DIR__.'/../fixtures/wallabag-v2-read.json');
+
+        $entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $entryRepo->expects($this->exactly(2))
+            ->method('findByUrlAndUserId')
+            ->will($this->onConsecutiveCalls(false, false));
+
+        $this->em
+            ->expects($this->any())
+            ->method('getRepository')
+            ->willReturn($entryRepo);
+
+        $res = $wallabagV2Import->setMarkAsRead(true)->import();
+
+        $this->assertTrue($res);
+
+        $this->em
+            ->expects($this->any())
+            ->method('getBuilderForArchiveByUser')
+            ->willReturn($entryRepo);
+
+        $this->assertEquals(['skipped' => 0, 'imported' => 2], $wallabagV2Import->getSummary());
+    }
+
     public function testImportBadFile()
     {
         $wallabagV1Import = $this->getWallabagV2Import();
-- 
cgit v1.2.3


From 79d0e38e7ff975b2e0306d3dd96f57509fd84aef Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Fri, 4 Mar 2016 10:04:51 +0100
Subject: Adding test

Reformat json file (thanks pro.jsonlint.com)
---
 .../ImportBundle/Tests/Import/WallabagV2ImportTest.php      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php')

diff --git a/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php b/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php
index 8728364b..c461168c 100644
--- a/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php
+++ b/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php
@@ -90,15 +90,18 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
             ->method('getRepository')
             ->willReturn($entryRepo);
 
+        // check that every entry persisted are archived
+        $this->em
+            ->expects($this->any())
+            ->method('persist')
+            ->with($this->callback(function($persistedEntry) {
+                return $persistedEntry->isArchived();
+            }));
+
         $res = $wallabagV2Import->setMarkAsRead(true)->import();
 
         $this->assertTrue($res);
 
-        $this->em
-            ->expects($this->any())
-            ->method('getBuilderForArchiveByUser')
-            ->willReturn($entryRepo);
-
         $this->assertEquals(['skipped' => 0, 'imported' => 2], $wallabagV2Import->getSummary());
     }
 
-- 
cgit v1.2.3