From 86835dd3c6a67e78796eccff707d01af25dac008 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 9 Jul 2024 16:09:15 -0400 Subject: [PATCH 1/4] Create PremiereDateComparerTests Create PremiereDateComparerTests to test PremiereDateComparer functionality. --- .../Sorting/PremiereDateComparerTests.cs | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 tests/Jellyfin.Server.Implementations.Tests/Sorting/PremiereDateComparerTests.cs diff --git a/tests/Jellyfin.Server.Implementations.Tests/Sorting/PremiereDateComparerTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Sorting/PremiereDateComparerTests.cs new file mode 100644 index 0000000000..153debdfc0 --- /dev/null +++ b/tests/Jellyfin.Server.Implementations.Tests/Sorting/PremiereDateComparerTests.cs @@ -0,0 +1,45 @@ +using System; +using Emby.Server.Implementations.Sorting; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities.Movies; +using Xunit; + +namespace Jellyfin.Server.Implementations.Tests.Sorting +{ + public class PremiereDateComparerTests + { + private readonly PremiereDateComparer _cmp = new PremiereDateComparer(); + + [Theory] + [ClassData(typeof(PremiereDateTestData))] + public void PremiereDateCompareTest(BaseItem x, BaseItem y, int expected) + { + Assert.Equal(expected, _cmp.Compare(x, y)); + Assert.Equal(-expected, _cmp.Compare(y, x)); + } + + private sealed class PremiereDateTestData : TheoryData + { + public PremiereDateTestData() + { + // Both have premier date + Add( + new Movie { PremiereDate = new DateTime(2021, 1, 1) }, + new Movie { PremiereDate = new DateTime(2021, 1, 3) }, + 0); + + // Only x has premiere date + Add( + new Movie { PremiereDate = new DateTime(2021, 1, 1) }, + new Movie { ProductionYear = 2022 }, + 1); + + // Only x has premiere date, with same year as y + Add( + new Movie { PremiereDate = new DateTime(2021, 3, 1) }, + new Movie { ProductionYear = 2021 }, + 2); + } + } + } +} From 8933574ce9f0bd0af7f6bf5d6a99d0011839eeb3 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 9 Jul 2024 20:22:06 -0400 Subject: [PATCH 2/4] Correct PremiereDateComparerTests Correct PremiereDateComparerTests - Adjust expected values, add comments, add extra test --- .../Sorting/PremiereDateComparerTests.cs | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/tests/Jellyfin.Server.Implementations.Tests/Sorting/PremiereDateComparerTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Sorting/PremiereDateComparerTests.cs index 153debdfc0..605f68d782 100644 --- a/tests/Jellyfin.Server.Implementations.Tests/Sorting/PremiereDateComparerTests.cs +++ b/tests/Jellyfin.Server.Implementations.Tests/Sorting/PremiereDateComparerTests.cs @@ -23,22 +23,32 @@ namespace Jellyfin.Server.Implementations.Tests.Sorting public PremiereDateTestData() { // Both have premier date + // Expected: x listed first Add( new Movie { PremiereDate = new DateTime(2021, 1, 1) }, new Movie { PremiereDate = new DateTime(2021, 1, 3) }, - 0); + -1); - // Only x has premiere date + // Only x has premiere date, with earlier year than y + // Expected: x listed first Add( new Movie { PremiereDate = new DateTime(2021, 1, 1) }, new Movie { ProductionYear = 2022 }, - 1); + -1); // Only x has premiere date, with same year as y + // Expected: y listed first Add( - new Movie { PremiereDate = new DateTime(2021, 3, 1) }, + new Movie { PremiereDate = new DateTime(2021, 1, 2) }, new Movie { ProductionYear = 2021 }, - 2); + 1); + + // Only x has a premiere date, with later year than y + // Expected: y listed first + Add( + new Movie { PremiereDate = new DateTime(2021, 3, 1) }, + new Movie { ProductionYear = 2020 }, + 1); } } } From 072938289cd957dcc0ad039aad953e72d651fe5f Mon Sep 17 00:00:00 2001 From: honestlywhoknows Date: Tue, 9 Jul 2024 21:11:23 -0400 Subject: [PATCH 3/4] Update PremiereDateComparerTests Add extra tests for edge cases, adjust dummy values for easier debugging --- .../Sorting/PremiereDateComparerTests.cs | 39 ++++++++++++++----- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/tests/Jellyfin.Server.Implementations.Tests/Sorting/PremiereDateComparerTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Sorting/PremiereDateComparerTests.cs index 605f68d782..9dfacb2bf4 100644 --- a/tests/Jellyfin.Server.Implementations.Tests/Sorting/PremiereDateComparerTests.cs +++ b/tests/Jellyfin.Server.Implementations.Tests/Sorting/PremiereDateComparerTests.cs @@ -22,32 +22,53 @@ namespace Jellyfin.Server.Implementations.Tests.Sorting { public PremiereDateTestData() { - // Both have premier date + // Happy case - Both have premier date // Expected: x listed first Add( - new Movie { PremiereDate = new DateTime(2021, 1, 1) }, - new Movie { PremiereDate = new DateTime(2021, 1, 3) }, + new Movie { PremiereDate = new DateTime(2018, 1, 1) }, + new Movie { PremiereDate = new DateTime(2018, 1, 3) }, -1); + // Both have premiere date, but y has invalid date + // Expected: y listed first + Add( + new Movie { PremiereDate = new DateTime(2019, 1, 1) }, + new Movie { PremiereDate = new DateTime(03, 1, 1) }, + 1); + // Only x has premiere date, with earlier year than y // Expected: x listed first Add( - new Movie { PremiereDate = new DateTime(2021, 1, 1) }, - new Movie { ProductionYear = 2022 }, + new Movie { PremiereDate = new DateTime(2020, 1, 1) }, + new Movie { ProductionYear = 2021 }, -1); // Only x has premiere date, with same year as y // Expected: y listed first Add( - new Movie { PremiereDate = new DateTime(2021, 1, 2) }, - new Movie { ProductionYear = 2021 }, + new Movie { PremiereDate = new DateTime(2022, 1, 2) }, + new Movie { ProductionYear = 2022 }, 1); // Only x has a premiere date, with later year than y // Expected: y listed first Add( - new Movie { PremiereDate = new DateTime(2021, 3, 1) }, - new Movie { ProductionYear = 2020 }, + new Movie { PremiereDate = new DateTime(2024, 3, 1) }, + new Movie { ProductionYear = 2023 }, + 1); + + // Only x has a premiere date, y has an invalid year + // Expected: y listed first + Add( + new Movie { PremiereDate = new DateTime(2025, 1, 1) }, + new Movie { ProductionYear = 0 }, + 1); + + // Only x has a premiere date, y has neither date nor year + // Expected: y listed first + Add( + new Movie { PremiereDate = new DateTime(2026, 1, 1) }, + new Movie(), 1); } } From 0d0900269faac64b047a79e536ab761500ca1bc6 Mon Sep 17 00:00:00 2001 From: honestlywhoknows Date: Tue, 9 Jul 2024 21:21:19 -0400 Subject: [PATCH 4/4] Add entry to CONTRIBUTORS.md Add my entry to CONTRIBUTORS.md --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 76d57a4783..8f63bd6b4a 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -184,6 +184,7 @@ - [GeorgeH005](https://github.com/GeorgeH005) - [Vedant](https://github.com/viktory36/) - [NotSaifA](https://github.com/NotSaifA) + - [HonestlyWhoKnows](https://github.com/honestlywhoknows) # Emby Contributors