Fix for JENKINS-16942

https://issues.jenkins-ci.org/browse/JENKINS-16942 PrintWriter.println() uses the OS specific line separator. When SecretRewriter rewrites the secret file, the lines are converted to the format of the running OS. The test case does not account for this. Since the test case is coded expecting line endings of \n, this fix converts \r\n to \n before comparing.
jenkinsci · Mar 25, 2013 · 899f5aa · 899f5aa
1 parent f8193f0
commit 899f5aa
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/test/java/hudson/util/SecretRewriterTest.groovy b/core/src/test/java/hudson/util/SecretRewriterTest.groovy
@@ -52,7 +52,7 @@ class SecretRewriterTest {
         def f = File.createTempFile("test", "xml", tmp.root)
         f.text = before
         sr.rewrite(f,null)
-        assert after.trim()==f.text.trim()
+        assert after.replaceAll("\r\n", "\n").trim()==f.text.replaceAll("\r\n", "\n").trim()
     }
 
     String encryptOld(str) {