Use simpler and better JUnit APIs

apache · Jan 18, 2025 · ac80287 · ac80287
1 parent 0740b23
commit ac80287
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 41 deletions.
diff --git a/commons-jcs3-core/pom.xml b/commons-jcs3-core/pom.xml
@@ -86,11 +86,6 @@
     </dependency>
 
     <!--  Test dependencies -->
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>

diff --git a/commons-jcs3-jcache-extras/pom.xml b/commons-jcs3-jcache-extras/pom.xml
@@ -43,11 +43,6 @@
       <groupId>javax</groupId>
       <artifactId>javaee-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>

diff --git a/commons-jcs3-jcache-openjpa/pom.xml b/commons-jcs3-jcache-openjpa/pom.xml
@@ -51,11 +51,6 @@
         </exclusion>
 	  </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>

diff --git a/...njpa/src/test/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDataCacheTest.java b/...njpa/src/test/java/org/apache/commons/jcs3/jcache/openjpa/OpenJPAJCacheDataCacheTest.java
@@ -18,9 +18,8 @@
  */
 package org.apache.commons.jcs3.jcache.openjpa;
 
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -99,8 +98,8 @@ void testEntity()
         em.getTransaction().commit();
         assertNotNull(conf.getDataCacheManagerInstance().getDataCache("default"));
 
-        assertThat(conf.getDataCacheManagerInstance(), instanceOf(OpenJPAJCacheDataCacheManager.class));
-        assertThat(conf.getDataCacheManagerInstance().getDataCache("default"), instanceOf(OpenJPAJCacheDataCache.class));
+        assertInstanceOf(OpenJPAJCacheDataCacheManager.class, conf.getDataCacheManagerInstance());
+        assertInstanceOf(OpenJPAJCacheDataCache.class, conf.getDataCacheManagerInstance().getDataCache("default"));
         assertTrue(conf.getDataCacheManagerInstance().getDataCache("default").contains(JPAFacadeHelper.toOpenJPAObjectId(conf.getMetaDataRepositoryInstance().getCachedMetaData(MyEntity.class), entity.getId())));
 
         em.close();
@@ -124,8 +123,8 @@ void testQuery()
         assertEquals(1, query.setParameter("id", entity.getId()).getResultList().size());
         assertNotNull(conf.getDataCacheManagerInstance().getDataCache("default"));
 
-        assertThat(conf.getDataCacheManagerInstance(), instanceOf(OpenJPAJCacheDataCacheManager.class));
-        assertThat(conf.getDataCacheManagerInstance().getDataCache("default"), instanceOf(OpenJPAJCacheDataCache.class));
+        assertInstanceOf(OpenJPAJCacheDataCacheManager.class, conf.getDataCacheManagerInstance());
+        assertInstanceOf(OpenJPAJCacheDataCache.class, conf.getDataCacheManagerInstance().getDataCache("default"));
         assertTrue(conf.getDataCacheManagerInstance().getDataCache("default").contains(JPAFacadeHelper.toOpenJPAObjectId(conf.getMetaDataRepositoryInstance().getCachedMetaData(MyEntity.class), entity.getId())));
 
         final Map<Object, Object> args = Map.of("id", entity.getId());

diff --git a/commons-jcs3-jcache-tck/pom.xml b/commons-jcs3-jcache-tck/pom.xml
@@ -71,11 +71,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>commons-jcs3-jcache</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>

diff --git a/...he-tck/src/test/java/org/apache/commons/jcs3/jcache/EnsureCDIIsTestedWhenTCKsRunTest.java b/...he-tck/src/test/java/org/apache/commons/jcs3/jcache/EnsureCDIIsTestedWhenTCKsRunTest.java
@@ -18,8 +18,7 @@
  */
 package org.apache.commons.jcs3.jcache;
 
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Iterator;
@@ -39,7 +38,7 @@ void testCheckOWBProvider()
         try {
             final Iterator<BeanProvider> iterator = ServiceLoader.load(BeanProvider.class).iterator();
             assertTrue(iterator.hasNext());
-            assertThat(iterator.next(), instanceOf(OWBBeanProvider.class));
+            assertInstanceOf(OWBBeanProvider.class, iterator.next());
         } catch (final java.lang.UnsupportedClassVersionError e) {
             System.err.println("Ignoring checkOWBProvider test failure on " + System.getProperty("java.version"));
         }

diff --git a/commons-jcs3-jcache/pom.xml b/commons-jcs3-jcache/pom.xml
@@ -63,11 +63,6 @@
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/pom.xml b/pom.xml
@@ -333,12 +333,6 @@
       </dependency>
 
       <!--  Test dependencies -->
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest</artifactId>
-        <version>${hamcrest.version}</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter</artifactId>
@@ -560,7 +554,6 @@
 
     <test.type>Unit</test.type>
     <doclint>none</doclint>
-    <hamcrest.version>3.0</hamcrest.version>
     <!-- project.build.outputTimestamp is managed by Maven plugins, see https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
     <project.build.outputTimestamp>2022-01-01T00:00:00Z</project.build.outputTimestamp>
   </properties>