From b60185a97c7f76b19cdd6b436630619e54fe1d4c Mon Sep 17 00:00:00 2001
From: "Angelo D. Moura" <up201303828@fe.up.pt>
Date: Mon, 9 Nov 2020 19:43:39 +0000
Subject: [PATCH] [TWIG][TESTS] Update IconsExtension test

---
 tests/EventListener/UpdateListenerTest.php |  2 +-
 tests/Twig/IconsExtensionTest.php          | 32 ++++++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/tests/EventListener/UpdateListenerTest.php b/tests/EventListener/UpdateListenerTest.php
index b13ade2503..b794ec65a3 100644
--- a/tests/EventListener/UpdateListenerTest.php
+++ b/tests/EventListener/UpdateListenerTest.php
@@ -19,8 +19,8 @@
 
 namespace App\Tests\EventListener;
 
+use App\Core\DB\UpdateListener;
 use App\Entity\GSActor;
-use App\EventListener\UpdateListener;
 use DateTime;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
diff --git a/tests/Twig/IconsExtensionTest.php b/tests/Twig/IconsExtensionTest.php
index e37ed68f38..10d31a886b 100644
--- a/tests/Twig/IconsExtensionTest.php
+++ b/tests/Twig/IconsExtensionTest.php
@@ -34,9 +34,9 @@ namespace App\Tests\Templates\Icons;
 use App\Twig\Extension;
 use App\Twig\Runtime;
 use DirectoryIterator;
-use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
-class IconsExtensionTest extends TestCase
+class IconsExtensionTest extends KernelTestCase
 {
     public function testIconsExtension()
     {
@@ -49,20 +49,24 @@ class IconsExtensionTest extends TestCase
             $icon_file_names[] = $file->getFilename();
         }
 
-        $twig = self::$kernel->getContainer()->get('twig');
-
-        // Check if every icon file as a ".svg.twig" extension
+        //Check if every icon file as a ".svg.twig" extension
         foreach ($icon_file_names as $icon_file_name) {
-            static::assertRegExp('#.+\.svg\.twig$#', $icon_file_name);
-
-            $icon_name = explode('.', basename($icon_file_name))[0];
-            $icon_template_render = $twig->render($icon_file_name, ['iconClass' => 'icon icon-' . $icon_name]);
-            $icons_extension       = new Runtime();
-            $icon_extension_render = $icons_extension->embedSvgIcon($twig, $icon_name, 'icon icon-' . $icon_name);
-
-            //Check if the function gives a valid HTML with a class attribute equal to the one passed
-            self::assertEquals($icon_template_render, $iconsExtension_render);
+            static::assertRegExp('#([a-zA-Z0-9\s_\\.\-\(\):])+(.svg.twig)$#', $icon_file_name);
         }
 
+        //Check if the function gives a valid HTML with a class attribute equal to the one passed
+        static::bootKernel();
+        $twig = self::$kernel->getContainer()->get('twig');
+
+        foreach ($icon_file_names as $icon_file_name) {
+            $icon_name = basename($icon_file_name, '.svg.twig');
+
+            $icon_template_render = $twig->render('@public_path/assets/icons/' . $icon_file_name, ['iconClass' => 'icon icon-' . $icon_name]);
+
+            $icons_extension       = new IconsExtension();
+            $icon_extension_render = $icons_extension->embedSvgIcon($twig, $icon_name, 'icon icon-' . $icon_name);
+
+            static::assertSame($icon_template_render, $icon_extension_render);
+        }
     }
 }