Add parameter in function maybeGeneratePropertiesFile in order to choose to escape unicode or not. by gary258796 · Pull Request #11 · git-commit-id/git-commit-id-plugin-core

Expand Up @@ -48,6 +48,44 @@ public void setUp() {
propertiesFileGenerator = new PropertiesFileGenerator(logInterface, buildFileChangeListener, "properties", "", "test"); }
@Test public void generatedPropertiesFileDoesNotEscapeUnicode() throws GitCommitIdExecutionException, IOException { Properties properties = new Properties(); properties.put(GitCommitPropertyConstant.COMMIT_ID_FULL, "b5993378ffadd1f84dc8da220b9204d157ec0f29"); properties.put(GitCommitPropertyConstant.BRANCH, "develop"); properties.put(GitCommitPropertyConstant.COMMIT_MESSAGE_SHORT, "測試中文");
Path propertiesPath = temporaryFolder.getRoot().toPath().resolve("git.properties"); propertiesFileGenerator.maybeGeneratePropertiesFile(properties, temporaryFolder.getRoot(), propertiesPath.getFileName().toString(), UTF_8, false);
byte[] bytes = Files.readAllBytes(propertiesPath); String actualContent = new String(bytes, UTF_8); String expectedContent = "#Generated by Git-Commit-Id-Plugin\n" + "branch=develop\n" + "commit.id.full=b5993378ffadd1f84dc8da220b9204d157ec0f29\n" + "commit.message.short=測試中文\n"; assertEquals(expectedContent, actualContent); }
@Test public void generatedPropertiesFileEscapeUnicode() throws GitCommitIdExecutionException, IOException { Properties properties = new Properties(); properties.put(GitCommitPropertyConstant.COMMIT_ID_FULL, "b5993378ffadd1f84dc8da220b9204d157ec0f29"); properties.put(GitCommitPropertyConstant.BRANCH, "develop"); properties.put(GitCommitPropertyConstant.COMMIT_MESSAGE_SHORT, "測試中文");
Path propertiesPath = temporaryFolder.getRoot().toPath().resolve("git.properties"); propertiesFileGenerator.maybeGeneratePropertiesFile(properties, temporaryFolder.getRoot(), propertiesPath.getFileName().toString(), UTF_8, true);
byte[] bytes = Files.readAllBytes(propertiesPath); String actualContent = new String(bytes, UTF_8); String expectedContent = "#Generated by Git-Commit-Id-Plugin\n" + "branch=develop\n" + "commit.id.full=b5993378ffadd1f84dc8da220b9204d157ec0f29\n" + "commit.message.short=\\u6E2C\\u8A66\\u4E2D\\u6587\n"; assertEquals(expectedContent, actualContent); }
@Test public void generatedPropertiesFileDoesNotContainDateComment() throws GitCommitIdExecutionException, IOException { Expand All @@ -56,7 +94,7 @@ public void generatedPropertiesFileDoesNotContainDateComment() throws GitCommitI properties.put(GitCommitPropertyConstant.BRANCH, "develop");
Path propertiesPath = temporaryFolder.getRoot().toPath().resolve("git.properties"); propertiesFileGenerator.maybeGeneratePropertiesFile(properties, temporaryFolder.getRoot(), propertiesPath.getFileName().toString(), UTF_8); propertiesFileGenerator.maybeGeneratePropertiesFile(properties, temporaryFolder.getRoot(), propertiesPath.getFileName().toString(), UTF_8, true);
byte[] bytes = Files.readAllBytes(propertiesPath); String actualContent = new String(bytes, UTF_8); Expand All @@ -73,10 +111,10 @@ public void rereadGeneratedPropertiesFile() throws GitCommitIdExecutionException properties.put(GitCommitPropertyConstant.BRANCH, "develop");
Path propertiesPath = temporaryFolder.getRoot().toPath().resolve("git.properties"); propertiesFileGenerator.maybeGeneratePropertiesFile(properties, temporaryFolder.getRoot(), propertiesPath.getFileName().toString(), UTF_8); propertiesFileGenerator.maybeGeneratePropertiesFile(properties, temporaryFolder.getRoot(), propertiesPath.getFileName().toString(), UTF_8, true);
// Re-read the generated properties file. propertiesFileGenerator.maybeGeneratePropertiesFile(properties, temporaryFolder.getRoot(), propertiesPath.getFileName().toString(), UTF_8); propertiesFileGenerator.maybeGeneratePropertiesFile(properties, temporaryFolder.getRoot(), propertiesPath.getFileName().toString(), UTF_8, true);
byte[] bytes = Files.readAllBytes(propertiesPath); String actualContent = new String(bytes, UTF_8); Expand All @@ -85,4 +123,4 @@ public void rereadGeneratedPropertiesFile() throws GitCommitIdExecutionException + "commit.id.full=b5993378ffadd1f84dc8da220b9204d157ec0f29\n"; assertEquals(expectedContent, actualContent); } } }