Make ActualVerseRef & ExpectedVerseRef more robust and helpful (#362)

Author: Enkidu93

src/SIL.Machine/Corpora/UsfmVersificationErrorDetector.cs

@@ -104,7 +104,7 @@ public string ExpectedVerseRef
                 // an exception with certain invalid verse data; use TryParse instead.
                 if (!VerseRef.TryParse($"{_bookNum} {_expectedChapter}:{_expectedVerse}", out VerseRef defaultVerseRef))
                 {
-                    return "";
+                    return DefaultVerse(_expectedChapter, _expectedVerse);
                 }
                 if (Type == UsfmVersificationErrorType.ExtraVerse)
                     return "";
@@ -144,10 +144,30 @@ out VerseRef correctedVerseRangeRef
                 return defaultVerseRef.ToString();
             }
         }
-        public string ActualVerseRef =>
-            _verseRef != null
-                ? _verseRef.Value.ToString()
-                : new VerseRef(_bookNum, _actualChapter, _actualVerse).ToString();
+        public string ActualVerseRef
+        {
+            get
+            {
+                if (_verseRef != null)
+                {
+                    return _verseRef.ToString();
+                }
+                else
+                {
+                    if (VerseRef.TryParse($"{_bookNum} {_actualChapter}:{_actualVerse}", out VerseRef actualVerseRef))
+                    {
+                        return actualVerseRef.ToString();
+                    }
+                }
+                return DefaultVerse(_actualChapter, _actualVerse);
+            }
+        }
+
+        private string DefaultVerse(int chapter, int verse)
+        {
+            string verseString = _actualVerse == -1 ? "" : verse.ToString();
+            return $"{Canon.BookNumberToId(_bookNum)} {chapter}:{verseString}";
+        }
     }
 
     public class UsfmVersificationErrorDetector : UsfmParserHandlerBase

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

@@ -9,7 +9,7 @@ namespace SIL.Machine.Corpora;
 public class ParatextProjectQuoteConventionDetectorTests
 {
     [Test]
-    public void GetUsfmVersificationErrors_Noerrors()
+    public void GetUsfmVersificationErrors_NoErrors()
     {
         var env = new TestEnvironment(
             files: new Dictionary<string, string>()