From b1cf4cbbd5a5eae51b034e5f14f14abea493af1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Sat, 24 Sep 2022 14:22:27 +0200 Subject: [PATCH 1/2] Changes: - added unit-test for `Temporal::getRelativeDate()` method --- tests/src/Util/TemporalTest.php | 59 +++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 tests/src/Util/TemporalTest.php diff --git a/tests/src/Util/TemporalTest.php b/tests/src/Util/TemporalTest.php new file mode 100644 index 0000000000..a2f76114d3 --- /dev/null +++ b/tests/src/Util/TemporalTest.php @@ -0,0 +1,59 @@ +. + * + */ + +namespace Friendica\Test\src\Util; + +use Friendica\DI; +use Friendica\Util\Temporal; +use PHPUnit\Framework\TestCase; + +/** + * Temporal utility test class + */ +class TemporalTest extends TestCase +{ + /** + * Checks for getRelativeDate() + */ + public function testGetRelativeDate() + { + // "never" would should be returned + self::assertEquals( + Temporal::getRelativeDate(''), + DI::l10n()->t('never') + ); + + // Format current date/time into "MySQL" format + $now = date('Y-m-d H:i:s'); + self::assertEquals( + Temporal::getRelativeDate($now), + DI::l10n()->t('less than a second ago') + ); + + // Format current date/time - 1 minute into "MySQL" format + $minuteAgo = date('Y-m-d H:i:s', time() - 60); + $format = DI::l10n()->t('%1$d %2$s ago'); + self::assertEquals( + Temporal::getRelativeDate($minuteAgo), + sprintf($format, 1, DI::l10n()->t('minute')) + ); + } +} From 913a4a5dc087b6fbf795cc56ab0d81dc85757623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Tue, 25 Oct 2022 22:44:54 +0200 Subject: [PATCH 2/2] Fixed code-standards complain by php-cs, thanks to @MrPetovan --- tests/src/Util/TemporalTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/src/Util/TemporalTest.php b/tests/src/Util/TemporalTest.php index a2f76114d3..cfe1af5e23 100644 --- a/tests/src/Util/TemporalTest.php +++ b/tests/src/Util/TemporalTest.php @@ -50,7 +50,9 @@ class TemporalTest extends TestCase // Format current date/time - 1 minute into "MySQL" format $minuteAgo = date('Y-m-d H:i:s', time() - 60); - $format = DI::l10n()->t('%1$d %2$s ago'); + $format = DI::l10n()->t('%1$d %2$s ago'); + + // Should be both equal self::assertEquals( Temporal::getRelativeDate($minuteAgo), sprintf($format, 1, DI::l10n()->t('minute'))