Polishing contribution

Closes gh-507

Author: rstoyanchev

spring-graphql-test/src/main/java/org/springframework/graphql/test/tester/DefaultGraphQlTester.java

@@ -540,7 +540,8 @@ private DefaultEntityList(List<E> entity, String path, ResponseDelegate delegate
 		public EntityList<E> contains(E... values) {
 			doAssert(() -> {
 				List<E> expected = Arrays.asList(values);
-				AssertionErrors.assertTrue("List at path '" + getPath() + "' does not contain " + expected,
+				AssertionErrors.assertTrue(
+						"Expecting list " + getEntity() + " at path '" + getPath() + "' to contain " + expected,
 						getEntity().containsAll(expected));
 			});
 			return this;
@@ -552,7 +553,7 @@ public EntityList<E> doesNotContain(E... values) {
 			doAssert(() -> {
 				List<E> expected = Arrays.asList(values);
 				AssertionErrors.assertTrue(
-						"List at path '" + getPath() + "' should not have contained " + expected,
+						"Expecting list " + getEntity() + " at path '" + getPath() + "' to not contain " + expected,
 						!getEntity().containsAll(expected));
 			});
 			return this;
@@ -563,34 +564,33 @@ public EntityList<E> doesNotContain(E... values) {
 		public EntityList<E> containsExactly(E... values) {
 			doAssert(() -> {
 				List<E> expected = Arrays.asList(values);
-				List<E> actual = getEntity();
 				AssertionErrors.assertTrue(
-						"List at path '" + getPath() + "' should have contained exactly " + expected + ", " +
-								"but did contain " + actual,
-						actual.equals(expected));
+						"Expecting list " + getEntity() + " at path '" + getPath() + "' to contain exactly " + expected,
+						getEntity().equals(expected));
 			});
 			return this;
 		}
 
 		@Override
 		public EntityList<E> hasSize(int size) {
-			doAssert(() -> AssertionErrors.assertTrue("List at path '" + getPath() + "' should have size " + size,
+			doAssert(() -> AssertionErrors.assertTrue(
+					"Expecting list " + getEntity() + " at path '" + getPath() + "' to have size == " + size,
 					getEntity().size() == size));
 			return this;
 		}
 
 		@Override
 		public EntityList<E> hasSizeLessThan(int size) {
 			doAssert(() -> AssertionErrors.assertTrue(
-					"List at path '" + getPath() + "' should have size less than " + size,
+					"Expecting list " + getEntity() + " at path '" + getPath() + "' to have size < " + size,
 					getEntity().size() < size));
 			return this;
 		}
 
 		@Override
 		public EntityList<E> hasSizeGreaterThan(int size) {
 			doAssert(() -> AssertionErrors.assertTrue(
-					"List at path '" + getPath() + "' should have size greater than " + size,
+					"Expecting list " + getEntity() + " at path '" + getPath() + "' to have size > " + size,
 					getEntity().size() > size));
 			return this;
 		}

spring-graphql-test/src/test/java/org/springframework/graphql/test/tester/GraphQlTesterTests.java

@@ -179,8 +179,11 @@ void entityList() {
 
 		assertThatThrownBy(() -> entityList.containsExactly(leia, han))
 				.as("Should be exactly the same order")
-				.hasMessageStartingWith("List at path 'me.friends' should have contained exactly")
-				.hasMessageContaining("but did contain ");
+				.hasMessage("Expecting list " +
+						"[MovieCharacter[name='Han Solo'], MovieCharacter[name='Leia Organa']] " +
+						"at path 'me.friends' to contain exactly " +
+						"[MovieCharacter[name='Leia Organa'], MovieCharacter[name='Han Solo']]\n" +
+						"Request: document='{me {name, friends}}'");
 
 		response.path("me.friends")
 				.entityList(new ParameterizedTypeReference<MovieCharacter>() {})