Merge pull request #486 from rtyley/add-explicit-test-for-newline-pre…

…servation Add explicit test for newline-preservation
rtyley · Apr 26, 2023 · 70b3ca6 · 70b3ca6
2 parents 403e347 + 389ab05
commit 70b3ca6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/bfg-library/src/test/resources/sample-repos/encodings.git.zip b/bfg-library/src/test/resources/sample-repos/encodings.git.zip
diff --git a/bfg-library/src/test/scala/com/madgag/git/bfg/cleaner/RepoRewriteSpec.scala b/bfg-library/src/test/scala/com/madgag/git/bfg/cleaner/RepoRewriteSpec.scala
@@ -130,7 +130,6 @@ class RepoRewriteSpec extends AnyFlatSpec with Matchers {
     val filename = s"$fileNamePrefix-ORIGINAL.$fileNamePostfix"
     val beforeFile = s"$parentPath/$filename"
     val afterFile = s"$parentPath/$fileNamePrefix-MODIFIED-$beforeAndAfter.$fileNamePostfix"
-    // val dirtyFile = repo.resolve(s"master:$beforeFile")
 
     val blobTextModifier = new BlobTextModifier {
       def lineCleanerFor(entry: TreeBlobEntry) = Some(quote(before).r --> (_ => after))
@@ -146,10 +145,8 @@ class RepoRewriteSpec extends AnyFlatSpec with Matchers {
     expectedFile should not be null
 
     implicit val threadLocalObjectReader = repo.getObjectDatabase.threadLocalResources.reader()
-    // val dirty = dirtyFile.open.getBytes
     val cleaned = cleanedFile.open.getBytes
     val expected = expectedFile.open.getBytes
-    // val dirtyStr = new String(dirty)
     val cleanedStr = new String(cleaned)
     val expectedStr = new String(expected)
 
@@ -167,4 +164,10 @@ class RepoRewriteSpec extends AnyFlatSpec with Matchers {
 
   it should "handle converting Windows newlines to Unix" in textReplacementOf("newlines", "windows", "txt", "\r\n", "\n")
 
+  it should "handle a file that uses LF for newlines" in
+    textReplacementOf("newlines", "using-LF", "txt", "file", "blob")
+
+  it should "handle a file that uses CRLF for newlines" in
+    textReplacementOf("newlines", "using-CRLF", "txt", "file", "blob")
+
 }