mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-15 21:41:06 +00:00
Added test for deduplication
This commit is contained in:
parent
c613df0e25
commit
d09fe4d233
4 changed files with 67 additions and 3 deletions
|
@ -392,4 +392,23 @@ class EntryRepository extends EntityRepository
|
||||||
|
|
||||||
return $qb->getQuery()->getArrayResult();
|
return $qb->getQuery()->getArrayResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find all entries by url and owner.
|
||||||
|
*
|
||||||
|
* @param $url
|
||||||
|
* @param $userId
|
||||||
|
*
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function findAllByUrlAndUserId($url, $userId)
|
||||||
|
{
|
||||||
|
$res = $this->createQueryBuilder('e')
|
||||||
|
->where('e.url = :url')->setParameter('url', urldecode($url))
|
||||||
|
->andWhere('e.user = :user_id')->setParameter('user_id', $userId)
|
||||||
|
->getQuery()
|
||||||
|
->getResult();
|
||||||
|
|
||||||
|
return $res;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,10 +6,11 @@ use Symfony\Bundle\FrameworkBundle\Console\Application;
|
||||||
use Symfony\Component\Console\Tester\CommandTester;
|
use Symfony\Component\Console\Tester\CommandTester;
|
||||||
use Wallabag\CoreBundle\Command\CleanDuplicatesCommand;
|
use Wallabag\CoreBundle\Command\CleanDuplicatesCommand;
|
||||||
use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
|
use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
|
||||||
|
use Wallabag\CoreBundle\Entity\Entry;
|
||||||
|
|
||||||
class CleanDuplicatesCommandTest extends WallabagCoreTestCase
|
class CleanDuplicatesCommandTest extends WallabagCoreTestCase
|
||||||
{
|
{
|
||||||
public function testRunTagAllCommandForAll()
|
public function testTagAll()
|
||||||
{
|
{
|
||||||
$application = new Application($this->getClient()->getKernel());
|
$application = new Application($this->getClient()->getKernel());
|
||||||
$application->add(new CleanDuplicatesCommand());
|
$application->add(new CleanDuplicatesCommand());
|
||||||
|
@ -56,4 +57,48 @@ class CleanDuplicatesCommandTest extends WallabagCoreTestCase
|
||||||
|
|
||||||
$this->assertContains('Cleaned 0 duplicates for user admin', $tester->getDisplay());
|
$this->assertContains('Cleaned 0 duplicates for user admin', $tester->getDisplay());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testDuplicate()
|
||||||
|
{
|
||||||
|
$url = 'http://www.lemonde.fr/sport/visuel/2017/05/05/rondelle-prison-blanchissage-comprendre-le-hockey-sur-glace_5122587_3242.html';
|
||||||
|
$client = $this->getClient();
|
||||||
|
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
|
||||||
|
|
||||||
|
$this->logInAs('admin');
|
||||||
|
|
||||||
|
$nbEntries = $em->getRepository('WallabagCoreBundle:Entry')->findAllByUrlAndUserId($url, $this->getLoggedInUserId());
|
||||||
|
$this->assertCount(0, $nbEntries);
|
||||||
|
|
||||||
|
$user = $em->getRepository('WallabagUserBundle:User')->findOneById($this->getLoggedInUserId());
|
||||||
|
|
||||||
|
$entry1 = new Entry($user);
|
||||||
|
$entry1->setUrl($url);
|
||||||
|
|
||||||
|
$entry2 = new Entry($user);
|
||||||
|
$entry2->setUrl($url);
|
||||||
|
|
||||||
|
$em->persist($entry1);
|
||||||
|
$em->persist($entry2);
|
||||||
|
|
||||||
|
$em->flush();
|
||||||
|
|
||||||
|
$nbEntries = $em->getRepository('WallabagCoreBundle:Entry')->findAllByUrlAndUserId($url, $this->getLoggedInUserId());
|
||||||
|
$this->assertCount(2, $nbEntries);
|
||||||
|
|
||||||
|
$application = new Application($this->getClient()->getKernel());
|
||||||
|
$application->add(new CleanDuplicatesCommand());
|
||||||
|
|
||||||
|
$command = $application->find('wallabag:clean-duplicates');
|
||||||
|
|
||||||
|
$tester = new CommandTester($command);
|
||||||
|
$tester->execute([
|
||||||
|
'command' => $command->getName(),
|
||||||
|
'username' => 'admin',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertContains('Cleaned 1 duplicates for user admin', $tester->getDisplay());
|
||||||
|
|
||||||
|
$nbEntries = $em->getRepository('WallabagCoreBundle:Entry')->findAllByUrlAndUserId($url, $this->getLoggedInUserId());
|
||||||
|
$this->assertCount(1, $nbEntries);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,7 +70,7 @@ class ExportCommandTest extends WallabagCoreTestCase
|
||||||
$tester->execute([
|
$tester->execute([
|
||||||
'command' => $command->getName(),
|
'command' => $command->getName(),
|
||||||
'username' => 'admin',
|
'username' => 'admin',
|
||||||
'filepath' => 'specialexport.json'
|
'filepath' => 'specialexport.json',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->assertFileExists('specialexport.json');
|
$this->assertFileExists('specialexport.json');
|
||||||
|
|
Loading…
Reference in a new issue