added doctrine testcases

Author: wachterjohannes

src/Entity/TaskRepository.php

@@ -9,16 +9,36 @@ class TaskRepository extends EntityRepository
     public function findScheduled()
     {
         $query = $this->createQueryBuilder('task')
-            ->where('completed = FALSE')
-            ->andWhere('executionDate < :date')
+            ->where('task.completed = :completed')
+            ->andWhere('task.executionDate < :date')
+            ->setParameter('completed', false)
             ->setParameter('date', new \DateTime())
             ->getQuery();
 
         return $query->getResult();
     }
 
+    /**
+     * @param string $uuid
+     *
+     * @return Task
+     */
     public function findByUuid($uuid)
     {
-        return $this->findBy(['uuid' => $uuid]);
+        $query = $this->createQueryBuilder('task')
+            ->where('task.uuid = :uuid')
+            ->setParameter('uuid', $uuid)
+            ->getQuery();
+
+        return $query->getSingleResult();
+    }
+
+    public function deleteAll()
+    {
+        $query = $this->_em->createQueryBuilder()
+            ->delete($this->_entityName, 'task')
+            ->getQuery();
+
+        $query->execute();
     }
 }

src/Resources/config/doctrine/Task.orm.xml

@@ -2,7 +2,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Task\TaskBundle\Entity\TaskContainer"
+    <entity name="Task\TaskBundle\Entity\Task"
             repository-class="Task\TaskBundle\Entity\TaskRepository"
             table="tasks">
 
@@ -11,7 +11,7 @@
         </id>
 
         <field name="task" type="object"/>
-        <field name="uuid" type="string" length="25"/>
+        <field name="uuid" type="string" length="100"/>
         <field name="executionDate" type="datetime"/>
         <field name="completed" type="boolean"/>
 

src/Resources/config/storage/doctrine.xml

@@ -3,8 +3,17 @@
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
+        <service id="task.storage.repository"
+                 class="Task\TaskBundle\Entity\TaskRepository"
+                 factory-service="doctrine.orm.entity_manager"
+                 factory-method="getRepository"
+                 public="false">
+            <argument type="string">TaskBundle:Task</argument>
+        </service>
+
         <service id="task.storage" class="Task\TaskBundle\Storage\DoctrineStorage">
             <argument type="service" id="doctrine.orm.entity_manager"/>
+            <argument type="service" id="task.storage.repository"/>
         </service>
     </services>
 </container>

src/Storage/DoctrineStorage.php

@@ -43,15 +43,25 @@ public function store(TaskInterface $task)
      */
     public function findScheduled()
     {
-        return $this->taskRepository->findScheduled();
+        return array_map(
+            function (TaskEntity $entity) {
+                return $entity->getTask();
+            },
+            $this->taskRepository->findScheduled()
+        );
     }
 
     /**
      * {@inheritdoc}
      */
     public function findAll()
     {
-        return $this->taskRepository->findAll();
+        return array_map(
+            function (TaskEntity $entity) {
+                return $entity->getTask();
+            },
+            $this->taskRepository->findAll()
+        );
     }
 
     /**
@@ -62,6 +72,16 @@ public function persist(TaskInterface $task)
         $entity = $this->taskRepository->findByUuid($task->getUuid());
         $this->setTask($entity, $task);
 
+        $this->entityManager->persist($entity);
+        $this->entityManager->flush();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function clear()
+    {
+        $this->taskRepository->deleteAll();
         $this->entityManager->flush();
     }
 

tests/Functional/BootstrapTest.php

@@ -5,6 +5,7 @@
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Task\SchedulerInterface;
 use Task\Storage\ArrayStorage;
+use Task\TaskBundle\Storage\DoctrineStorage;
 
 class BootstrapTest extends KernelTestCase
 {
@@ -21,6 +22,9 @@ public function testBootstrap()
             case 'array':
                 $this->assertInstanceOf(ArrayStorage::class, $storage);
                 break;
+            case 'doctrine':
+                $this->assertInstanceOf(DoctrineStorage::class, $storage);
+                break;
             default:
                 $this->fail('storage not supported');
                 break;

tests/Functional/SchedulerTest.php

@@ -32,16 +32,21 @@ protected function setUp()
 
     public function testSchedule()
     {
+        $this->storage->clear();
+
         $this->scheduler->schedule(new Task('test', 'workload'));
 
         $scheduled = $this->storage->findScheduled();
         $this->assertCount(1, $scheduled);
         $this->assertEquals('test', $scheduled[0]->getTaskName());
         $this->assertEquals('workload', $scheduled[0]->getWorkload());
+        $this->assertFalse($scheduled[0]->isCompleted());
     }
 
     public function testRun()
     {
+        $this->storage->clear();
+
         $this->scheduler->schedule(new Task('test', 'workload'));
         $this->scheduler->run();
 

tests/Unit/Storage/DoctrineStorageTest.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Unit\Storage;
+
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\Argument;
+use Task\TaskBundle\Entity\Task as TaskEntity;
+use Task\TaskBundle\Entity\TaskRepository;
+use Task\TaskBundle\Storage\DoctrineStorage;
+use Task\TaskInterface;
+
+class DoctrineStorageTest extends \PHPUnit_Framework_TestCase
+{
+    public function storeDataProvider()
+    {
+        return [
+            [new \DateTime(), true, '123-123-123'],
+            [new \DateTime(), true, '321-321-321'],
+            [new \DateTime('1 day ago'), true, '321-321-321'],
+            [new \DateTime(), false, '123-123-123'],
+        ];
+    }
+
+    /**
+     * @dataProvider storeDataProvider
+     */
+    public function testStore($date, $completed, $uuid)
+    {
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $repository = $this->prophesize(TaskRepository::class);
+
+        $storage = new DoctrineStorage($entityManager->reveal(), $repository->reveal());
+
+        $task = $this->prophesize(TaskInterface::class);
+        $task->getUuid()->willReturn($uuid);
+        $task->isCompleted()->willReturn($completed);
+        $task->getExecutionDate()->willReturn($date);
+
+        $storage->store($task->reveal());
+
+        $entityManager->persist(
+            Argument::that(
+                function (TaskEntity $entity) use ($date, $completed, $uuid) {
+                    $this->assertEquals($uuid, $entity->getUuid());
+                    $this->assertEquals($completed, $entity->isCompleted());
+                    $this->assertEquals($date, $entity->getExecutionDate());
+
+                    return true;
+                }
+            )
+        )->shouldBeCalledTimes(1);
+        $entityManager->flush()->shouldBeCalledTimes(1);
+    }
+}

tests/app/TestKernel.php

@@ -43,6 +43,9 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         $loader->load(sprintf('%s/config/config.%s.yml', __DIR__, $this->storage));
     }
 
+    /**
+     * {@inheritdoc}
+     */
     protected function buildContainer()
     {
         $container = parent::buildContainer();
@@ -53,6 +56,24 @@ protected function buildContainer()
 
         return $container;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function initializeContainer()
+    {
+        $fresh = false;
+
+        $container = $this->buildContainer();
+        $container->compile();
+
+        $this->container = $container;
+        $this->container->set('kernel', $this);
+
+        if (!$fresh && $this->container->has('cache_warmer')) {
+            $this->container->get('cache_warmer')->warmUp($this->container->getParameter('kernel.cache_dir'));
+        }
+    }
 }
 
 class TestHandler implements \Task\Handler\HandlerInterface