This is an automated email from the ASF dual-hosted git repository. edimitrova pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 51c6669676c1ce825930145115e542032ed447a5 Merge: 2227057 f74ce55 Author: Ekaterina Dimitrova <[email protected]> AuthorDate: Thu Jun 3 20:51:47 2021 -0400 Merge branch 'cassandra-4.0' into trunk .../org/apache/cassandra/tools/nodetool/StatusTest.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --cc test/unit/org/apache/cassandra/tools/nodetool/StatusTest.java index 494d365,e3be5d9..18b716e --- a/test/unit/org/apache/cassandra/tools/nodetool/StatusTest.java +++ b/test/unit/org/apache/cassandra/tools/nodetool/StatusTest.java @@@ -77,28 -81,26 +79,27 @@@ public class StatusTest extends CQLTest schemaChange("DROP KEYSPACE " + CQLTester.KEYSPACE); schemaChange("DROP KEYSPACE " + CQLTester.KEYSPACE_PER_TEST); - ToolRunner.ToolResult nodetool = ToolRunner.invokeNodetool("status"); - nodetool.assertOnCleanExit(); - String[] lines = PATTERN.split(nodetool.getStdout()); + ToolRunner.ToolResult tool = ToolRunner.invokeNodetool("status"); + tool.assertOnCleanExit(); - String[] lines = tool.getStdout().split("\\R"); ++ String[] lines = PATTERN.split(tool.getStdout()); String hostStatus = lines[lines.length-3].trim(); - assertThat(hostStatus, startsWith("UN")); - assertThat(hostStatus, containsString(FBUtilities.getJustLocalAddress().getHostAddress())); - assertThat(hostStatus, matchesPattern(".*\\d+\\.?\\d+ KiB.*")); - assertThat(hostStatus, containsString(localHostId)); - assertThat(hostStatus, containsString(token)); - assertThat(hostStatus, endsWith(SimpleSnitch.RACK_NAME)); + assertThat(hostStatus).startsWith("UN"); + assertThat(hostStatus).contains(FBUtilities.getJustLocalAddress().getHostAddress()); - assertThat(hostStatus).containsPattern("\\d+\\.\\d+ KiB"); ++ assertThat(hostStatus).containsPattern("\\d+\\.?\\d+ KiB"); + assertThat(hostStatus).contains(localHostId); + assertThat(hostStatus).contains(token); + assertThat(hostStatus).endsWith(SimpleSnitch.RACK_NAME); String bootstrappingWarn = lines[lines.length-1].trim(); - assertThat(bootstrappingWarn, containsString("probably still bootstrapping. Effective ownership information is meaningless.")); + assertThat(bootstrappingWarn) + .contains("probably still bootstrapping. Effective ownership information is meaningless."); } - @SuppressWarnings("DynamicRegexReplaceableByCompiledPattern") private void validateStatusOutput(String hostForm, String... args) { - ToolRunner.ToolResult nodetool = ToolRunner.invokeNodetool(args); - nodetool.assertOnCleanExit(); + ToolRunner.ToolResult tool = ToolRunner.invokeNodetool(args); + tool.assertOnCleanExit(); /* Datacenter: datacenter1 ======================= @@@ -107,16 -109,16 +108,16 @@@ -- Address Load Owns (effective) Host ID Token Rack UN localhost 45.71 KiB 100.0% 0b1b5e91-ad3b-444e-9c24-50578486978a 1849950853373272258 rack1 */ - String[] lines = tool.getStdout().split("\\R"); - String[] lines = PATTERN.split(nodetool.getStdout()); - assertThat(lines[0].trim(), endsWith(SimpleSnitch.DATA_CENTER_NAME)); ++ String[] lines = PATTERN.split(tool.getStdout()); + assertThat(lines[0].trim()).endsWith(SimpleSnitch.DATA_CENTER_NAME); String hostStatus = lines[lines.length-1].trim(); - assertThat(hostStatus, startsWith("UN")); - assertThat(hostStatus, containsString(hostForm)); - assertThat(hostStatus, matchesPattern(".*\\d+\\.?\\d+ KiB.*")); - assertThat(hostStatus, matchesPattern(".*\\d+\\.\\d+%.*")); - assertThat(hostStatus, containsString(localHostId)); - assertThat(hostStatus, containsString(token)); - assertThat(hostStatus, endsWith(SimpleSnitch.RACK_NAME)); - assertThat(hostStatus, not(containsString("?"))); + assertThat(hostStatus).startsWith("UN"); + assertThat(hostStatus).contains(hostForm); - assertThat(hostStatus).containsPattern("\\d+\\.\\d+ KiB"); ++ assertThat(hostStatus).containsPattern("\\d+\\.?\\d+ KiB"); + assertThat(hostStatus).containsPattern("\\d+\\.\\d+%"); + assertThat(hostStatus).contains(localHostId); + assertThat(hostStatus).contains(token); + assertThat(hostStatus).endsWith(SimpleSnitch.RACK_NAME); + assertThat(hostStatus).doesNotContain("?"); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
