Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ void testBytesSentReceived(TestInfo testInfo) throws Exception {
ItClientHandlerTestUtils.connectAndHandshake(serverModule, false, true);

assertTrue(
IgniteTestUtils.waitForCondition(() -> testServer.metrics().bytesSent() == 304, 1000),
IgniteTestUtils.waitForCondition(() -> testServer.metrics().bytesSent() == 319, 1000),
() -> "bytesSent: " + testServer.metrics().bytesSent());

assertTrue(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,10 @@ void testHandshakeWithUnsupportedAuthenticationType() throws Exception {
"org.apache.ignite.security.exception.UnsupportedAuthenticationTypeException",
errClassName
);
assertEquals("To see the full stack trace set clientConnector.sendServerExceptionStackTraceToClient:true", errStackTrace);

assertEquals(
"To see the full stack trace, set clientConnector.sendServerExceptionStackTraceToClient:true on the server",
errStackTrace);
}
}

Expand Down Expand Up @@ -353,7 +356,9 @@ void testHandshakeWithAuthenticationInvalidCredentials() throws Exception {

assertThat(errMsg, containsString("Authentication failed"));
assertEquals("org.apache.ignite.security.exception.InvalidCredentialsException", errClassName);
assertEquals("To see the full stack trace set clientConnector.sendServerExceptionStackTraceToClient:true", errStackTrace);
assertEquals(
"To see the full stack trace, set clientConnector.sendServerExceptionStackTraceToClient:true on the server",
errStackTrace);
}
}

Expand Down Expand Up @@ -408,7 +413,10 @@ void testHandshakeWithAuthenticationEmptyCredentials() throws Exception {

assertThat(errMsg, containsString("Authentication failed"));
assertEquals("org.apache.ignite.security.exception.InvalidCredentialsException", errClassName);
assertEquals("To see the full stack trace set clientConnector.sendServerExceptionStackTraceToClient:true", errStackTrace);

assertEquals(
"To see the full stack trace, set clientConnector.sendServerExceptionStackTraceToClient:true on the server",
errStackTrace);
}
}

Expand Down Expand Up @@ -461,7 +469,10 @@ void testHandshakeInvalidVersionReturnsError() throws Exception {

assertThat(errMsg, containsString("Unsupported version: 2.8.0"));
assertEquals("org.apache.ignite.lang.IgniteException", errClassName);
assertEquals("To see the full stack trace set clientConnector.sendServerExceptionStackTraceToClient:true", errStackTrace);

assertEquals(
"To see the full stack trace, set clientConnector.sendServerExceptionStackTraceToClient:true on the server",
errStackTrace);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ private void writeErrorCore(Throwable err, ClientMessagePacker packer) {
if (configuration.sendServerExceptionStackTraceToClient()) {
packer.packString(ExceptionUtils.getFullStackTrace(pubErr));
} else {
packer.packString("To see the full stack trace set clientConnector.sendServerExceptionStackTraceToClient:true");
packer.packString("To see the full stack trace, set clientConnector.sendServerExceptionStackTraceToClient:true on the server");
}

// Extensions.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ void testIgniteExceptionInJobPropagatesToClientWithMessageAndCodeAndTraceIdAsync
assertNotNull(cause.getCause());
String hint = cause.getCause().getMessage();

assertEquals("To see the full stack trace set clientConnector.sendServerExceptionStackTraceToClient:true", hint);
assertEquals("To see the full stack trace, set clientConnector.sendServerExceptionStackTraceToClient:true on the server", hint);
}

@Test
Expand All @@ -456,7 +456,7 @@ void testIgniteExceptionInJobPropagatesToClientWithMessageAndCodeAndTraceIdSync(
assertNotNull(cause.getCause());
String hint = cause.getCause().getMessage();

assertEquals("To see the full stack trace set clientConnector.sendServerExceptionStackTraceToClient:true", hint);
assertEquals("To see the full stack trace, set clientConnector.sendServerExceptionStackTraceToClient:true on the server", hint);
}

@ParameterizedTest
Expand Down Expand Up @@ -660,7 +660,7 @@ private static void assertComputeExceptionWithClassAndMessage(IgniteException ca
assertNotNull(cause.getCause());
String hint = cause.getCause().getMessage();

assertEquals("To see the full stack trace set clientConnector.sendServerExceptionStackTraceToClient:true", hint);
assertEquals("To see the full stack trace, set clientConnector.sendServerExceptionStackTraceToClient:true on the server", hint);
}

private static void assertComputeExceptionWithStackTrace(IgniteException cause) {
Expand Down Expand Up @@ -892,7 +892,7 @@ <I, M, T> void testExecuteMapReduceExceptionPropagation(Class<? extends MapReduc
assertNotNull(cause.getCause());
String hint = cause.getCause().getMessage();

assertEquals("To see the full stack trace set clientConnector.sendServerExceptionStackTraceToClient:true", hint);
assertEquals("To see the full stack trace, set clientConnector.sendServerExceptionStackTraceToClient:true on the server", hint);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ void testExceptionHasHint() {
.collect(Collectors.toList());

assertThat(causes,
hasItem(containsString("To see the full stack trace set clientConnector.sendServerExceptionStackTraceToClient:true")));
hasItem(containsString("To see the full stack trace, "
+ "set clientConnector.sendServerExceptionStackTraceToClient:true on the server")));
}

@Test
Expand Down