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

DATAREDIS-729 - Polishing.

Browse Source 
Tweak assertion messages and consistently use constants. Reformat code. Join assertions in tests.

Original pull request: #566.
This commit is contained in:
Mark Paluch
2020-10-13 12:13:34 +02:00
parent da81275c4d
commit df37dc812b
5 changed files with 36 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java
View File

@@ -2411,34 +2411,13 @@ public abstract class AbstractConnectionIntegrationTests {
List<Object> results = getResults();
Set<String> values = (Set<String>) results.get(7);
assertThat(values).containsExactly("a", "b", "c");
assertThat(values).doesNotContain("d", "e", "f", "g");
values = (Set<String>) results.get(8);
assertThat(values).containsExactly("a", "b");
assertThat(values).doesNotContain("c");
values = (Set<String>) results.get(9);
assertThat(values).containsExactly("b", "c", "d", "e", "f");
assertThat(values).doesNotContain("a", "g");
values = (Set<String>) results.get(10);
assertThat(values).containsExactly("e", "f", "g");
assertThat(values).doesNotContain("a", "b", "c", "d");
values = (Set<String>) results.get(11);
assertThat(values).containsExactly("a", "b", "c");
assertThat(values).doesNotContain("d", "e", "f", "g");
values = (Set<String>) results.get(12);
assertThat(values).contains("a");
assertThat(values).doesNotContain("b", "c", "d", "e", "f", "g");
values = (Set<String>) results.get(13);
assertThat(values).contains("b");
assertThat(values).doesNotContain("a", "c", "d", "e", "f", "g");
assertThat((Set<String>) results.get(7)).containsExactly("a", "b", "c").doesNotContain("d", "e", "f", "g");
assertThat((Set<String>) results.get(8)).containsExactly("a", "b").doesNotContain("c");
assertThat((Set<String>) results.get(9)).containsExactly("b", "c", "d", "e", "f").doesNotContain("a", "g");
assertThat((Set<String>) results.get(10)).containsExactly("e", "f", "g").doesNotContain("a", "b", "c", "d");
assertThat((Set<String>) results.get(11)).containsExactly("a", "b", "c").doesNotContain("d", "e", "f", "g");
assertThat((Set<String>) results.get(12)).contains("a").doesNotContain("b", "c", "d", "e", "f", "g");
assertThat((Set<String>) results.get(13)).contains("b").doesNotContain("a", "c", "d", "e", "f", "g");
}
@SuppressWarnings("unchecked")
@@ -2466,34 +2445,13 @@ public abstract class AbstractConnectionIntegrationTests {
List<Object> results = getResults();
Set<String> values = (Set<String>) results.get(7);
assertThat(values).containsExactly("c", "b", "a");
assertThat(values).doesNotContain("d", "e", "f", "g");
values = (Set<String>) results.get(8);
assertThat(values).containsExactly("b", "a");
assertThat(values).doesNotContain("c");
values = (Set<String>) results.get(9);
assertThat(values).containsExactly("f", "e", "d", "c", "b");
assertThat(values).doesNotContain("a", "g");
values = (Set<String>) results.get(10);
assertThat(values).containsExactly("g", "f", "e");
assertThat(values).doesNotContain("a", "b", "c", "d");
values = (Set<String>) results.get(11);
assertThat(values).containsExactly("c", "b", "a");
assertThat(values).doesNotContain("d", "e", "f", "g");
values = (Set<String>) results.get(12);
assertThat(values).contains("d", "c");
assertThat(values).doesNotContain("a", "b", "e", "f", "g");
values = (Set<String>) results.get(13);
assertThat(values).contains("c", "b");
assertThat(values).doesNotContain("a", "d", "e", "f", "g");
assertThat((Set<String>) results.get(7)).containsExactly("c", "b", "a").doesNotContain("d", "e", "f", "g");
assertThat((Set<String>) results.get(8)).containsExactly("b", "a").doesNotContain("c");
assertThat((Set<String>) results.get(9)).containsExactly("f", "e", "d", "c", "b").doesNotContain("a", "g");
assertThat((Set<String>) results.get(10)).containsExactly("g", "f", "e").doesNotContain("a", "b", "c", "d");
assertThat((Set<String>) results.get(11)).containsExactly("c", "b", "a").doesNotContain("d", "e", "f", "g");
assertThat((Set<String>) results.get(12)).contains("d", "c").doesNotContain("a", "b", "e", "f", "g");
assertThat((Set<String>) results.get(13)).contains("c", "b").doesNotContain("a", "d", "e", "f", "g");
}
@Test(expected = IllegalArgumentException.class) // DATAREDIS-316, DATAREDIS-692