From 00867e618de1d6908cfb5d44baa1f245b66ccb53 Mon Sep 17 00:00:00 2001 From: David Turner Date: Fri, 24 Nov 2017 17:45:34 +0000 Subject: [PATCH] Transpose expected and actual, and remove duplicate info from message. (#27515) Previously: ``` > Throwable #1: java.lang.AssertionError: Expected all shards successful but got successful [8] total [9] > Expected: <8> > but: was <9> ``` Now: ``` > Throwable #1: java.lang.AssertionError: Expected all shards successful > Expected: <9> > but: was <8> ``` --- .../test/hamcrest/ElasticsearchAssertions.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java b/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java index bf2ffc5236e3f..708a95e4a49f2 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java +++ b/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java @@ -347,15 +347,15 @@ public static void assertNoFailures(BroadcastResponse response) { public static void assertAllSuccessful(BroadcastResponse response) { assertNoFailures(response); - assertThat("Expected all shards successful but got successful [" + response.getSuccessfulShards() + "] total [" + response.getTotalShards() + "]", - response.getTotalShards(), equalTo(response.getSuccessfulShards())); + assertThat("Expected all shards successful", + response.getSuccessfulShards(), equalTo(response.getTotalShards())); assertVersionSerializable(response); } public static void assertAllSuccessful(SearchResponse response) { assertNoFailures(response); - assertThat("Expected all shards successful but got successful [" + response.getSuccessfulShards() + "] total [" + response.getTotalShards() + "]", - response.getTotalShards(), equalTo(response.getSuccessfulShards())); + assertThat("Expected all shards successful", + response.getSuccessfulShards(), equalTo(response.getTotalShards())); assertVersionSerializable(response); }