From 477a9b90e1e71c12cebe0a741c47cd50c161ca57 Mon Sep 17 00:00:00 2001 From: eugenp Date: Tue, 4 Nov 2014 13:02:20 +0200 Subject: [PATCH 1/2] cleanup work in guava tests --- .../guava/GuavaCollectionTypesTest.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/guava/src/test/java/org/baeldung/guava/GuavaCollectionTypesTest.java b/guava/src/test/java/org/baeldung/guava/GuavaCollectionTypesTest.java index e0b2c50aa3..21ba483962 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaCollectionTypesTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaCollectionTypesTest.java @@ -111,8 +111,10 @@ public class GuavaCollectionTypesTest { assertThat(immutable, contains("John", "Adam", "Jane", "Tom")); } + // sets + @Test - public void whenCalculateUnion_thenCorrect() { + public void whenCalculateUnionOfSets_thenCorrect() { final Set first = ImmutableSet.of('a', 'b', 'c'); final Set second = ImmutableSet.of('b', 'c', 'd'); @@ -120,15 +122,6 @@ public class GuavaCollectionTypesTest { assertThat(union, containsInAnyOrder('a', 'b', 'c', 'd')); } - @Test - public void whenCalculateIntersection_thenCorrect() { - final Set first = ImmutableSet.of('a', 'b', 'c'); - final Set second = ImmutableSet.of('b', 'c', 'd'); - - final Set intersection = Sets.intersection(first, second); - assertThat(intersection, containsInAnyOrder('b', 'c')); - } - @Test public void whenCalculateSetsProduct_thenCorrect() { final Set first = ImmutableSet.of('a', 'b'); @@ -146,6 +139,15 @@ public class GuavaCollectionTypesTest { assertThat(joined, containsInAnyOrder("a c", "a d", "b c", "b d")); } + @Test + public void whenCalculatingSetIntersection_thenCorrect() { + final Set first = ImmutableSet.of('a', 'b', 'c'); + final Set second = ImmutableSet.of('b', 'c', 'd'); + + final Set intersection = Sets.intersection(first, second); + assertThat(intersection, containsInAnyOrder('b', 'c')); + } + @Test public void whenCalculatePowerSet_thenCorrect() { final Set chars = ImmutableSet.of('a', 'b'); From a05e2fd90494758b07818c77d4ca552135939174 Mon Sep 17 00:00:00 2001 From: eugenp Date: Tue, 4 Nov 2014 13:43:22 +0200 Subject: [PATCH 2/2] minor guava test name change --- .../test/java/org/baeldung/guava/GuavaCollectionTypesTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guava/src/test/java/org/baeldung/guava/GuavaCollectionTypesTest.java b/guava/src/test/java/org/baeldung/guava/GuavaCollectionTypesTest.java index 21ba483962..26d3fa90ca 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaCollectionTypesTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaCollectionTypesTest.java @@ -149,7 +149,7 @@ public class GuavaCollectionTypesTest { } @Test - public void whenCalculatePowerSet_thenCorrect() { + public void whenCalculatingPowerSet_thenCorrect() { final Set chars = ImmutableSet.of('a', 'b'); final Set> result = Sets.powerSet(chars);