Spring/spring-graphql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing contribution

Browse Source 
Closes gh-507
This commit is contained in:
rstoyanchev
2022-10-17 16:58:56 +01:00
parent da21f7438c
commit 560c2b53f2
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -540,7 +540,8 @@ final class DefaultGraphQlTester implements GraphQlTester {
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 @@ final class DefaultGraphQlTester implements GraphQlTester {
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,18 +564,17 @@ final class DefaultGraphQlTester implements GraphQlTester {
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;
}
@@ -582,7 +582,7 @@ final class DefaultGraphQlTester implements GraphQlTester {
@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;
}
@@ -590,7 +590,7 @@ final class DefaultGraphQlTester implements GraphQlTester {
@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;
}

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

@@ -179,8 +179,11 @@ public class GraphQlTesterTests extends GraphQlTesterTestSupport {
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>() {})