GEODE-2430: Fix failing tests

* this closes apache#395 (cherry picked from commit 147eb7c)
GYan-Pivotal · Feb 8, 2017 · 2286fd0 · 2286fd0
1 parent 831fa44
commit 2286fd0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/...c/test/java/org/apache/geode/management/internal/configuration/ClusterConfigBaseTest.java b/...c/test/java/org/apache/geode/management/internal/configuration/ClusterConfigBaseTest.java
@@ -100,12 +100,12 @@ private String buildClusterZipFile() throws Exception {
         + "<region name=\"regionForGroup2\">\n"
         + "    <region-attributes data-policy=\"replicate\" scope=\"distributed-ack\"/>\n"
         + "  </region>\n" + "</cache>\n";
-    writeFile(group2Dir, "group1.xml", group2Xml);
+    writeFile(group2Dir, "group2.xml", group2Xml);
     writeFile(group2Dir, "group2.properties", "log-file-size-limit=7000");
     createJarFileWithClass("Group2", "group2.jar", group2Dir);
 
 
-    File clusterConfigZip = lsRule.getTempFolder().newFile("cluster_config.zip");
+    File clusterConfigZip = new File(lsRule.getTempFolder().newFolder(), "cluster_config.zip");
     ZipUtils.zipDirectory(clusterConfigDir.getCanonicalPath(), clusterConfigZip.getCanonicalPath());
 
     FileUtils.deleteDirectory(clusterConfigDir);

diff --git a/...java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java b/...java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java
@@ -204,9 +204,8 @@ public void testExportClusterConfig() throws Exception {
 
     Set<String> expectedZipEntries = new HashSet<>();
     for (ConfigGroup group : expectedExportedClusterConfig.getGroups()) {
-      String groupDir = group.getName() + "/";
+      String groupDir = group.getName() + File.separator;
 
-      expectedZipEntries.add(groupDir);
       for (String jarOrXmlOrPropFile : group.getAllFiles()) {
         expectedZipEntries.add(groupDir + jarOrXmlOrPropFile);
       }