You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sa...@apache.org on 2018/09/26 16:00:06 UTC
[geode] branch develop updated: GEODE-5212: fix failing
DestroyRegionCommandDunitTest on windows (#2514)
This is an automated email from the ASF dual-hosted git repository.
sai_boorlagadda pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new abb7659 GEODE-5212: fix failing DestroyRegionCommandDunitTest on windows (#2514)
abb7659 is described below
commit abb7659bdf5bbce86bfd00ae180194362a0ee231
Author: Sai Boorlagadda <sa...@gmail.com>
AuthorDate: Wed Sep 26 08:59:55 2018 -0700
GEODE-5212: fix failing DestroyRegionCommandDunitTest on windows (#2514)
The test is asserting a multi-line xml string which
includes a new line hardcoded as '\n' while on
windows it is '\r\n'.
---
.../internal/cli/commands/DestroyRegionCommandDUnitTest.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java
index 477743b..62a486e 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandDUnitTest.java
@@ -115,11 +115,13 @@ public class DestroyRegionCommandDUnitTest {
InternalConfigurationPersistenceService service =
ClusterStartupRule.getLocator().getConfigurationPersistenceService();
Configuration group1Config = service.getConfiguration("group1");
- assertThat(group1Config.getCacheXmlContent()).contains("<region name=\"region1\">\n"
+ assertThat(group1Config.getCacheXmlContent()).contains("<region name=\"region1\">"
+ + System.getProperty("line.separator")
+ " <region-attributes data-policy=\"empty\" scope=\"distributed-ack\"/>");
Configuration clusterConfig = service.getConfiguration("group2");
- assertThat(clusterConfig.getCacheXmlContent()).contains("<region name=\"region1\">\n"
+ assertThat(clusterConfig.getCacheXmlContent()).contains("<region name=\"region1\">"
+ + System.getProperty("line.separator")
+ " <region-attributes data-policy=\"replicate\" scope=\"distributed-ack\"/>");
});