From 738a0bc8a280adbc4ab38fb2ef1aa5e800456930 Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Tue, 14 Jul 2015 17:08:26 +0200 Subject: [PATCH] [TEST] Don't rely on iteration oder in tests Closes #12238 --- .../org/elasticsearch/ElasticsearchExceptionTests.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java b/core/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java index 30b1d8c1da1..70face4b34f 100644 --- a/core/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java +++ b/core/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java @@ -45,6 +45,7 @@ import org.elasticsearch.test.TestSearchContext; import org.elasticsearch.test.VersionUtils; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.elasticsearch.transport.RemoteTransportException; +import org.hamcrest.Matchers; import org.junit.Test; import java.io.EOFException; @@ -249,8 +250,10 @@ public class ElasticsearchExceptionTests extends ElasticsearchTestCase { builder.startObject(); ElasticsearchException.toXContent(builder, ToXContent.EMPTY_PARAMS, ex); builder.endObject(); - String expected = "{\"type\":\"test_query_parsing_exception\",\"reason\":\"foobar\",\"index\":\"foo\",\"line\":1,\"col\":2,\"header\":{\"test_multi\":[\"some value\",\"another value\"],\"test\":\"some value\"}}"; - assertEquals(expected, builder.string()); + assertThat(builder.string(), Matchers.anyOf( // iteration order depends on platform + equalTo("{\"type\":\"test_query_parsing_exception\",\"reason\":\"foobar\",\"index\":\"foo\",\"line\":1,\"col\":2,\"header\":{\"test_multi\":[\"some value\",\"another value\"],\"test\":\"some value\"}}"), + equalTo("{\"type\":\"test_query_parsing_exception\",\"reason\":\"foobar\",\"index\":\"foo\",\"line\":1,\"col\":2,\"header\":{\"test\":\"some value\",\"test_multi\":[\"some value\",\"another value\"]}}") + )); } }