honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve test to be more descriptive when it fails

This commit is contained in:
Shay Banon 2013-07-28 19:36:02 +02:00
parent 29cf346f13
commit 69c9a2dca1
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/java/org/elasticsearch/test/unit/discovery/zen/ping/unicast/UnicastZenPingTests.java
View File

@ -58,13 +58,13 @@ public class UnicastZenPingTests extends ElasticsearchTestCase {
NettyTransport transportA = new NettyTransport(settings, threadPool, networkService, Version.CURRENT); NettyTransport transportA = new NettyTransport(settings, threadPool, networkService, Version.CURRENT);
final TransportService transportServiceA = new TransportService(transportA, threadPool).start(); final TransportService transportServiceA = new TransportService(transportA, threadPool).start();
final DiscoveryNode nodeA = new DiscoveryNode("A", transportServiceA.boundAddress().publishAddress(), Version.CURRENT); final DiscoveryNode nodeA = new DiscoveryNode("UZP_A", transportServiceA.boundAddress().publishAddress(), Version.CURRENT);
InetSocketTransportAddress addressA = (InetSocketTransportAddress) transportA.boundAddress().publishAddress(); InetSocketTransportAddress addressA = (InetSocketTransportAddress) transportA.boundAddress().publishAddress();
NettyTransport transportB = new NettyTransport(settings, threadPool, networkService, Version.CURRENT); NettyTransport transportB = new NettyTransport(settings, threadPool, networkService, Version.CURRENT);
final TransportService transportServiceB = new TransportService(transportB, threadPool).start(); final TransportService transportServiceB = new TransportService(transportB, threadPool).start();
final DiscoveryNode nodeB = new DiscoveryNode("B", transportServiceA.boundAddress().publishAddress(), Version.CURRENT); final DiscoveryNode nodeB = new DiscoveryNode("UZP_B", transportServiceA.boundAddress().publishAddress(), Version.CURRENT);
InetSocketTransportAddress addressB = (InetSocketTransportAddress) transportB.boundAddress().publishAddress(); InetSocketTransportAddress addressB = (InetSocketTransportAddress) transportB.boundAddress().publishAddress();
@ -77,7 +77,7 @@ public class UnicastZenPingTests extends ElasticsearchTestCase {
zenPingA.setNodesProvider(new DiscoveryNodesProvider() { zenPingA.setNodesProvider(new DiscoveryNodesProvider() {
@Override @Override
public DiscoveryNodes nodes() { public DiscoveryNodes nodes() {
return DiscoveryNodes.newNodesBuilder().put(nodeA).localNodeId("A").build(); return DiscoveryNodes.newNodesBuilder().put(nodeA).localNodeId("UZP_A").build();
} }
@Override @Override
@ -91,7 +91,7 @@ public class UnicastZenPingTests extends ElasticsearchTestCase {
zenPingB.setNodesProvider(new DiscoveryNodesProvider() { zenPingB.setNodesProvider(new DiscoveryNodesProvider() {
@Override @Override
public DiscoveryNodes nodes() { public DiscoveryNodes nodes() {
return DiscoveryNodes.newNodesBuilder().put(nodeB).localNodeId("B").build(); return DiscoveryNodes.newNodesBuilder().put(nodeB).localNodeId("UZP_B").build();
} }
@Override @Override
@ -104,7 +104,7 @@ public class UnicastZenPingTests extends ElasticsearchTestCase {
try { try {
ZenPing.PingResponse[] pingResponses = zenPingA.pingAndWait(TimeValue.timeValueSeconds(1)); ZenPing.PingResponse[] pingResponses = zenPingA.pingAndWait(TimeValue.timeValueSeconds(1));
assertThat(pingResponses.length, equalTo(1)); assertThat(pingResponses.length, equalTo(1));
assertThat(pingResponses[0].target().id(), equalTo("B")); assertThat(pingResponses[0].target().id(), equalTo("UZP_B"));
} finally { } finally {
zenPingA.close(); zenPingA.close();
zenPingB.close(); zenPingB.close();

10
src/test/java/org/elasticsearch/test/unit/transport/AbstractSimpleTransportTests.java
View File

@ -61,10 +61,10 @@ public abstract class AbstractSimpleTransportTests extends ElasticsearchTestCase
@Before @Before
public void setUp() { public void setUp() {
threadPool = new ThreadPool(); threadPool = new ThreadPool();
serviceA = build(ImmutableSettings.builder().put("name", "A").build(), version0); serviceA = build(ImmutableSettings.builder().put("name", "TS_A").build(), version0);
nodeA = new DiscoveryNode("A", "A", serviceA.boundAddress().publishAddress(), ImmutableMap.<String, String>of(), version0); nodeA = new DiscoveryNode("TS_A", "TS_A", serviceA.boundAddress().publishAddress(), ImmutableMap.<String, String>of(), version0);
serviceB = build(ImmutableSettings.builder().put("name", "B").build(), version1); serviceB = build(ImmutableSettings.builder().put("name", "TS_B").build(), version1);
nodeB = new DiscoveryNode("B", "B", serviceB.boundAddress().publishAddress(), ImmutableMap.<String, String>of(), version1); nodeB = new DiscoveryNode("TS_B", "TS_B", serviceB.boundAddress().publishAddress(), ImmutableMap.<String, String>of(), version1);
serviceA.connectToNode(nodeB); serviceA.connectToNode(nodeB);
serviceA.connectToNode(nodeA); serviceA.connectToNode(nodeA);
@ -344,7 +344,7 @@ public abstract class AbstractSimpleTransportTests extends ElasticsearchTestCase
TransportConnectionListener disconnectListener = new TransportConnectionListener() { TransportConnectionListener disconnectListener = new TransportConnectionListener() {
@Override @Override
public void onNodeConnected(DiscoveryNode node) { public void onNodeConnected(DiscoveryNode node) {
throw new RuntimeException("Should not be called"); assert false : "node connected should not be called, all connection have been done previously, node: " + node;
} }
@Override @Override