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 2017/06/06 20:12:49 UTC
[1/2] geode git commit: GEODE-2981: Fix the line feed code of the
test expected value
Repository: geode
Updated Branches:
refs/heads/release/1.2.0 103090c5a -> d4f7a2808
GEODE-2981: Fix the line feed code of the test expected value
* Fixed the line feed code of the test expectation value so that it does
not depend on the runtime environment.
* this closes #530
(cherry picked from commit c870c99)
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a91bbf49
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a91bbf49
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a91bbf49
Branch: refs/heads/release/1.2.0
Commit: a91bbf4986415e85d7bdce8818df206f2effa1f4
Parents: 103090c
Author: masaki.yamakawa <ma...@ulsystems.co.jp>
Authored: Wed May 24 02:29:46 2017 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Tue Jun 6 13:11:50 2017 -0700
----------------------------------------------------------------------
.../internal/cli/help/HelpBlockUnitTest.java | 8 +++-
.../internal/cli/help/HelperUnitTest.java | 41 ++++++++++----------
.../internal/cli/shell/GfshJunitTest.java | 4 +-
3 files changed, 31 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/a91bbf49/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java
index 4eb4abf..3dc61b6 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelpBlockUnitTest.java
@@ -17,6 +17,7 @@ package org.apache.geode.management.internal.cli.help;
import static org.assertj.core.api.Assertions.assertThat;
+import org.apache.geode.management.internal.cli.GfshParser;
import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
import org.junit.Test;
@@ -70,7 +71,12 @@ public class HelpBlockUnitTest {
firstBlock.addChild(secondBlock);
secondBlock.addChild(thirdBlock);
+ StringBuilder expected = new StringBuilder();
+ expected.append("First Line").append(GfshParser.LINE_SEPARATOR);
+ expected.append("Second Line").append(GfshParser.LINE_SEPARATOR);
+ expected.append("Third Line").append(GfshParser.LINE_SEPARATOR);
+
String result = firstBlock.toString(-1);
- assertThat(result).isEqualTo("First Line\nSecond Line\nThird Line\n");
+ assertThat(result).isEqualTo(expected.toString());
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a91bbf49/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java
index ab0c176..58d09f0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/help/HelperUnitTest.java
@@ -19,6 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import static org.apache.geode.management.internal.cli.GfshParser.LINE_SEPARATOR;
import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
import org.junit.Test;
@@ -71,7 +72,7 @@ public class HelperUnitTest {
@Test
public void testGetLongHelp() {
HelpBlock helpBlock = helper.getHelp(cliCommand, annotations, parameterType);
- String[] helpLines = helpBlock.toString().split("\n");
+ String[] helpLines = helpBlock.toString().split(LINE_SEPARATOR);
assertThat(helpLines.length).isEqualTo(14);
assertThat(helpLines[0]).isEqualTo(Helper.NAME_NAME);
assertThat(helpLines[2]).isEqualTo(Helper.IS_AVAILABLE_NAME);
@@ -84,7 +85,7 @@ public class HelperUnitTest {
@Test
public void testGetShortHelp() {
HelpBlock helpBlock = helper.getHelp(cliCommand, null, null);
- String[] helpLines = helpBlock.toString().split("\n");
+ String[] helpLines = helpBlock.toString().split(LINE_SEPARATOR);
assertThat(helpLines.length).isEqualTo(2);
assertThat(helpLines[0]).isEqualTo("test (Available)");
assertThat(helpLines[1]).isEqualTo("This is a test description");
@@ -95,8 +96,8 @@ public class HelperUnitTest {
String syntax = helper.getSyntaxString("test", annotations, parameterType);
assertThat(syntax).isEqualTo("test --option=value");
optionBlock = helper.getOptionDetail(cliOption);
- assertThat(optionBlock.toString())
- .isEqualTo("option\n" + "help of option\n" + "Required: true\n");
+ assertThat(optionBlock.toString()).isEqualTo("option" + LINE_SEPARATOR + "help of option"
+ + LINE_SEPARATOR + "Required: true" + LINE_SEPARATOR);
}
@Test
@@ -105,8 +106,8 @@ public class HelperUnitTest {
String syntax = helper.getSyntaxString("test", annotations, parameterType);
assertThat(syntax).isEqualTo("test [--option=value]");
optionBlock = helper.getOptionDetail(cliOption);
- assertThat(optionBlock.toString())
- .isEqualTo("option\n" + "help of option\n" + "Required: false\n");
+ assertThat(optionBlock.toString()).isEqualTo("option" + LINE_SEPARATOR + "help of option"
+ + LINE_SEPARATOR + "Required: false" + LINE_SEPARATOR);
}
@Test
@@ -116,7 +117,8 @@ public class HelperUnitTest {
assertThat(syntax).isEqualTo("test --option=value");
optionBlock = helper.getOptionDetail(cliOption);
assertThat(optionBlock.toString())
- .isEqualTo("option\n" + "help of option\n" + "Synonyms: option2\n" + "Required: true\n");
+ .isEqualTo("option" + LINE_SEPARATOR + "help of option" + LINE_SEPARATOR
+ + "Synonyms: option2" + LINE_SEPARATOR + "Required: true" + LINE_SEPARATOR);
}
@Test
@@ -126,8 +128,8 @@ public class HelperUnitTest {
String syntax = helper.getSyntaxString("test", annotations, parameterType);
assertThat(syntax).isEqualTo("test option2");
optionBlock = helper.getOptionDetail(cliOption);
- assertThat(optionBlock.toString())
- .isEqualTo("option2\n" + "help of option\n" + "Required: true\n");
+ assertThat(optionBlock.toString()).isEqualTo("option2" + LINE_SEPARATOR + "help of option"
+ + LINE_SEPARATOR + "Required: true" + LINE_SEPARATOR);
}
@Test
@@ -137,8 +139,8 @@ public class HelperUnitTest {
String syntax = helper.getSyntaxString("test", annotations, parameterType);
assertThat(syntax).isEqualTo("test [option2]");
optionBlock = helper.getOptionDetail(cliOption);
- assertThat(optionBlock.toString())
- .isEqualTo("option2\n" + "help of option\n" + "Required: false\n");
+ assertThat(optionBlock.toString()).isEqualTo("option2" + LINE_SEPARATOR + "help of option"
+ + LINE_SEPARATOR + "Required: false" + LINE_SEPARATOR);
}
@Test
@@ -147,8 +149,8 @@ public class HelperUnitTest {
String syntax = helper.getSyntaxString("test", annotations, parameterType);
assertThat(syntax).isEqualTo("test --option=value(,value)*");
optionBlock = helper.getOptionDetail(cliOption);
- assertThat(optionBlock.toString())
- .isEqualTo("option\n" + "help of option\n" + "Required: true\n");
+ assertThat(optionBlock.toString()).isEqualTo("option" + LINE_SEPARATOR + "help of option"
+ + LINE_SEPARATOR + "Required: true" + LINE_SEPARATOR);
}
@Test
@@ -158,9 +160,9 @@ public class HelperUnitTest {
assertThat(syntax).isEqualTo("test --option(=value)?");
optionBlock = helper.getOptionDetail(cliOption);
- assertThat(optionBlock.toString()).isEqualTo("option\n" + "help of option\n"
- + "Required: true\n" + "Default (if the parameter is specified without value): true\n");
-
+ assertThat(optionBlock.toString()).isEqualTo("option" + LINE_SEPARATOR + "help of option"
+ + LINE_SEPARATOR + "Required: true" + LINE_SEPARATOR
+ + "Default (if the parameter is specified without value): true" + LINE_SEPARATOR);
}
@Test
@@ -171,10 +173,9 @@ public class HelperUnitTest {
assertThat(syntax).isEqualTo("test --option(=value)?(,value)*");
optionBlock = helper.getOptionDetail(cliOption);
- assertThat(optionBlock.toString())
- .isEqualTo("option\n" + "help of option\n" + "Required: true\n"
- + "Default (if the parameter is specified without value): value1,value2\n");
-
+ assertThat(optionBlock.toString()).isEqualTo("option" + LINE_SEPARATOR + "help of option"
+ + LINE_SEPARATOR + "Required: true" + LINE_SEPARATOR
+ + "Default (if the parameter is specified without value): value1,value2" + LINE_SEPARATOR);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/a91bbf49/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java
index 2a9c0d0..bf10904 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshJunitTest.java
@@ -17,6 +17,7 @@ package org.apache.geode.management.internal.cli.shell;
import static org.assertj.core.api.Assertions.assertThat;
+import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
import org.junit.Test;
@@ -36,7 +37,8 @@ public class GfshJunitTest {
assertThat(Gfsh.wrapText(testString, 0, -1)).isEqualTo(testString);
assertThat(Gfsh.wrapText(testString, 0, 0)).isEqualTo(testString);
assertThat(Gfsh.wrapText(testString, 0, 1)).isEqualTo(testString);
- assertThat(Gfsh.wrapText(testString, 0, 10)).isEqualTo("This is a\ntest\nstring.");
+ assertThat(Gfsh.wrapText(testString, 0, 10))
+ .isEqualTo("This is a" + Gfsh.LINE_SEPARATOR + "test" + Gfsh.LINE_SEPARATOR + "string.");
assertThat(Gfsh.wrapText(testString, 1, 100)).isEqualTo(Gfsh.LINE_INDENT + testString);
assertThat(Gfsh.wrapText(testString, 2, 100))
.isEqualTo(Gfsh.LINE_INDENT + Gfsh.LINE_INDENT + testString);
[2/2] geode git commit: GEODE-3033: Fixing NPE when jarFileNames is
null in ClusterConfigurationLoader
Posted by ji...@apache.org.
GEODE-3033: Fixing NPE when jarFileNames is null in ClusterConfigurationLoader
* this closes #561
(cherry picked from commit f8c5048)
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d4f7a280
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d4f7a280
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d4f7a280
Branch: refs/heads/release/1.2.0
Commit: d4f7a2808f4814217c00d396cb1d3037b81f6def
Parents: a91bbf4
Author: YehEmily <em...@gmail.com>
Authored: Mon Jun 5 14:21:31 2017 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Tue Jun 6 13:12:00 2017 -0700
----------------------------------------------------------------------
.../apache/geode/internal/cache/ClusterConfigurationLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/d4f7a280/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
index 37f2120..4f4881f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ClusterConfigurationLoader.java
@@ -72,9 +72,9 @@ public class ClusterConfigurationLoader {
String[] jarFileNames = response.getJarNames();
byte[][] jarBytes = response.getJars();
- logger.info("Got response with jars: {}", Stream.of(jarFileNames).collect(joining(",")));
if (jarFileNames != null && jarBytes != null) {
+ logger.info("Got response with jars: {}", Stream.of(jarFileNames).collect(joining(",")));
JarDeployer jarDeployer = ClassPathLoader.getLatest().getJarDeployer();
jarDeployer.suspendAll();
try {