You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2019/05/10 22:38:50 UTC
[geode] branch develop updated: GEODE-6672: persist the diskstore
dir correctly in cluster configuration (fix path tests on windows)
This is an automated email from the ASF dual-hosted git repository.
onichols 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 8dc4d0d GEODE-6672: persist the diskstore dir correctly in cluster configuration (fix path tests on windows)
8dc4d0d is described below
commit 8dc4d0daeee35024df51952def5c8deb9957e45c
Author: Owen Nichols <on...@pivotal.io>
AuthorDate: Fri May 10 15:37:47 2019 -0700
GEODE-6672: persist the diskstore dir correctly in cluster configuration (fix path tests on windows)
---
.../java/org/apache/geode/cache/configuration/RegionConfigTest.java | 4 ++--
.../management/internal/cli/commands/CreateDiskStoreCommandTest.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/configuration/RegionConfigTest.java b/geode-core/src/test/java/org/apache/geode/cache/configuration/RegionConfigTest.java
index 4e8b79c..ae71b84 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/configuration/RegionConfigTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/configuration/RegionConfigTest.java
@@ -211,7 +211,7 @@ public class RegionConfigTest {
String xml2 = service.marshall(cacheConfig);
System.out.println(xml2);
- assertThat(xml).contains(diskStoreXml);
+ assertThat(xml.replace('\\', '/')).contains(diskStoreXml);
}
@Test
@@ -232,7 +232,7 @@ public class RegionConfigTest {
String goldenJson =
"\"diskDirs\":[{\"content\":\"./data/persist\"},{\"content\":\"/data/persist\"}]";
- assertThat(json).contains(goldenJson);
+ assertThat(json.replace('\\', '/')).contains(goldenJson);
DiskStoreType newDiskStore = mapper.readValue(json, DiskStoreType.class);
assertThat(newDiskStore.getDiskDirs()).hasSize(2);
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDiskStoreCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDiskStoreCommandTest.java
index 6175c88..d8042c9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDiskStoreCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDiskStoreCommandTest.java
@@ -58,7 +58,7 @@ public class CreateDiskStoreCommandTest {
DiskStoreType diskStoreType = (DiskStoreType) resultModel.getConfigObject();
DiskDirType diskDirType = diskStoreType.getDiskDirs().get(0);
- assertThat(diskDirType.getContent()).isEqualTo("./data/persist");
+ assertThat(diskDirType.getContent().replace('\\', '/')).isEqualTo("./data/persist");
}
@Test
@@ -73,6 +73,6 @@ public class CreateDiskStoreCommandTest {
DiskStoreType diskStoreType = (DiskStoreType) resultModel.getConfigObject();
DiskDirType diskDirType = diskStoreType.getDiskDirs().get(0);
- assertThat(diskDirType.getContent()).isEqualTo("/data/persist");
+ assertThat(diskDirType.getContent().replace('\\', '/')).isEqualTo("/data/persist");
}
}