Skip to content

Commit 7caaa9f

Browse files
committed
Run the rest of the tests
1 parent 000f9e2 commit 7caaa9f

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

webapp/src/Twig/TwigExtension.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,13 +1157,12 @@ public function fileTypeIcon(string $type): string
11571157

11581158
public function problemBadge(ContestProblem $problem, bool $grayedOut = false): string
11591159
{
1160-
dump(Utils::hexToForegroundAndBorder("#fffDDD"));
1161-
dump(Utils::hexToForegroundAndBorder("#000000"));
1162-
dump(Utils::hexToForegroundAndBorder("#ABC"));
1163-
dump(Utils::hexToForegroundAndBorder("#1239"));
1164-
dump(Utils::hexToForegroundAndBorder("#10203040"));
1165-
1166-
$rgb = Utils::convertToHex($problem->getColor() ?? '#ffffff');
1160+
dump(Utils::relativeLuminance("#000000"));
1161+
dump(Utils::relativeLuminance("#FFFfff"));
1162+
dump(Utils::relativeLuminance("#FFFfffFF"));
1163+
dump(Utils::relativeLuminance("#123"));
1164+
dump(Utils::relativeLuminance("#1234"));
1165+
$rgb = Utils::convertToHex($problem->getColor() ?? '#ffffff');
11671166
if ($grayedOut || empty($rgb)) {
11681167
$rgb = Utils::convertToHex('whitesmoke');
11691168
}

webapp/tests/Unit/Utils/UtilsTest.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -350,25 +350,25 @@ public function testRgbToHex(): void
350350

351351
public function testRelativeLuminance(): void
352352
{
353-
self::assertEquals(1.0, Utils::relativeLuminance("#000000"));
354-
self::assertEquals(0.0, Utils::relativeLuminance("#FFFfff"));
355-
self::assertEquals(0.0, Utils::relativeLuminance("#FFFfffFF"));
356-
self::assertEquals(0.0, Utils::relativeLuminance("#123"));
357-
self::assertEquals(0.0, Utils::relativeLuminance("#1234"));
353+
self::assertEquals(0.0, Utils::relativeLuminance("#000000"));
354+
self::assertEquals(1.0, Utils::relativeLuminance("#FFFfff"));
355+
self::assertEquals(1.0, Utils::relativeLuminance("#FFFfffFF"));
356+
self::assertEquals(0.0075160434238945, Utils::relativeLuminance("#123"));
357+
self::assertEquals(0.52818680396014, Utils::relativeLuminance("#1234"));
358358
}
359359

360360
/**
361361
* Test that the APCA contrast function returns the correct data
362362
*/
363363
public function testApcaContrast(): void
364364
{
365-
self::assertEquals(0.0, Utils::apcaContrast("#ffffff", "#000000"));
366-
self::assertEquals(-114.0, Utils::apcaContrast("#000000", "#ffffff"));
365+
self::assertEquals(-114.0, Utils::apcaContrast("#ffffff", "#000000"));
366+
self::assertEquals(114.0, Utils::apcaContrast("#000000", "#ffffff"));
367367
self::assertEquals(0.0, Utils::apcaContrast("#fffFFF", "#FFFfff"));
368-
self::assertEquals(0.0, Utils::apcaContrast("#111", "#111"));
369-
self::assertEquals(0.0, Utils::apcaContrast("#123f", "#975A"));
370-
self::assertEquals(0.0, Utils::apcaContrast("#11223344", "#00110011"));
371-
self::assertEquals(0.0, Utils::apcaContrast("#11223344", "#FF0011"));
368+
self::assertEquals(-0.36, Utils::apcaContrast("#111", "#111"));
369+
self::assertEquals(58.09, Utils::apcaContrast("#123f", "#975A"));
370+
self::assertEquals(25.15, Utils::apcaContrast("#11223344", "#00110011"));
371+
self::assertEquals(-35.06, Utils::apcaContrast("#11223344", "#FF0011"));
372372
}
373373

374374
public function testHexToForegroundAndBorder(): void

0 commit comments

Comments
 (0)