You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/12/15 18:57:29 UTC
[3/4] geode git commit: potential changes
potential changes
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/eb937f50
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/eb937f50
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/eb937f50
Branch: refs/heads/feature/GEODE-2197
Commit: eb937f50e3f20646d8d13a96c27d453f6e75a4dd
Parents: 3542bc8
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Tue Dec 13 08:07:08 2016 -0800
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Tue Dec 13 08:07:08 2016 -0800
----------------------------------------------------------------------
.../configuration/ClusterConfigDUnitTest.java | 14 ++------
.../ClusterConfigIntegrationTest.java | 37 --------------------
2 files changed, 2 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/eb937f50/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDUnitTest.java
index 0ed5982..9226a92 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigDUnitTest.java
@@ -25,13 +25,6 @@ import static org.apache.geode.distributed.ConfigurationProperties.LOAD_CLUSTER_
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE_SIZE_LIMIT;
import static org.apache.geode.distributed.ConfigurationProperties.USE_CLUSTER_CONFIGURATION;
-import static org.apache.geode.management.internal.configuration.ClusterConfigDUnitTest.EXPORTED_CLUSTER_CONFIG_ZIP_FILENAME;
-import static org.apache.geode.management.internal.configuration.ClusterConfigDUnitTest.GROUP1;
-import static org.apache.geode.management.internal.configuration.ClusterConfigDUnitTest.GROUP1_AND_2;
-import static org.apache.geode.management.internal.configuration.ClusterConfigDUnitTest.GROUP2;
-import static org.apache.geode.management.internal.configuration.ClusterConfigDUnitTest.NO_GROUP;
-import static org.apache.geode.management.internal.configuration.ClusterConfigDUnitTest.verifyLocatorConfig;
-import static org.apache.geode.management.internal.configuration.ClusterConfigDUnitTest.verifyServerConfig;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.geode.cache.Cache;
@@ -362,12 +355,14 @@ public class ClusterConfigDUnitTest extends JUnit4DistributedTestCase {
expectedJarNames.add(getServerJarName(jarName));
}
+ // make sure each expected jar is in the working dir
for (String jarName : expectedJarNames) {
assertThat(workingDir.listFiles()).contains(new File(workingDir, jarName));
}
File[] acutalJars = workingDir.listFiles(pathname -> pathname.getName().contains(".jar"));
+ // make sure the workingdir contains only jars in the list
for (File jar : acutalJars) {
assertThat(expectedJarNames).contains(jar.getName());
}
@@ -403,11 +398,6 @@ public class ClusterConfigDUnitTest extends JUnit4DistributedTestCase {
assertThat(new File(workingDir, relativePath)).exists();
}
- public static void verifyFileNotExist(Member member, String relativePath) {
- File workingDir = member.getWorkingDir();
- assertThat(new File(workingDir, relativePath)).doesNotExist();
- }
-
private static class ExpectedConfig implements Serializable {
public String maxLogFileSize;
public String[] regions = new String[] {};
http://git-wip-us.apache.org/repos/asf/geode/blob/eb937f50/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigIntegrationTest.java
deleted file mode 100644
index 9c052ca..0000000
--- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigIntegrationTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geode.management.internal.configuration;
-
-import static org.apache.geode.distributed.ConfigurationProperties.LOAD_CLUSTER_CONFIGURATION_FROM_DIR;
-
-import org.apache.geode.test.dunit.rules.LocatorStarterRule;
-import org.junit.Test;
-
-import java.util.Properties;
-
-public class ClusterConfigIntegrationTest {
-
- @Test
- public void test() throws Exception {
- LocatorStarterRule lRule = new LocatorStarterRule(new Properties(){{
- setProperty(LOAD_CLUSTER_CONFIGURATION_FROM_DIR, "true");
- }});
-
- lRule.startLocator();
- }
-}