improve end-of-line treatments

smdn · Dec 26, 2022 · 0511181 · 0511181
1 parent b51988f
commit 0511181
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 11 deletions.
diff --git a/src/Smdn.Text.Ondulish/Smdn.Text.Ondulish/Translator.cs b/src/Smdn.Text.Ondulish/Smdn.Text.Ondulish/Translator.cs
@@ -175,10 +175,16 @@ public void Translate(string input, bool convertKatakanaToNarrow, TextWriter out
       return;
 
     var reader = new StringReader(input);
+    var firstLine = true;
 
     for (var line = reader.ReadLine(); line is not null; line = reader.ReadLine()) {
+      if (firstLine)
+        firstLine = false;
+      else
+        output.WriteLine();
+
       if (string.IsNullOrWhiteSpace(line)) {
-        output.WriteLine(line);
+        output.Write(line);
         continue;
       }
 
@@ -218,8 +224,6 @@ f.ConvertedText is null
       foreach (var fragment in fragments) {
         output.Write(fragment.ConvertedText);
       }
-
-      output.WriteLine();
     }
 
     output.Flush();

diff --git a/tests/Smdn.Text.Ondulish/Smdn.Text.Ondulish/Translator.cs b/tests/Smdn.Text.Ondulish/Smdn.Text.Ondulish/Translator.cs
@@ -80,7 +80,37 @@ public void Translate(string input, string expected)
 
     Assert.AreEqual(
       expected,
-      t.Translate(input, convertKatakanaToNarrow: false).TrimEnd()
+      t.Translate(input, convertKatakanaToNarrow: false)
+    );
+  }
+
+  [Test]
+  public void Translate_SingleLine()
+  {
+    using var t = Create();
+
+    Assert.AreEqual(
+      "オンドゥルルラギッタンディスカー",
+      t.Translate("本当に裏切ったんですか", convertKatakanaToNarrow: false)
+    );
+  }
+
+  [Test]
+  public void Translate_MultipleLines()
+  {
+    const string input = @"本当に裏切ったんですか
+
+本当に裏切ったんですか";
+
+    var expected = @"オンドゥルルラギッタンディスカー
+
+オンドゥルルラギッタンディスカー".Replace("\r", string.Empty).Replace("\n", Environment.NewLine);
+
+    using var t = Create();
+
+    Assert.AreEqual(
+      expected,
+      t.Translate(input, convertKatakanaToNarrow: false)
     );
   }
 
@@ -93,7 +123,7 @@ public void Translate_ConvertKatakanaToNarrowDefaultValue(string input, string e
 
     Assert.AreEqual(
       expected,
-      t.Translate(input).TrimEnd()
+      t.Translate(input)
     );
   }
 
@@ -116,7 +146,7 @@ public void Translate_ToTextWriter(string input, string expectedOutput)
     var writer = new StringWriter(sb);
 
     Assert.DoesNotThrow(() => t.Translate(input: input, convertKatakanaToNarrow: false, output: writer));
-    Assert.AreEqual(expectedOutput, sb.ToString().TrimEnd());
+    Assert.AreEqual(expectedOutput, sb.ToString());
   }
 
   [Test]
@@ -147,7 +177,7 @@ public void Translate_ToNarrowKatakana(string input, string expected)
 
     Assert.AreEqual(
       expected,
-      t.Translate(input, convertKatakanaToNarrow: true).TrimEnd()
+      t.Translate(input, convertKatakanaToNarrow: true)
     );
   }
 
@@ -159,7 +189,7 @@ public void Translate_SpecialCase(string input, string expected)
 
     Assert.AreEqual(
       expected,
-      t.Translate(input, convertKatakanaToNarrow: false).TrimEnd()
+      t.Translate(input, convertKatakanaToNarrow: false)
     );
   }
 
@@ -183,7 +213,7 @@ public void Translate_Phoneme(string input, string expected)
 
     Assert.AreEqual(
       expected,
-      t.Translate(input, convertKatakanaToNarrow: false).TrimEnd()
+      t.Translate(input, convertKatakanaToNarrow: false)
     );
   }
 
@@ -200,7 +230,7 @@ public void Translate_DictionaryTerm_Words()
 
       Assert.AreEqual(
         outputPrepend + pair.Value + outputAppend,
-        t.Translate(inputPrepend + pair.Key + inputAppend, convertKatakanaToNarrow: false).TrimEnd()
+        t.Translate(inputPrepend + pair.Key + inputAppend, convertKatakanaToNarrow: false)
       );
     }
   }
@@ -218,7 +248,7 @@ public void Translate_DictionaryTerm_Phrases()
 
       Assert.AreEqual(
         outputPrepend + pair.Value + outputAppend,
-        t.Translate(inputPrepend + pair.Key + inputAppend, convertKatakanaToNarrow: false).TrimEnd()
+        t.Translate(inputPrepend + pair.Key + inputAppend, convertKatakanaToNarrow: false)
       );
     }
   }