geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinmeil...@apache.org
Subject [3/3] geode git commit: GEODE-2430: Fix failing tests
Date Wed, 08 Feb 2017 00:11:04 GMT
GEODE-2430: Fix failing tests

* this closes #395

(cherry picked from commit 147eb7c)


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/2286fd06
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/2286fd06
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/2286fd06

Branch: refs/heads/release/1.1.0
Commit: 2286fd064a52173eab8fdcfadfb89a01e81ef728
Parents: 831fa44
Author: Jared Stewart <jstewart@pivotal.io>
Authored: Tue Feb 7 09:35:10 2017 -0800
Committer: Jinmei Liao <jiliao@pivotal.io>
Committed: Tue Feb 7 16:09:44 2017 -0800

----------------------------------------------------------------------
 .../management/internal/configuration/ClusterConfigBaseTest.java | 4 ++--
 .../internal/configuration/ClusterConfigImportDUnitTest.java     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/2286fd06/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigBaseTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigBaseTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigBaseTest.java
index 3a3c74c..cc0fff2 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigBaseTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigBaseTest.java
@@ -100,12 +100,12 @@ public class ClusterConfigBaseTest extends JUnit4DistributedTestCase
{
         + "<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);

http://git-wip-us.apache.org/repos/asf/geode/blob/2286fd06/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java
index 7ae74a9..45ac50e 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigImportDUnitTest.java
@@ -204,9 +204,8 @@ public class ClusterConfigImportDUnitTest extends ClusterConfigBaseTest
{
 
     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);
       }


Mime
View raw message