You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by js...@apache.org on 2023/03/01 00:57:05 UTC
[solr] branch branch_9x updated: SOLR-16608: Fixing replacement of line ending in test to be OS agnostic (#1409)
This is an automated email from the ASF dual-hosted git repository.
jsweeney pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 4e4e2fbf479 SOLR-16608: Fixing replacement of line ending in test to be OS agnostic (#1409)
4e4e2fbf479 is described below
commit 4e4e2fbf47941115981caa9a1ef17c2d4f828d06
Author: Justin Sweeney <ju...@fullstory.com>
AuthorDate: Tue Feb 28 17:52:24 2023 -0700
SOLR-16608: Fixing replacement of line ending in test to be OS agnostic (#1409)
---
solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java b/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
index 1ba4fde8caa..bcacb569a4f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
@@ -445,7 +445,7 @@ public class ZkCLITest extends SolrTestCaseJ4 {
ZkCLI.main(args);
assertArrayEquals(
data,
- StringUtils.removeEnd(systemOut.toString(StandardCharsets.UTF_8), "\n")
+ StringUtils.removeEnd(systemOut.toString(StandardCharsets.UTF_8), System.lineSeparator())
.getBytes(StandardCharsets.UTF_8));
}
@@ -464,7 +464,7 @@ public class ZkCLITest extends SolrTestCaseJ4 {
ZkCLI.main(args);
assertArrayEquals(
data,
- StringUtils.removeEnd(systemOut.toString(StandardCharsets.UTF_8), "\n")
+ StringUtils.removeEnd(systemOut.toString(StandardCharsets.UTF_8), System.lineSeparator())
.getBytes(StandardCharsets.UTF_8));
}