Revert "Fixup"

This reverts commit 1222884.

Author: vmcj

webapp/tests/Unit/Twig/TwigExtensionTest.php

@@ -52,19 +52,11 @@
 
 class TwigExtensionTest extends WebTestCase
 {
-    protected function setUp(): void
-    {
-        self::bootKernel();
-    }
-	
     /**
      * Test that the APCA contrast function returns the correct data
      */
     public function testApcaContrast(): void
     {
-	$container            = self::$kernel->getContainer();
-	$env                  = $container->get('twig');
-
 	$dj                   = self::getContainer()->get(DOMJudgeService::class);
 	$config               = self::getContainer()->get(ConfigurationService::class);
 	$submissionService    = self::getContainer()->get(SubmissionService::class);
@@ -74,6 +66,7 @@ public function testApcaContrast(): void
 	$tokenStorage         = static::getContainer()->get(TokenStorageInterface::class);
 	$authorizationChecker = static::getContainer()->get(AuthorizationCheckerInterface::class);
 	$router               = static::getContainer()->get(RouterInterface::class);
+	$env                  = new Environment();
 	$twigExt = new TwigExtension($dj, $config, $env, $em, $submissionService,
                                      $eventLogService, $awards, $tokenStorage,
 				     $authorizationChecker, $router, "");
@@ -85,7 +78,7 @@ public function testApcaContrast(): void
         self::assertEquals(0.0, $twigExt->apcaContrast("#11223344", "#00110011"));
     }
 
-    /*public function testRelativeLuminance(): void
+    public function testRelativeLuminance(): void
     {
         $twigExt = new TwigExtension();
         self::assertEquals(0.0, $twigExt->relativeLuminance("#000000"));
@@ -94,13 +87,4 @@ public function testApcaContrast(): void
         self::assertEquals(0.0, $twigExt->relativeLuminance("#123"));
         self::assertEquals(0.0, $twigExt->relativeLuminance("#1234"));
     }
-
-    public function testHexToForegroundAndBorder(): void
-    {
-        self::assertEquals(['#ffffff', '#ffffff'], $twigExt->hexToForegroundAndBorder("#fff"));
-        self::assertEquals(['#ffffff', '#ffffff'], $twigExt->hexToForegroundAndBorder("#fedc"));
-        self::assertEquals(['#ffffff', '#ffffff'], $twigExt->hexToForegroundAndBorder("#001122"));
-        self::assertEquals(['#ffffff', '#ffffff'], $twigExt->hexToForegroundAndBorder("#11223344"));
-        self::assertEquals(['#ffffff', '#ffffff'], $twigExt->hexToForegroundAndBorder("#0123"));
-    }*/
 }

webapp/tests/Unit/Utils/UtilsTest.php

@@ -386,6 +386,20 @@ public function testConvertToHexUnknown(): void
         self::assertNull(Utils::convertToHex('#12346h'));
     }
 
+    public function testApcaContrast(): void
+    {
+        self::assertEquals('#ffffff', Utils::apcaContrast("#fff", "#fff"));
+    }
+
+    public function testHexToForegroundAndBorder(): void
+    {
+        self::assertEquals(['#ffffff', '#ffffff'], Utils::hexToForegroundAndBorder("#fff"));
+        self::assertEquals(['#ffffff', '#ffffff'], Utils::hexToForegroundAndBorder("#fedc"));
+        self::assertEquals(['#ffffff', '#ffffff'], Utils::hexToForegroundAndBorder("#001122"));
+        self::assertEquals(['#ffffff', '#ffffff'], Utils::hexToForegroundAndBorder("#11223344"));
+        self::assertEquals(['#ffffff', '#ffffff'], Utils::hexToForegroundAndBorder("#0123"));
+    }
+
     /**
      * Test function that converts colour hex notation to (nearest) name.
      * If value is not hexadecimal, return it unchanged.