You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2017/08/31 01:26:20 UTC
[43/47] geode git commit: GEODE-3539: add test for invalid command
GEODE-3539: add test for invalid command
* also rework GfshCommandIntegrationTest in assembly module
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/17662cd4
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/17662cd4
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/17662cd4
Branch: refs/heads/feature/GEODE-3543
Commit: 17662cd46de7939577b4fc20183319288c655932
Parents: ca0dca5
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Tue Aug 29 15:11:56 2017 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Wed Aug 30 13:37:58 2017 -0700
----------------------------------------------------------------------
.../cli/commands/GemfireCoreClasspathTest.java | 101 +++++++++++
.../commands/GfshCommandIntegrationTest.java | 177 -------------------
.../commands/GfshCommandIntegrationTest.java | 49 +++++
.../cli/commands/StartMemberUtilsTest.java | 91 ++++++++++
4 files changed, 241 insertions(+), 177 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/17662cd4/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java
new file mode 100644
index 0000000..3546b79
--- /dev/null
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java
@@ -0,0 +1,101 @@
+/*
+ * 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.cli.commands;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
+public class GemfireCoreClasspathTest {
+ @Test
+ public void testGemFireCoreClasspath() throws IOException {
+ File coreDependenciesJar = new File(StartMemberUtils.CORE_DEPENDENCIES_JAR_PATHNAME);
+ assertNotNull(coreDependenciesJar);
+ assertTrue(coreDependenciesJar + " is not a file", coreDependenciesJar.isFile());
+ Collection<String> expectedJarDependencies =
+ Arrays.asList("antlr", "commons-io", "commons-lang", "commons-logging", "geode",
+ "jackson-annotations", "jackson-core", "jackson-databind", "jansi", "jline", "snappy",
+ "spring-core", "spring-shell", "jetty-server", "jetty-servlet", "jetty-webapp",
+ "jetty-util", "jetty-http", "servlet-api", "jetty-io", "jetty-security", "jetty-xml");
+ assertJarFileManifestClassPath(coreDependenciesJar, expectedJarDependencies);
+ }
+
+ private void assertJarFileManifestClassPath(final File dependenciesJar,
+ final Collection<String> expectedJarDependencies) throws IOException {
+ JarFile dependenciesJarFile = new JarFile(dependenciesJar);
+ Manifest manifest = dependenciesJarFile.getManifest();
+
+ assertNotNull(manifest);
+
+ Attributes attributes = manifest.getMainAttributes();
+
+ assertNotNull(attributes);
+ assertTrue(attributes.containsKey(Attributes.Name.CLASS_PATH));
+
+ String[] actualJarDependencies = attributes.getValue(Attributes.Name.CLASS_PATH).split(" ");
+
+ assertNotNull(actualJarDependencies);
+ assertTrue(
+ String.format(
+ "Expected the actual number of JAR dependencies to be (%1$d); but was (%2$d)!",
+ expectedJarDependencies.size(), actualJarDependencies.length),
+ actualJarDependencies.length >= expectedJarDependencies.size());
+ // assertTrue(Arrays.asList(actualJarDependencies).containsAll(expectedJarDependencies));
+
+ List<String> actualJarDependenciesList = new ArrayList<>(Arrays.asList(actualJarDependencies));
+ List<String> missingExpectedJarDependenciesList =
+ new ArrayList<>(expectedJarDependencies.size());
+
+ for (String expectedJarDependency : expectedJarDependencies) {
+ boolean containsExpectedJar = false;
+
+ for (int index = 0, size = actualJarDependenciesList.size(); index < size; index++) {
+ if (actualJarDependenciesList.get(index).toLowerCase()
+ .contains(expectedJarDependency.toLowerCase())) {
+ actualJarDependenciesList.remove(index);
+ containsExpectedJar = true;
+ break;
+ }
+ }
+
+ if (!containsExpectedJar) {
+ missingExpectedJarDependenciesList.add(expectedJarDependency);
+ }
+ }
+
+ assertTrue(
+ String.format(
+ "GemFire dependencies JAR file (%1$s) does not contain the expected dependencies (%2$s) in the Manifest Class-Path attribute (%3$s)!",
+ dependenciesJar, missingExpectedJarDependenciesList,
+ attributes.getValue(Attributes.Name.CLASS_PATH)),
+ missingExpectedJarDependenciesList.isEmpty());
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/17662cd4/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java
deleted file mode 100644
index 263b12c..0000000
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java
+++ /dev/null
@@ -1,177 +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.cli.commands;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-
-import org.apache.commons.io.FileUtils;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestName;
-
-import org.apache.geode.internal.util.IOUtils;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-
-@Category(IntegrationTest.class)
-public class GfshCommandIntegrationTest {
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
- @Rule
- public TestName testName = new TestName();
-
- @Test
- public void workingDirDefaultsToMemberName() {
- StartServerCommand startServer = new StartServerCommand();
- String workingDir = StartMemberUtils.resolveWorkingDir(null, "server1");
- assertThat(new File(workingDir)).exists();
- assertThat(workingDir).endsWith("server1");
- }
-
- @Test
- public void workingDirGetsCreatedIfNecessary() throws Exception {
- File workingDir = temporaryFolder.newFolder("foo");
- FileUtils.deleteQuietly(workingDir);
- String workingDirString = workingDir.getAbsolutePath();
-
- StartServerCommand startServer = new StartServerCommand();
-
- String resolvedWorkingDir = StartMemberUtils.resolveWorkingDir(workingDirString, "server1");
- assertThat(new File(resolvedWorkingDir)).exists();
- assertThat(workingDirString).endsWith("foo");
- }
-
- @Test
- public void testWorkingDirWithRelativePath() throws Exception {
- Path relativePath = Paths.get("some").resolve("relative").resolve("path");
- assertThat(relativePath.isAbsolute()).isFalse();
-
- StartServerCommand startServer = new StartServerCommand();
-
- String resolvedWorkingDir =
- StartMemberUtils.resolveWorkingDir(relativePath.toString(), "server1");
-
- assertThat(resolvedWorkingDir).isEqualTo(relativePath.toAbsolutePath().toString());
- }
-
- @Test
- public void testReadPid() throws IOException {
- final int expectedPid = 12345;
-
- File folder = temporaryFolder.newFolder();
- File pidFile =
- new File(folder, getClass().getSimpleName() + "_" + testName.getMethodName() + ".pid");
-
- assertTrue(pidFile.createNewFile());
-
- pidFile.deleteOnExit();
- writePid(pidFile, expectedPid);
-
- final int actualPid = StartMemberUtils.readPid(pidFile);
-
- assertEquals(expectedPid, actualPid);
- }
-
- @Test
- public void testGemFireCoreClasspath() throws IOException {
- File coreDependenciesJar = new File(StartMemberUtils.CORE_DEPENDENCIES_JAR_PATHNAME);
- assertNotNull(coreDependenciesJar);
- assertTrue(coreDependenciesJar + " is not a file", coreDependenciesJar.isFile());
- Collection<String> expectedJarDependencies =
- Arrays.asList("antlr", "commons-io", "commons-lang", "commons-logging", "geode",
- "jackson-annotations", "jackson-core", "jackson-databind", "jansi", "jline", "snappy",
- "spring-core", "spring-shell", "jetty-server", "jetty-servlet", "jetty-webapp",
- "jetty-util", "jetty-http", "servlet-api", "jetty-io", "jetty-security", "jetty-xml");
- assertJarFileManifestClassPath(coreDependenciesJar, expectedJarDependencies);
- }
-
- private void assertJarFileManifestClassPath(final File dependenciesJar,
- final Collection<String> expectedJarDependencies) throws IOException {
- JarFile dependenciesJarFile = new JarFile(dependenciesJar);
- Manifest manifest = dependenciesJarFile.getManifest();
-
- assertNotNull(manifest);
-
- Attributes attributes = manifest.getMainAttributes();
-
- assertNotNull(attributes);
- assertTrue(attributes.containsKey(Attributes.Name.CLASS_PATH));
-
- String[] actualJarDependencies = attributes.getValue(Attributes.Name.CLASS_PATH).split(" ");
-
- assertNotNull(actualJarDependencies);
- assertTrue(
- String.format(
- "Expected the actual number of JAR dependencies to be (%1$d); but was (%2$d)!",
- expectedJarDependencies.size(), actualJarDependencies.length),
- actualJarDependencies.length >= expectedJarDependencies.size());
- // assertTrue(Arrays.asList(actualJarDependencies).containsAll(expectedJarDependencies));
-
- List<String> actualJarDependenciesList = new ArrayList<>(Arrays.asList(actualJarDependencies));
- List<String> missingExpectedJarDependenciesList =
- new ArrayList<>(expectedJarDependencies.size());
-
- for (String expectedJarDependency : expectedJarDependencies) {
- boolean containsExpectedJar = false;
-
- for (int index = 0, size = actualJarDependenciesList.size(); index < size; index++) {
- if (actualJarDependenciesList.get(index).toLowerCase()
- .contains(expectedJarDependency.toLowerCase())) {
- actualJarDependenciesList.remove(index);
- containsExpectedJar = true;
- break;
- }
- }
-
- if (!containsExpectedJar) {
- missingExpectedJarDependenciesList.add(expectedJarDependency);
- }
- }
-
- assertTrue(
- String.format(
- "GemFire dependencies JAR file (%1$s) does not contain the expected dependencies (%2$s) in the Manifest Class-Path attribute (%3$s)!",
- dependenciesJar, missingExpectedJarDependenciesList,
- attributes.getValue(Attributes.Name.CLASS_PATH)),
- missingExpectedJarDependenciesList.isEmpty());
- }
-
- private void writePid(final File pidFile, final int pid) throws IOException {
- final FileWriter fileWriter = new FileWriter(pidFile, false);
- fileWriter.write(String.valueOf(pid));
- fileWriter.write("\n");
- fileWriter.flush();
- IOUtils.close(fileWriter);
- }
-}
http://git-wip-us.apache.org/repos/asf/geode/blob/17662cd4/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java
new file mode 100644
index 0000000..6aebdfe
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandIntegrationTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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.cli.commands;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.test.dunit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.dunit.rules.LocatorStarterRule;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
+public class GfshCommandIntegrationTest {
+ @ClassRule
+ public static LocatorStarterRule locator = new LocatorStarterRule().withAutoStart();
+
+ @Rule
+ public GfshShellConnectionRule gfsh = new GfshShellConnectionRule();
+
+ @Test
+ public void invalidCommandWhenNotConnected() throws Exception {
+ String result = gfsh.execute("abc");
+ assertThat(result).contains("Command 'abc' not found");
+ }
+
+ @Test
+ public void invalidCommandWhenConnected() throws Exception {
+ gfsh.connectAndVerify(locator);
+ String result = gfsh.execute("abc");
+ assertThat(result).contains("Command 'abc' not found");
+ }
+}
http://git-wip-us.apache.org/repos/asf/geode/blob/17662cd4/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/StartMemberUtilsTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/StartMemberUtilsTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/StartMemberUtilsTest.java
new file mode 100644
index 0000000..d84f788
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/StartMemberUtilsTest.java
@@ -0,0 +1,91 @@
+/*
+ * 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.cli.commands;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+
+import org.apache.geode.internal.util.IOUtils;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
+public class StartMemberUtilsTest {
+
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+ @Test
+ public void workingDirDefaultsToMemberName() {
+ String workingDir = StartMemberUtils.resolveWorkingDir(null, "server1");
+ assertThat(new File(workingDir)).exists();
+ assertThat(workingDir).endsWith("server1");
+ }
+
+ @Test
+ public void workingDirGetsCreatedIfNecessary() throws Exception {
+ File workingDir = temporaryFolder.newFolder("foo");
+ FileUtils.deleteQuietly(workingDir);
+ String workingDirString = workingDir.getAbsolutePath();
+ String resolvedWorkingDir = StartMemberUtils.resolveWorkingDir(workingDirString, "server1");
+ assertThat(new File(resolvedWorkingDir)).exists();
+ assertThat(workingDirString).endsWith("foo");
+ }
+
+ @Test
+ public void testWorkingDirWithRelativePath() throws Exception {
+ Path relativePath = Paths.get("some").resolve("relative").resolve("path");
+ assertThat(relativePath.isAbsolute()).isFalse();
+ String resolvedWorkingDir =
+ StartMemberUtils.resolveWorkingDir(relativePath.toString(), "server1");
+ assertThat(resolvedWorkingDir).isEqualTo(relativePath.toAbsolutePath().toString());
+ }
+
+ @Test
+ public void testReadPid() throws IOException {
+ final int expectedPid = 12345;
+ File folder = temporaryFolder.newFolder();
+ File pidFile = new File(folder, "my.pid");
+
+ assertTrue(pidFile.createNewFile());
+
+ pidFile.deleteOnExit();
+ writePid(pidFile, expectedPid);
+
+ final int actualPid = StartMemberUtils.readPid(pidFile);
+ assertEquals(expectedPid, actualPid);
+ }
+
+ private void writePid(final File pidFile, final int pid) throws IOException {
+ final FileWriter fileWriter = new FileWriter(pidFile, false);
+ fileWriter.write(String.valueOf(pid));
+ fileWriter.write("\n");
+ fileWriter.flush();
+ IOUtils.close(fileWriter);
+ }
+}