natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace getStderr calls with getCleanedStderr calls in tests checking for emptiness 

Patch by Jon Meredith; reviewed by Josh McKenzie and Berenguer Blasi for CASSANDRA-17815

Co-authored-by: Jon Meredith <jmeredithco@gmail.com>
Co-authored-by: Josh McKenzie <jmckenzie@apache.org>
This commit is contained in:
Josh McKenzie 2022-08-12 12:43:26 -04:00 committed by Alex Petrov
parent aa20c9ab11
commit 9ebe0aa08a
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/unit/org/apache/cassandra/tools/SSTableMetadataViewerTest.java
View File

@ -108,7 +108,7 @@ public class SSTableMetadataViewerTest extends OfflineToolUtils
assertTrue(tool.getStdout(), CharMatcher.ascii().matchesAllOf(tool.getStdout()));
Assertions.assertThat(tool.getStdout()).doesNotContain("Widest Partitions");
Assertions.assertThat(tool.getStdout()).contains(sstable.replaceAll("-Data\\.db$", ""));
assertTrue(tool.getStderr(), tool.getStderr().isEmpty());
assertTrue(tool.getCleanedStderr(), tool.getCleanedStderr().isEmpty());
assertEquals(0, tool.getExitCode());
assertGoodEnvPostTest();
}
@ -123,7 +123,7 @@ public class SSTableMetadataViewerTest extends OfflineToolUtils
ToolResult tool = ToolRunner.invokeClass(SSTableMetadataViewer.class, arg, sstable);
Assertions.assertThat(tool.getStdout()).contains(Util.BLUE);
Assertions.assertThat(tool.getStdout()).contains(sstable.replaceAll("-Data\\.db$", ""));
assertTrue("Arg: [" + arg + "]\n" + tool.getStderr(), tool.getStderr().isEmpty());
assertTrue("Arg: [" + arg + "]\n" + tool.getCleanedStderr(), tool.getCleanedStderr().isEmpty());
assertEquals(0, tool.getExitCode());
assertGoodEnvPostTest();
});
@ -139,7 +139,7 @@ public class SSTableMetadataViewerTest extends OfflineToolUtils
ToolResult tool = ToolRunner.invokeClass(SSTableMetadataViewer.class, arg, sstable);
assertTrue(tool.getStdout(), !CharMatcher.ascii().matchesAllOf(tool.getStdout()));
Assertions.assertThat(tool.getStdout()).contains(sstable.replaceAll("-Data\\.db$", ""));
assertTrue("Arg: [" + arg + "]\n" + tool.getStderr(), tool.getStderr().isEmpty());
assertTrue("Arg: [" + arg + "]\n" + tool.getCleanedStderr(), tool.getCleanedStderr().isEmpty());
assertEquals(0, tool.getExitCode());
assertGoodEnvPostTest();
});
@ -211,7 +211,7 @@ public class SSTableMetadataViewerTest extends OfflineToolUtils
ToolResult tool = ToolRunner.invokeClass(SSTableMetadataViewer.class, arg, sstable);
Assertions.assertThat(tool.getStdout()).contains("Widest Partitions");
Assertions.assertThat(tool.getStdout()).contains(sstable.replaceAll("-Data\\.db$", ""));
assertTrue("Arg: [" + arg + "]\n" + tool.getStderr(), tool.getStderr().isEmpty());
assertTrue("Arg: [" + arg + "]\n" + tool.getCleanedStderr(), tool.getCleanedStderr().isEmpty());
assertEquals(0, tool.getExitCode());
});
}

6
test/unit/org/apache/cassandra/tools/nodetool/GetAuthCacheConfigTest.java
View File

@ -95,17 +95,17 @@ public class GetAuthCacheConfigTest extends CQLTester
ToolRunner.ToolResult tool = ToolRunner.invokeNodetool("getauthcacheconfig");
assertThat(tool.getExitCode()).isEqualTo(1);
assertThat(tool.getStdout()).isEqualTo(wrapByDefaultNodetoolMessage("Required option '--cache-name' is missing"));
assertThat(tool.getStderr()).isEmpty();
assertThat(tool.getCleanedStderr()).isEmpty();
tool = ToolRunner.invokeNodetool("getauthcacheconfig", "--cache-name");
assertThat(tool.getExitCode()).isEqualTo(1);
assertThat(tool.getStdout()).isEqualTo(wrapByDefaultNodetoolMessage("Required values for option 'cache-name' not provided"));
assertThat(tool.getStderr()).isEmpty();
assertThat(tool.getCleanedStderr()).isEmpty();
tool = ToolRunner.invokeNodetool("getauthcacheconfig", "--cache-name", "wrong");
assertThat(tool.getExitCode()).isEqualTo(1);
assertThat(tool.getStdout()).isEqualTo(wrapByDefaultNodetoolMessage("Unknown cache name: wrong"));
assertThat(tool.getStderr()).isEmpty();
assertThat(tool.getCleanedStderr()).isEmpty();
}
@Test

14
test/unit/org/apache/cassandra/tools/nodetool/InvalidatePermissionsCacheTest.java
View File

@ -185,44 +185,44 @@ public class InvalidatePermissionsCacheTest extends CQLTester
assertThat(tool.getExitCode()).isEqualTo(1);
assertThat(tool.getStdout())
.isEqualTo(wrapByDefaultNodetoolMessage("No resource options allowed without a <role> being specified"));
assertThat(tool.getStderr()).isEmpty();
assertThat(tool.getCleanedStderr()).isEmpty();
tool = ToolRunner.invokeNodetool("invalidatepermissionscache", "role1");
assertThat(tool.getExitCode()).isEqualTo(1);
assertThat(tool.getStdout())
.isEqualTo(wrapByDefaultNodetoolMessage("No resource options specified"));
assertThat(tool.getStderr()).isEmpty();
assertThat(tool.getCleanedStderr()).isEmpty();
tool = ToolRunner.invokeNodetool("invalidatepermissionscache", "role1", "--invalid-option");
assertThat(tool.getExitCode()).isEqualTo(1);
assertThat(tool.getStdout())
.isEqualTo(wrapByDefaultNodetoolMessage("A single <role> is only supported / you have a typo in the resource options spelling"));
assertThat(tool.getStderr()).isEmpty();
assertThat(tool.getCleanedStderr()).isEmpty();
tool = ToolRunner.invokeNodetool("invalidatepermissionscache", "role1", "--all-tables");
assertThat(tool.getExitCode()).isEqualTo(1);
assertThat(tool.getStdout())
.isEqualTo(wrapByDefaultNodetoolMessage("--all-tables option should be passed along with --keyspace option"));
assertThat(tool.getStderr()).isEmpty();
assertThat(tool.getCleanedStderr()).isEmpty();
tool = ToolRunner.invokeNodetool("invalidatepermissionscache", "role1", "--table", "t1");
assertThat(tool.getExitCode()).isEqualTo(1);
assertThat(tool.getStdout())
.isEqualTo(wrapByDefaultNodetoolMessage("--table option should be passed along with --keyspace option"));
assertThat(tool.getStderr()).isEmpty();
assertThat(tool.getCleanedStderr()).isEmpty();
tool = ToolRunner.invokeNodetool("invalidatepermissionscache", "role1", "--function", "f[Int32Type]");
assertThat(tool.getExitCode()).isEqualTo(1);
assertThat(tool.getStdout())
.isEqualTo(wrapByDefaultNodetoolMessage("--function option should be passed along with --functions-in-keyspace option"));
assertThat(tool.getStderr()).isEmpty();
assertThat(tool.getCleanedStderr()).isEmpty();
tool = ToolRunner.invokeNodetool("invalidatepermissionscache", "role1", "--functions-in-keyspace",
KEYSPACE, "--function", "f[x]");
assertThat(tool.getExitCode()).isEqualTo(1);
assertThat(tool.getStdout())
.isEqualTo(wrapByDefaultNodetoolMessage("An error was encountered when looking up function definition: Unable to find abstract-type class 'org.apache.cassandra.db.marshal.x'"));
assertThat(tool.getStderr()).isEmpty();
assertThat(tool.getCleanedStderr()).isEmpty();
}
@Test

10
test/unit/org/apache/cassandra/tools/nodetool/SetAuthCacheConfigTest.java
View File

@ -113,17 +113,17 @@ public class SetAuthCacheConfigTest extends CQLTester
ToolRunner.ToolResult tool = ToolRunner.invokeNodetool("setauthcacheconfig");
assertThat(tool.getExitCode()).isEqualTo(1);
assertThat(tool.getStdout()).isEqualTo(wrapByDefaultNodetoolMessage("Required option '--cache-name' is missing"));
assertThat(tool.getStderr()).isEmpty();
assertThat(tool.getCleanedStderr()).isEmpty();
tool = ToolRunner.invokeNodetool("setauthcacheconfig", "--cache-name");
assertThat(tool.getExitCode()).isEqualTo(1);
assertThat(tool.getStdout()).isEqualTo(wrapByDefaultNodetoolMessage("Required values for option 'cache-name' not provided"));
assertThat(tool.getStderr()).isEmpty();
assertThat(tool.getCleanedStderr()).isEmpty();
tool = ToolRunner.invokeNodetool("setauthcacheconfig", "--cache-name", "wrong", "--validity-period", "1");
assertThat(tool.getExitCode()).isEqualTo(1);
assertThat(tool.getStdout()).isEqualTo(wrapByDefaultNodetoolMessage("Unknown cache name: wrong"));
assertThat(tool.getStderr()).isEmpty();
assertThat(tool.getCleanedStderr()).isEmpty();
}
@Test
@ -132,7 +132,7 @@ public class SetAuthCacheConfigTest extends CQLTester
ToolRunner.ToolResult tool = ToolRunner.invokeNodetool("setauthcacheconfig", "--cache-name", "PermissionCache");
assertThat(tool.getExitCode()).isEqualTo(1);
assertThat(tool.getStdout()).isEqualTo(wrapByDefaultNodetoolMessage("At least one optional parameter need to be passed"));
assertThat(tool.getStderr()).isEmpty();
assertThat(tool.getCleanedStderr()).isEmpty();
}
@Test
@ -144,7 +144,7 @@ public class SetAuthCacheConfigTest extends CQLTester
"--disable-active-update");
assertThat(tool.getExitCode()).isEqualTo(1);
assertThat(tool.getStdout()).isEqualTo(wrapByDefaultNodetoolMessage("enable-active-update and disable-active-update cannot be used together"));
assertThat(tool.getStderr()).isEmpty();
assertThat(tool.getCleanedStderr()).isEmpty();
}
@Test