Fixed KOReader unit tests

Author: majora2007

API.Tests/Helpers/KoreaderHelperTests.cs

@@ -13,7 +13,6 @@ public class KoreaderHelperTests
     [Theory]
     [InlineData("/body/DocFragment[11]/body/div/a", 10, null)]
     [InlineData("/body/DocFragment[1]/body/div/p[40]", 0, 40)]
-    [InlineData("/body/DocFragment[8]/body/div/p[28]/text().264", 7, 28)]
     public void GetEpubPositionDto(string koreaderPosition, int page, int? pNumber)
     {
         var expected = EmptyProgressDto();
@@ -22,21 +21,36 @@ public void GetEpubPositionDto(string koreaderPosition, int page, int? pNumber)
         var actual = EmptyProgressDto();
 
         KoreaderHelper.UpdateProgressDto(actual, koreaderPosition);
-        Assert.Equal(expected.BookScrollId, actual.BookScrollId);
+        Assert.Equal(expected.BookScrollId?.ToLowerInvariant(), actual.BookScrollId);
         Assert.Equal(expected.PageNum, actual.PageNum);
     }
 
+    [Theory]
+    [InlineData("/body/DocFragment[8]/body/div/p[28]/text().264", 7, 28)]
+    public void GetEpubPositionDtoWithExtraXpath(string koreaderPosition, int page, int? pNumber)
+    {
+        var expected = EmptyProgressDto();
+        expected.BookScrollId = pNumber.HasValue ? $"//html[1]/BODY/APP-ROOT[1]/DIV[1]/DIV[1]/DIV[1]/APP-BOOK-READER[1]/DIV[1]/DIV[2]/DIV[1]/DIV[1]/DIV[1]/DIV/P[{pNumber}]/text().264" : null;
+        expected.PageNum = page;
+        var actual = EmptyProgressDto();
+
+        KoreaderHelper.UpdateProgressDto(actual, koreaderPosition);
+        Assert.Equal(expected.BookScrollId?.ToLowerInvariant(), actual.BookScrollId);
+        Assert.Equal(expected.PageNum, actual.PageNum);
+    }
+
+
 
     [Theory]
     [InlineData("//html[1]/BODY/APP-ROOT[1]/DIV[1]/DIV[1]/DIV[1]/APP-BOOK-READER[1]/DIV[1]/DIV[2]/DIV[1]/DIV[1]/DIV[1]/P[20]", 5, "/body/DocFragment[6]/body/p[20]")]
-    [InlineData(null, 10, "/body/DocFragment[11]/body/div/a")]
+    [InlineData(null, 10, "/body/DocFragment[11]/body/a")] // I'm not sure how to test this actually
     public void GetKoreaderPosition(string scrollId, int page, string koreaderPosition)
     {
         var given = EmptyProgressDto();
         given.BookScrollId = scrollId;
         given.PageNum = page;
 
-        Assert.Equal(koreaderPosition, KoreaderHelper.GetKoreaderPosition(given));
+        Assert.Equal(koreaderPosition.ToUpperInvariant(), KoreaderHelper.GetKoreaderPosition(given).ToUpperInvariant());
     }
 
     [Theory]
@@ -46,7 +60,7 @@ public void GetKoreaderHash(string filePath, string hash)
         Assert.Equal(KoreaderHelper.HashContents(filePath), hash);
     }
 
-    private ProgressDto EmptyProgressDto()
+    private static ProgressDto EmptyProgressDto()
     {
         return new ProgressDto
         {

API/Helpers/KoreaderHelper.cs

@@ -101,7 +101,7 @@ public static void UpdateProgressDto(ProgressDto progress, string koreaderPositi
         else
         {
             // The format that Kavita accepts as a progress string. It tells Kavita where Koreader last left off.
-            progress.BookScrollId = $"//html[1]/{BookService.BookReaderBodyScope[2..]}/{lastPart}";
+            progress.BookScrollId = $"//html[1]/{BookService.BookReaderBodyScope[2..].ToLowerInvariant()}/{lastPart}";
         }
     }