Skip to content

Commit e1115ea

Browse files
olim7tolim7t
committed
Merge pull request apache#255 from datastax/java8-test-compat
Fix tests (unordered map) for Java 8 compatibility
2 parents 9f3e528 + 9ec01df commit e1115ea

1 file changed

Lines changed: 21 additions & 33 deletions

File tree

‎driver-core/src/test/java/com/datastax/driver/core/exceptions/NoHostAvailableExceptionTest.java‎

Lines changed: 21 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,54 +13,42 @@ public class NoHostAvailableExceptionTest {
1313
@Test(groups = "unit")
1414
public void should_build_default_message_when_less_than_3_errors() {
1515
NoHostAvailableException e = new NoHostAvailableException(buildMockErrors(3));
16-
assertThat(e.getMessage())
17-
.isEqualTo("All host(s) tried for query failed (tried: "
18-
+ "/127.0.0.1:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 1), "
19-
+ "/127.0.0.3:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 3), "
20-
+ "/127.0.0.2:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 2)"
21-
+ ")"
22-
);
16+
String message = e.getMessage();
17+
assertThat(message).startsWith("All host(s) tried for query failed");
18+
assertThat(message).contains( "/127.0.0.1:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 1)");
19+
assertThat(message).contains( "/127.0.0.2:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 2)");
20+
assertThat(message).contains( "/127.0.0.3:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 3)");
2321
}
2422

2523
@Test(groups = "unit")
2624
public void should_build_default_message_when_more_than_3_errors() {
2725
NoHostAvailableException e = new NoHostAvailableException(buildMockErrors(4));
28-
assertThat(e.getMessage())
29-
.isEqualTo("All host(s) tried for query failed (tried: "
30-
+ "/127.0.0.1:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 1), "
31-
+ "/127.0.0.3:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 3), "
32-
+ "/127.0.0.2:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 2), "
33-
+ "/127.0.0.4:9042 "
34-
+ "[only showing errors of first 3 hosts, use getErrors() for more details]"
35-
+ ")"
36-
);
26+
String message = e.getMessage();
27+
assertThat(message).startsWith("All host(s) tried for query failed");
28+
assertThat(message).contains( "/127.0.0.1:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 1)");
29+
assertThat(message).contains( "/127.0.0.2:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 2)");
30+
assertThat(message).contains( "/127.0.0.3:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 3)");
31+
assertThat(message).contains("only showing errors of first 3 hosts, use getErrors() for more details");
3732
}
3833

3934
@Test(groups = "unit")
4035
public void should_build_formatted_message_without_stack_traces() {
4136
NoHostAvailableException e = new NoHostAvailableException(buildMockErrors(3));
42-
assertThat(e.getCustomMessage(3, true, false))
43-
.isEqualTo("All host(s) tried for query failed (tried:\n"
44-
+ "/127.0.0.1:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 1)\n"
45-
+ "/127.0.0.3:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 3)\n"
46-
+ "/127.0.0.2:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 2)\n"
47-
+ ")"
48-
);
37+
String message = e.getCustomMessage(3, true, false);
38+
assertThat(message).startsWith("All host(s) tried for query failed (tried:\n");
39+
assertThat(message).contains( "/127.0.0.1:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 1)\n");
40+
assertThat(message).contains( "/127.0.0.2:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 2)\n");
41+
assertThat(message).contains( "/127.0.0.3:9042 (com.datastax.driver.core.exceptions.NoHostAvailableExceptionTest$MockError: mock error 3)\n");
4942
}
5043

5144
@Test(groups = "unit")
5245
public void should_build_formatted_message_with_stack_traces() {
5346
NoHostAvailableException e = new NoHostAvailableException(buildMockErrors(3));
54-
assertThat(e.getCustomMessage(3, true, true))
55-
.isEqualTo("All host(s) tried for query failed (tried:\n"
56-
+ "/127.0.0.1:9042\n"
57-
+ "mock stack trace 1\n\n"
58-
+ "/127.0.0.3:9042\n"
59-
+ "mock stack trace 3\n\n"
60-
+ "/127.0.0.2:9042\n"
61-
+ "mock stack trace 2\n"
62-
+ ")"
63-
);
47+
String message = e.getCustomMessage(3, true, true);
48+
assertThat(message).startsWith("All host(s) tried for query failed (tried:\n");
49+
assertThat(message).contains("/127.0.0.1:9042\nmock stack trace 1\n");
50+
assertThat(message).contains("/127.0.0.3:9042\nmock stack trace 3\n");
51+
assertThat(message).contains("/127.0.0.2:9042\nmock stack trace 2\n");
6452
}
6553

6654
private static Map<InetSocketAddress, Throwable> buildMockErrors(int count) {

0 commit comments

Comments
 (0)