merge conflicts resolved

src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php

@@ -11,11 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\AccompanyingPeriod;
 
+use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Symfony\Component\HttpFoundation\Request;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 /**
  * @internal
@@ -42,7 +43,7 @@ final class AccompanyingPeriodConfidentialTest extends WebTestCase
         ]);
     }
 
-    public function dataGenerateRandomAccompanyingCourse()
+    public function testConfidentialInvalid()
     {
         // Disabling this dataprovider to avoid having errors while running the test.
         return yield from [];
@@ -88,10 +89,7 @@ final class AccompanyingPeriodConfidentialTest extends WebTestCase
         }
     }
 
-    /**
-     * @dataProvider dataGenerateRandomAccompanyingCourse
-     */
-    public function testRemoveUserWhenConfidential(int $periodId)
+    public function testConfidentialValid()
     {
         $this->markTestIncomplete(
             'Marked as incomplete because of a problem in the dataprovider, at line 81.'
@@ -101,8 +99,7 @@ final class AccompanyingPeriodConfidentialTest extends WebTestCase
             ->find($periodId);
         $em = self::$kernel->getContainer()->get('doctrine.orm.entity_manager');
 
-        $isConfidential = $period->isConfidential();
-        $step = $period->getStep();
+        $violations = self::$validator->validate($period, null, ['confirmed']);
 
         $initialUser = $period->getUser();