From 872302de6e98c1fd34e3192d8e4de244008ca857 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Fri, 22 Mar 2019 14:13:20 -0400
Subject: [PATCH] Add -Dfile.encoding=UTF-8 into gradle.properties

To avoid wrong encoding during reading and writing files by the
`updateCopyrights` Gradle task, it is better to have an explicit
`-Dfile.encoding=UTF-8` before starting JVM.

* Fix `AbstractFilePayloadTransformerTests` for non-standard symbols in
the test data
* fix broken test
`FileToStringTransformerTests.transform_withWrongEncoding_notMatching()`
---
 build.gradle                                                | 2 +-
 gradle.properties                                           | 2 +-
 .../transformer/AbstractFilePayloadTransformerTests.java    | 6 +++---
 .../file/transformer/FileToStringTransformerTests.java      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index f307812659..9995d5603b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -238,7 +238,7 @@ subprojects { subproject ->
 								def years = "$beginningYear-$now"
 								def sourceCode = file.text
 								sourceCode = sourceCode.replaceFirst(/20\d\d(-20\d\d)?/, years)
-								file.write(sourceCode)
+								file.text = sourceCode
 								println "Copyright updated for file: $file"
 							}
 							break
diff --git a/gradle.properties b/gradle.properties
index 43af26c1c1..177a053668 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 version=5.2.0.BUILD-SNAPSHOT
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx1536m -Dfile.encoding=UTF-8
diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java
index 4a41f78731..39072af9d0 100644
--- a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java
+++ b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java
@@ -38,7 +38,7 @@ public abstract class AbstractFilePayloadTransformerTests<T extends AbstractFile
 
 	static final String DEFAULT_ENCODING = "UTF-8";
 
-	static final String SAMPLE_CONTENT = "HelloWorld\n????";
+	static final String SAMPLE_CONTENT = "HelloWorld\näöüß";
 
 	T transformer;
 
@@ -48,7 +48,7 @@ public abstract class AbstractFilePayloadTransformerTests<T extends AbstractFile
 
 
 	@Before
-	public void setUpCommonTestdata() throws Exception {
+	public void setUpCommonTestData() throws Exception {
 		sourceFile = File.createTempFile("anyFile", ".txt");
 		sourceFile.deleteOnExit();
 		FileCopyUtils.copy(SAMPLE_CONTENT.getBytes(DEFAULT_ENCODING),
@@ -57,7 +57,7 @@ public abstract class AbstractFilePayloadTransformerTests<T extends AbstractFile
 	}
 
 	@After
-	public void tearDownCommonTestdata() {
+	public void tearDownCommonTestData() {
 		if (sourceFile.exists()) {
 			sourceFile.delete();
 		}
diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToStringTransformerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToStringTransformerTests.java
index 7fd1909af7..3d6ac08440 100644
--- a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToStringTransformerTests.java
+++ b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToStringTransformerTests.java
@@ -52,7 +52,7 @@ public class FileToStringTransformerTests extends
 		assertThat(result).isNotNull();
 		assertThat(result.getPayload())
 				.isInstanceOf(String.class)
-				.isEqualTo(SAMPLE_CONTENT);
+				.isNotEqualTo(SAMPLE_CONTENT);
 	}
 
 }