Add explicit test for newline-preservation

#485 reported that the
BFG wasn't preserving CR/LF newlines when using `--replace-text` (even
modifying newlines on unaffected files).

This commit adds some a couple of explicit tests, verifying that the
BFG does indeed preserve newlines.

Author: rtyley

.gitignore

@@ -10,4 +10,5 @@ repo.git.zip
 **/.settings
 .bsp
 
+.DS_Store
 test-results/

bfg-library/src/test/resources/sample-repos/encodings.git.zip

@@ -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")
+
 }

bfg-library/src/test/scala/com/madgag/git/bfg/cleaner/RepoRewriteSpec.scala

@@ -17,7 +17,7 @@ packageOptions in (Compile, packageBin) +=
   Package.ManifestAttributes( "Main-Class-After-UseNewerJava-Check" -> "com.madgag.git.bfg.cli.Main" )
 
 // note you don't want the jar name to collide with the non-assembly jar, otherwise confusion abounds.
-assemblyJarName in assembly := s"${name.value}-${version.value}-${gitDescription.value}${jgitVersionOverride.map("-jgit-" + _).mkString}.jar"
+assembly / assemblyJarName := s"${name.value}-${version.value}-${gitDescription.value}${jgitVersionOverride.map("-jgit-" + _).mkString}.jar"
 
 buildInfoKeys := Seq[BuildInfoKey](version, scalaVersion, gitDescription)
 
@@ -37,7 +37,7 @@ cliUsageDump := {
   val scalaRun = new ForkRun(ForkOptions().withOutputStrategy(CustomOutput(new FileOutputStream(usageDumpFile))))
 
   val mainClassName = (mainClass in (Compile, run)).value getOrElse sys.error("No main class detected.")
-  val classpath = Attributed.data((fullClasspath in Runtime).value)
+  val classpath = Attributed.data((Runtime / fullClasspath).value)
   val args = Seq.empty
 
   scalaRun.run(mainClassName, classpath, args, streams.value.log).failed foreach (sys error _.getMessage)
@@ -64,12 +64,12 @@ import Tests._
     }
   }
 
-  testGrouping in Test := isolateTestsWhichRequireTheirOwnJvm( (definedTests in Test).value )
+  Test / testGrouping := isolateTestsWhichRequireTheirOwnJvm( (Test / definedTests).value )
 }
 
-fork in Test := true // JGit uses static (ie JVM-wide) config
+Test / fork := true // JGit uses static (ie JVM-wide) config
 
-logBuffered in Test := false
+Test / logBuffered := false
 
-parallelExecution in Test := false
+Test / parallelExecution := false
 

bfg/build.sbt

@@ -1 +1 @@
-version in ThisBuild := "1.14.1-SNAPSHOT"
+ThisBuild / version := "1.14.1-SNAPSHOT"