From 2d309b89283e824f3e9e252b99f7537e975e3642 Mon Sep 17 00:00:00 2001 From: kongleong86 Date: Sun, 4 Dec 2022 09:25:57 +0000 Subject: [PATCH] dependencies: Refactor unit tests without depending on Guava (#2181) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Refactor unit tests without depending on Guava * Remove redundant casts. * Move import up * Update repository/src/test/java/com/iluwatar/repository/RepositoryTest.java Co-authored-by: Robert Volkmann <20912167+robertvolkmann@users.noreply.github.com> * Update repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java Co-authored-by: Robert Volkmann <20912167+robertvolkmann@users.noreply.github.com> Co-authored-by: Ilkka Seppälä Co-authored-by: Robert Volkmann <20912167+robertvolkmann@users.noreply.github.com> --- converter/pom.xml | 4 ---- filterer/pom.xml | 4 ---- model-view-viewmodel/pom.xml | 7 ------- .../com/iluwatar/model/view/viewmodel/BookTest.java | 11 ++++------- pom.xml | 6 ------ repository/pom.xml | 4 ---- .../com/iluwatar/repository/PersonRepository.java | 3 +++ .../repository/AnnotationBasedRepositoryTest.java | 3 +-- .../com/iluwatar/repository/RepositoryTest.java | 3 +-- value-object/pom.xml | 6 ------ .../com/iluwatar/value/object/HeroStatTest.java | 13 +++++-------- 11 files changed, 14 insertions(+), 50 deletions(-) diff --git a/converter/pom.xml b/converter/pom.xml index f6aa2cfa3..c26e68dd1 100644 --- a/converter/pom.xml +++ b/converter/pom.xml @@ -39,10 +39,6 @@ junit-jupiter-engine test - - com.google.guava - guava - diff --git a/filterer/pom.xml b/filterer/pom.xml index 408c8be4b..23f0093f9 100644 --- a/filterer/pom.xml +++ b/filterer/pom.xml @@ -34,10 +34,6 @@ 4.0.0 filterer - - com.google.guava - guava - org.junit.jupiter junit-jupiter-api diff --git a/model-view-viewmodel/pom.xml b/model-view-viewmodel/pom.xml index 149df6449..54a7a4145 100644 --- a/model-view-viewmodel/pom.xml +++ b/model-view-viewmodel/pom.xml @@ -37,7 +37,6 @@ 1.26.0-SNAPSHOT 9.0.0 - 19.0 9.4.28.v20200408 3.3.2 2.2 @@ -84,12 +83,6 @@ junit-jupiter-engine test - - com.google.guava - guava-testlib - ${guava.version} - test - ${project.artifactId} diff --git a/model-view-viewmodel/src/test/java/com/iluwatar/model/view/viewmodel/BookTest.java b/model-view-viewmodel/src/test/java/com/iluwatar/model/view/viewmodel/BookTest.java index 5b25d433b..bec79d011 100644 --- a/model-view-viewmodel/src/test/java/com/iluwatar/model/view/viewmodel/BookTest.java +++ b/model-view-viewmodel/src/test/java/com/iluwatar/model/view/viewmodel/BookTest.java @@ -24,18 +24,15 @@ */ package com.iluwatar.model.view.viewmodel; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.junit.Assert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import com.google.common.testing.EqualsTester; class BookTest { @@ -67,13 +64,13 @@ class BookTest { @Test void testEquals() { - new EqualsTester().addEqualityGroup(testBook, testBookTwo).testEquals(); + assertEquals(testBook, testBookTwo); } @Test void testToString() { - assertThat(testBook.toString(), is(testBookTwo.toString())); - assertThat(testBook.toString(), is(not(testBookThree.toString()))); + assertEquals(testBook.toString(), testBookTwo.toString()); + assertNotEquals(testBook.toString(), testBookThree.toString()); } @Test diff --git a/pom.xml b/pom.xml index 896bd5f96..ee3465ca3 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,6 @@ 2.7.5 0.8.8 1.4 - 19.0 2.66.0 4.0 1.1.0 @@ -223,11 +222,6 @@ commons-dbcp ${commons-dbcp.version} - - com.google.guava - guava - ${guava.version} - net.sourceforge.htmlunit htmlunit diff --git a/repository/pom.xml b/repository/pom.xml index 9308e4280..a1f98e506 100644 --- a/repository/pom.xml +++ b/repository/pom.xml @@ -55,10 +55,6 @@ junit-jupiter-engine test - - com.google.guava - guava - javax.xml.bind jaxb-api diff --git a/repository/src/main/java/com/iluwatar/repository/PersonRepository.java b/repository/src/main/java/com/iluwatar/repository/PersonRepository.java index 39f6175e9..a82b14630 100644 --- a/repository/src/main/java/com/iluwatar/repository/PersonRepository.java +++ b/repository/src/main/java/com/iluwatar/repository/PersonRepository.java @@ -24,6 +24,7 @@ */ package com.iluwatar.repository; +import java.util.List; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; @@ -36,4 +37,6 @@ public interface PersonRepository extends CrudRepository, JpaSpecificationExecutor { Person findByName(String name); + + List findAll(); } diff --git a/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java b/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java index 044169211..46501b828 100644 --- a/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java +++ b/repository/src/test/java/com/iluwatar/repository/AnnotationBasedRepositoryTest.java @@ -28,7 +28,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.google.common.collect.Lists; import java.util.List; import javax.annotation.Resource; import org.junit.jupiter.api.AfterEach; @@ -66,7 +65,7 @@ class AnnotationBasedRepositoryTest { @Test void testFindAll() { - var actuals = Lists.newArrayList(repository.findAll()); + var actuals = repository.findAll(); assertTrue(actuals.containsAll(persons) && persons.containsAll(actuals)); } diff --git a/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java b/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java index 7ecbef9c8..3af73ea60 100644 --- a/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java +++ b/repository/src/test/java/com/iluwatar/repository/RepositoryTest.java @@ -28,7 +28,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.google.common.collect.Lists; import java.util.List; import javax.annotation.Resource; import org.junit.jupiter.api.AfterEach; @@ -66,7 +65,7 @@ class RepositoryTest { @Test void testFindAll() { - var actuals = Lists.newArrayList(repository.findAll()); + var actuals = repository.findAll(); assertTrue(actuals.containsAll(persons) && persons.containsAll(actuals)); } diff --git a/value-object/pom.xml b/value-object/pom.xml index 61e5d8a81..2ffba3b64 100644 --- a/value-object/pom.xml +++ b/value-object/pom.xml @@ -34,12 +34,6 @@ value-object - - com.google.guava - guava-testlib - 23.0 - test - org.junit.jupiter junit-jupiter-engine diff --git a/value-object/src/test/java/com/iluwatar/value/object/HeroStatTest.java b/value-object/src/test/java/com/iluwatar/value/object/HeroStatTest.java index 61019f7f8..82c66322d 100644 --- a/value-object/src/test/java/com/iluwatar/value/object/HeroStatTest.java +++ b/value-object/src/test/java/com/iluwatar/value/object/HeroStatTest.java @@ -24,11 +24,9 @@ */ package com.iluwatar.value.object; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.junit.Assert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; -import com.google.common.testing.EqualsTester; import org.junit.jupiter.api.Test; /** @@ -47,7 +45,7 @@ class HeroStatTest { void testEquals() { var heroStatA = HeroStat.valueOf(3, 9, 2); var heroStatB = HeroStat.valueOf(3, 9, 2); - new EqualsTester().addEqualityGroup(heroStatA, heroStatB).testEquals(); + assertEquals(heroStatA, heroStatB); } /** @@ -59,9 +57,8 @@ class HeroStatTest { var heroStatA = HeroStat.valueOf(3, 9, 2); var heroStatB = HeroStat.valueOf(3, 9, 2); var heroStatC = HeroStat.valueOf(3, 9, 8); - - assertThat(heroStatA.toString(), is(heroStatB.toString())); - assertThat(heroStatA.toString(), is(not(heroStatC.toString()))); + assertEquals(heroStatA.toString(), heroStatB.toString()); + assertNotEquals(heroStatA.toString(), heroStatC.toString()); } }