Merge pull request #38 from dbut023/jenkins-27094-writefile-encoding

[JENKINS-27094] writeFile encoding parameter
jenkinsci · May 30, 2017 · 37d4589 · 37d4589
2 parents b1b29f6 + e41ef60
commit 37d4589
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/steps/WriteFileStep.java b/src/main/java/org/jenkinsci/plugins/workflow/steps/WriteFileStep.java
@@ -91,7 +91,7 @@ public static final class Execution extends SynchronousNonBlockingStepExecution<
         }
 
         @Override protected Void run() throws Exception {
-            getContext().get(FilePath.class).child(step.file).write(step.text, /* TODO consider specifying encoding */ null);
+            getContext().get(FilePath.class).child(step.file).write(step.text, step.encoding);
             return null;
         }
 

diff --git a/src/test/java/org/jenkinsci/plugins/workflow/steps/ReadWriteFileStepTest.java b/src/test/java/org/jenkinsci/plugins/workflow/steps/ReadWriteFileStepTest.java
@@ -31,6 +31,7 @@
 import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.junit.Rule;
 import org.junit.Test;
+import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 
 public class ReadWriteFileStepTest {
@@ -67,4 +68,36 @@ public void shouldTestFileExistsStep() throws Exception
 		r.assertLogContains("test2.txt - FileExists: true", run);
 		r.assertBuildStatusSuccess(run);
     }
+
+    @Issue(("JENKINS-27094"))
+    @Test
+    public void readAndwriteFileUsesCorrectEncoding() throws Exception
+    {
+        WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");
+        p.setDefinition(new CpsFlowDefinition(
+                "node {\n" +
+                        "  def text = 'HELLO'\n" +
+                        "  writeFile file: 'f1', text: text, encoding: 'utf-32le'\n" +
+                        "  def text2 = readFile file: 'f1', encoding: 'utf-32le'\n" +
+                        "  echo text2\n" +
+                        "}"));
+        r.assertLogContains("HELLO", r.assertBuildStatusSuccess(p.scheduleBuild2(0)));
+    }
+
+
+
+
+    @Issue(("JENKINS-27094"))
+    @Test
+    public void testKnownCharsetRoundtrip() throws Exception {
+        WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");
+        p.setDefinition(new CpsFlowDefinition(
+                "node {\n" +
+                        "  def text = 'HELLO'\n" +
+                        "  writeFile file: 'f1', text: '¤', encoding: 'iso-8859-1'\n" +
+                        "  def text2 = readFile file: 'f1', encoding: 'iso-8859-15'\n" +
+                        "  echo text2\n" +
+                        "}"));
+        r.assertLogContains("€", r.assertBuildStatusSuccess(p.scheduleBuild2(0)));
+    }
 }