Add additional tests; correct spelling of class names

Author: Enkidu93

src/SIL.Machine/Corpora/UsfmVersificationMismatchDetector.cs

@@ -52,7 +52,7 @@ public bool CheckMismatch()
                 Type = UsfmVersificationMismatchType.MissingChapter;
                 return true;
             }
-            if (_expectedVerse > _actualVerse)
+            if (_expectedVerse > _actualVerse && _expectedChapter == _actualChapter)
             {
                 Type = UsfmVersificationMismatchType.MissingVerse;
                 return true;
@@ -162,7 +162,6 @@ public UsfmVersificationMismatchDetector(ScrVers versification)
             _errors = new List<UsfmVersificationMismatch>();
         }
 
-        public bool HasError => _errors.Count > 0;
         public IReadOnlyList<UsfmVersificationMismatch> Errors => _errors;
 
         public override void EndUsfm(UsfmParserState state)
@@ -183,18 +182,6 @@ public override void EndUsfm(UsfmParserState state)
 
         public override void StartBook(UsfmParserState state, string marker, string code)
         {
-            if (_currentBook > 0 && Canon.IsCanonical(_currentBook))
-            {
-                var versificationMismatch = new UsfmVersificationMismatch(
-                    _currentBook,
-                    _versification.GetLastChapter(_currentBook),
-                    _versification.GetLastVerse(_currentBook, _versification.GetLastChapter(_currentBook)),
-                    _currentChapter,
-                    _currentVerse.AllVerses().Last().VerseNum
-                );
-                if (versificationMismatch.CheckMismatch())
-                    _errors.Add(versificationMismatch);
-            }
             _currentBook = state.VerseRef.BookNum;
             _currentChapter = 0;
             _currentVerse = new VerseRef();

tests/SIL.Machine.Tests/Corpora/ParatextProjectVersificationMismatchDetector.cs

@@ -291,6 +291,92 @@ public void GetUsfmVersificationMismatches_ExtraVerse_ExcludedInCustomVrs()
         Assert.That(mismatches[0].Type, Is.EqualTo(UsfmVersificationMismatchType.ExtraVerse));
     }
 
+    [Test]
+    public void GetUsfmVersificationMismatches_MultipleBooks()
+    {
+        var env = new TestEnvironment(
+            files: new Dictionary<string, string>()
+            {
+                {
+                    "642JNTest.SFM",
+                    @"\id 2JN
+        \c 1
+        \v 1
+        \v 2
+        \v 3
+        \v 4
+        \v 5
+        \v 6
+        \v 7
+        \v 8
+        \v 9
+        \v 10
+        \v 11
+        \v 12
+        "
+                },
+                {
+                    "653JNTest.SFM",
+                    @"\id 3JN
+        \c 1
+        \v 1
+        \v 2
+        \v 3
+        \v 4
+        \v 5
+        \v 6
+        \v 7
+        \v 8
+        \v 9
+        \v 10
+        \v 11
+        \v 12
+        \v 13
+        \v 14
+        \v 15
+        "
+                }
+            }
+        );
+        IReadOnlyList<UsfmVersificationMismatch> mismatches = env.GetUsfmVersificationMismatches();
+        Assert.That(mismatches, Has.Count.EqualTo(1), JsonSerializer.Serialize(mismatches));
+        Assert.That(mismatches[0].Type, Is.EqualTo(UsfmVersificationMismatchType.MissingVerse));
+    }
+
+    [Test]
+    public void GetUsfmVersificationMismatches_MultipleChapters()
+    {
+        var env = new TestEnvironment(
+            files: new Dictionary<string, string>()
+            {
+                {
+                    "642JNTest.SFM",
+                    @"\id 2JN
+        \c 1
+        \v 1
+        \v 2
+        \v 3
+        \v 4
+        \v 5
+        \v 6
+        \v 7
+        \v 8
+        \v 9
+        \v 10
+        \v 11
+        \v 12
+        \c 2
+        \v 1
+        "
+                }
+            }
+        );
+        IReadOnlyList<UsfmVersificationMismatch> mismatches = env.GetUsfmVersificationMismatches();
+        Assert.That(mismatches, Has.Count.EqualTo(2), JsonSerializer.Serialize(mismatches));
+        Assert.That(mismatches[0].Type, Is.EqualTo(UsfmVersificationMismatchType.MissingVerse));
+        Assert.That(mismatches[1].Type, Is.EqualTo(UsfmVersificationMismatchType.ExtraVerse));
+    }
+
     private class TestEnvironment(ParatextProjectSettings? settings = null, Dictionary<string, string>? files = null)
     {
         public ParatextProjectVersificationMismatchDetector Detector { get; } =