From 4ba5f63b2e2aecf8f28740d2ed57d6950d1561da Mon Sep 17 00:00:00 2001
From: Julio <gugli100@gmail.com>
Date: Tue, 2 Nov 2021 15:15:17 +0100
Subject: [PATCH] Remove unused code + add tests.

---
 src/CoreBundle/Form/Type/IllustrationType.php | 13 -------
 src/CoreBundle/Form/Type/YesNoNumericType.php |  5 ---
 src/CoreBundle/Form/Type/YesNoType.php        |  5 ---
 src/CoreBundle/Resources/config/services.yml  |  2 +-
 .../SysAnnouncementRepositoryTest.php         | 39 ++++++++++++-------
 5 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/src/CoreBundle/Form/Type/IllustrationType.php b/src/CoreBundle/Form/Type/IllustrationType.php
index 6c4bb8090f..5f6f6e0289 100644
--- a/src/CoreBundle/Form/Type/IllustrationType.php
+++ b/src/CoreBundle/Form/Type/IllustrationType.php
@@ -14,23 +14,10 @@ class IllustrationType extends AbstractType
 {
     public function configureOptions(OptionsResolver $resolver): void
     {
-        /*$resolver->setDefaults(
-            [
-                'choices' => [
-                    'Yes' => 'true',
-                    'No' => 'false',
-                ],
-            ]
-        );*/
     }
 
     public function getParent()
     {
         return FileType::class;
     }
-
-    public function getName(): string
-    {
-        return 'illustration';
-    }
 }
diff --git a/src/CoreBundle/Form/Type/YesNoNumericType.php b/src/CoreBundle/Form/Type/YesNoNumericType.php
index 72c6cd3ea0..7b1d2abd71 100644
--- a/src/CoreBundle/Form/Type/YesNoNumericType.php
+++ b/src/CoreBundle/Form/Type/YesNoNumericType.php
@@ -44,9 +44,4 @@ class YesNoNumericType extends AbstractType
     {
         return ChoiceType::class;
     }
-
-    public function getName(): string
-    {
-        return 'yes_no_numeric';
-    }
 }
diff --git a/src/CoreBundle/Form/Type/YesNoType.php b/src/CoreBundle/Form/Type/YesNoType.php
index a3b7e5b21c..e2793892da 100644
--- a/src/CoreBundle/Form/Type/YesNoType.php
+++ b/src/CoreBundle/Form/Type/YesNoType.php
@@ -28,9 +28,4 @@ class YesNoType extends AbstractType
     {
         return ChoiceType::class;
     }
-
-    public function getName(): string
-    {
-        return 'yes_no';
-    }
 }
diff --git a/src/CoreBundle/Resources/config/services.yml b/src/CoreBundle/Resources/config/services.yml
index 9ce138620e..5cff817b13 100644
--- a/src/CoreBundle/Resources/config/services.yml
+++ b/src/CoreBundle/Resources/config/services.yml
@@ -40,7 +40,7 @@ services:
     # Custom yes/no form type, use in the platform settings
     Chamilo\CoreBundle\Form\Type\YesNoType:
         tags:
-            - {name: form.type, alias: yes_no}
+            - {name: form.type}
 
     Chamilo\CoreBundle\Component\Editor\CkEditor\CkEditor:
         arguments: ['@translator', '@router']
diff --git a/tests/CoreBundle/Repository/SysAnnouncementRepositoryTest.php b/tests/CoreBundle/Repository/SysAnnouncementRepositoryTest.php
index ebdb10cea1..fc3886406c 100644
--- a/tests/CoreBundle/Repository/SysAnnouncementRepositoryTest.php
+++ b/tests/CoreBundle/Repository/SysAnnouncementRepositoryTest.php
@@ -89,19 +89,6 @@ class SysAnnouncementRepositoryTest extends WebTestCase
             ->setName('Doctor')
         ;
         $em->persist($career);
-        $promotion = (new Promotion())
-            ->setName('2000')
-            ->setDescription('Promotion of 2000')
-            ->setCareer($career)
-            ->setStatus(1)
-        ;
-
-        $promotion->getSessions()->add($session);
-
-        $em->persist($promotion);
-        $em->flush();
-
-        $this->assertSame(1, $promotion->getSessions()->count());
 
         $sysAnnouncement = (new SysAnnouncement())
             ->setTitle('Welcome to Chamilo!')
@@ -110,13 +97,37 @@ class SysAnnouncementRepositoryTest extends WebTestCase
             ->setDateStart(new DateTime())
             ->setDateEnd(new DateTime('now +30 days'))
             ->setCareer($career)
-            ->setPromotion($promotion)
             ->addRole('ROLE_ANONYMOUS')
             ->addRole('ROLE_USER') // connected users
         ;
         $em->persist($sysAnnouncement);
         $em->flush();
 
+        // Test with no promotions.
+        $items = $repo->getAnnouncements($user, $this->getAccessUrl(), '');
+        $this->assertCount(1, $items);
+
+        $promotion = (new Promotion())
+            ->setName('2000')
+            ->setDescription('Promotion of 2000')
+            ->setCareer($career)
+            ->setStatus(1)
+        ;
+        $em->persist($promotion);
+        $em->flush();
+
+        $sysAnnouncement = $repo->find($sysAnnouncement->getId());
+
+        $sysAnnouncement->setPromotion($promotion);
+        $em->persist($sysAnnouncement);
+        $em->flush();
+        $promotion->getSessions()->add($session);
+
+        $em->persist($promotion);
+        $em->flush();
+        $this->assertSame(1, $promotion->getSessions()->count());
+
+        // Test with promotions.
         $items = $repo->getAnnouncements($user, $this->getAccessUrl(), '');
         $this->assertCount(1, $items);
     }