Skip to content

Commit fd50a3e

Browse files
authored
[TEST] extra testing for host and port default values (#7741)
* extra test for host and port leak Signed-off-by: Sally MacFarlane <[email protected]> --------- Signed-off-by: Sally MacFarlane <[email protected]>
1 parent 1029c51 commit fd50a3e

File tree

1 file changed

+42
-4
lines changed

1 file changed

+42
-4
lines changed

besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,14 +1014,16 @@ public void callingWithBannedNodeidsOptionWithInvalidValuesMustDisplayError() {
10141014
}
10151015

10161016
@Test
1017-
public void p2pHostAndPortOptionsAreRespected() {
1017+
public void p2pHostAndPortOptionsAreRespectedAndNotLeaked() {
10181018

10191019
final String host = "1.2.3.4";
10201020
final int port = 1234;
10211021
parseCommand("--p2p-host", host, "--p2p-port", String.valueOf(port));
10221022

10231023
verify(mockRunnerBuilder).p2pAdvertisedHost(stringArgumentCaptor.capture());
10241024
verify(mockRunnerBuilder).p2pListenPort(intArgumentCaptor.capture());
1025+
verify(mockRunnerBuilder).metricsConfiguration(metricsConfigArgumentCaptor.capture());
1026+
verify(mockRunnerBuilder).jsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
10251027
verify(mockRunnerBuilder).build();
10261028

10271029
assertThat(stringArgumentCaptor.getValue()).isEqualTo(host);
@@ -1030,11 +1032,47 @@ public void p2pHostAndPortOptionsAreRespected() {
10301032
assertThat(commandOutput.toString(UTF_8)).isEmpty();
10311033
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
10321034

1033-
// rpc host should remain default ie 127.0.0.1
1035+
// all other port values remain default
1036+
assertThat(metricsConfigArgumentCaptor.getValue().getPort()).isEqualTo(9545);
1037+
assertThat(metricsConfigArgumentCaptor.getValue().getPushPort()).isEqualTo(9001);
1038+
assertThat(jsonRpcConfigArgumentCaptor.getValue().getPort()).isEqualTo(8545);
1039+
1040+
// all other host values remain default
1041+
final String defaultHost = "127.0.0.1";
1042+
assertThat(metricsConfigArgumentCaptor.getValue().getHost()).isEqualTo(defaultHost);
1043+
assertThat(metricsConfigArgumentCaptor.getValue().getPushHost()).isEqualTo(defaultHost);
1044+
assertThat(jsonRpcConfigArgumentCaptor.getValue().getHost()).isEqualTo(defaultHost);
1045+
}
1046+
1047+
@Test
1048+
public void p2pHostAndPortOptionsAreRespectedAndNotLeakedWithMetricsEnabled() {
1049+
1050+
final String host = "1.2.3.4";
1051+
final int port = 1234;
1052+
parseCommand("--p2p-host", host, "--p2p-port", String.valueOf(port), "--metrics-enabled");
1053+
1054+
verify(mockRunnerBuilder).p2pAdvertisedHost(stringArgumentCaptor.capture());
1055+
verify(mockRunnerBuilder).p2pListenPort(intArgumentCaptor.capture());
1056+
verify(mockRunnerBuilder).metricsConfiguration(metricsConfigArgumentCaptor.capture());
10341057
verify(mockRunnerBuilder).jsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
10351058
verify(mockRunnerBuilder).build();
10361059

1037-
assertThat(jsonRpcConfigArgumentCaptor.getValue().getHost()).isEqualTo("127.0.0.1");
1060+
assertThat(stringArgumentCaptor.getValue()).isEqualTo(host);
1061+
assertThat(intArgumentCaptor.getValue()).isEqualTo(port);
1062+
1063+
assertThat(commandOutput.toString(UTF_8)).isEmpty();
1064+
assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
1065+
1066+
// all other port values remain default
1067+
assertThat(metricsConfigArgumentCaptor.getValue().getPort()).isEqualTo(9545);
1068+
assertThat(metricsConfigArgumentCaptor.getValue().getPushPort()).isEqualTo(9001);
1069+
assertThat(jsonRpcConfigArgumentCaptor.getValue().getPort()).isEqualTo(8545);
1070+
1071+
// all other host values remain default
1072+
final String defaultHost = "127.0.0.1";
1073+
assertThat(metricsConfigArgumentCaptor.getValue().getHost()).isEqualTo(defaultHost);
1074+
assertThat(metricsConfigArgumentCaptor.getValue().getPushHost()).isEqualTo(defaultHost);
1075+
assertThat(jsonRpcConfigArgumentCaptor.getValue().getHost()).isEqualTo(defaultHost);
10381076
}
10391077

10401078
@Test
@@ -2285,7 +2323,7 @@ public void staticNodesFileOptionFileDoesNotExistMessage() {
22852323
}
22862324

22872325
@Test
2288-
public void staticNodesFileOptionValidParamenter() throws IOException {
2326+
public void staticNodesFileOptionValidParameter() throws IOException {
22892327
final Path staticNodeTempFile =
22902328
createTempFile(
22912329
"static-nodes-goodformat.json",

0 commit comments

Comments
 (0)