HHH-19847 - Drop JUnit 4 support: removed some leftover junit4 references from jcache + a few very minor cleanups

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/CacheableNaturalIdTest.java

@@ -21,7 +21,7 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Vlad Mihalcea

hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/SecondLevelCacheTest.java

@@ -35,7 +35,7 @@
 
 import static org.hibernate.jpa.HibernateHints.HINT_CACHEABLE;
 import static org.hibernate.jpa.HibernateHints.HINT_CACHE_REGION;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 
 /**
@@ -74,7 +74,7 @@ public void testCache(EntityManagerFactoryScope scope) {
 			log.info("Native load by id");
 			Session session = entityManager.unwrap(Session.class);
 			//tag::caching-entity-native-example[]
-			Person person = session.get(Person.class, 1L);
+			Person person = session.find(Person.class, 1L);
 			//end::caching-entity-native-example[]
 		});
 
@@ -208,7 +208,7 @@ public void testCache(EntityManagerFactoryScope scope) {
 			Session session = entityManager.unwrap(Session.class);
 			//tag::caching-management-cache-mode-entity-native-example[]
 			session.setCacheMode(CacheMode.REFRESH);
-			Person person = session.get(Person.class, 1L);
+			Person person = session.find(Person.class, 1L);
 			//end::caching-management-cache-mode-entity-native-example[]
 		});
 

hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/HibernateCacheTest.java

@@ -57,7 +57,7 @@ public void testQueryCacheInvalidation() {
 
 		s = sessionFactory().openSession();
 		t = s.beginTransaction();
-		i = s.get( Item.class, i.getId() );
+		i = s.find( Item.class, i.getId() );
 
 		assertThat( slcs.getHitCount(), equalTo( 1L ) );
 		assertThat( slcs.getMissCount(), equalTo( 0L ) );
@@ -117,8 +117,6 @@ public void testStaleWritesLeaveCacheConsistent() {
 		txn.commit();
 		s.close();
 
-		Long initialVersion = item.getVersion();
-
 		// manually revert the version property
 		item.setVersion( item.getVersion() - 1 );
 
@@ -209,7 +207,7 @@ public void testGeneralUsage() {
 		mgr.addEmailToPerson( steveId, "[email protected]" );
 		mgr.addEmailToPerson( steveId, "[email protected]" );
 		mgr.addTalismanToPerson( steveId, "rabbit foot" );
-		mgr.addTalismanToPerson( steveId, "john de conqueroo" );
+		mgr.addTalismanToPerson( steveId, "john de conqueror" );
 
 		PhoneNumber p1 = new PhoneNumber();
 		p1.setNumberType( "Office" );

hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/InsertedDataTest.java

@@ -226,7 +226,7 @@ public void testInsertWithRefreshThenRollback() {
 		inTransaction(
 				sessionFactory,
 				s -> {
-					CacheableItem item = s.get( CacheableItem.class, 1L );
+					CacheableItem item = s.find( CacheableItem.class, 1L );
 					assertNull( item, "it should be null" );
 				}
 		);
@@ -280,7 +280,7 @@ public void testInsertWithClearThenRollback() {
 					s.persist( item );
 					s.flush();
 					s.clear();
-					item = s.get( CacheableItem.class, item.getId() );
+					s.find( CacheableItem.class, item.getId() );
 					s.getTransaction().markRollbackOnly();
 				}
 		);
@@ -290,7 +290,7 @@ public void testInsertWithClearThenRollback() {
 		inTransaction(
 				sessionFactory,
 				s -> {
-					final CacheableItem item = s.get( CacheableItem.class, 1L );
+					final CacheableItem item = s.find( CacheableItem.class, 1L );
 					assertNull( item, "it should be null" );
 				}
 		);
@@ -308,7 +308,7 @@ public void testInsertWithClearThenRollback2() {
 					s.persist( item );
 					s.flush();
 					s.clear();
-					item = s.get( CacheableEmbeddedIdItem.class, item.getId() );
+					s.find( CacheableEmbeddedIdItem.class, item.getId() );
 					s.getTransaction().markRollbackOnly();
 				}
 		);
@@ -318,7 +318,7 @@ public void testInsertWithClearThenRollback2() {
 		inTransaction(
 				sessionFactory,
 				s -> {
-					final CacheableEmbeddedIdItem item = s.get( CacheableEmbeddedIdItem.class, new PK( 2l ) );
+					final CacheableEmbeddedIdItem item = s.find( CacheableEmbeddedIdItem.class, new PK( 2l ) );
 					assertNull( item, "it should be null" );
 				}
 		);

hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/RefreshUpdatedDataTest.java

@@ -130,19 +130,19 @@ public void testUpdateAndFlushThenRefresh() {
 				s1 -> {
 					final String AFTER = "after";
 
-					ReadWriteCacheableItem readWriteCacheableItem1 = s1.get( ReadWriteCacheableItem.class, 1L );
+					ReadWriteCacheableItem readWriteCacheableItem1 = s1.find( ReadWriteCacheableItem.class, 1L );
 					readWriteCacheableItem1.setName( AFTER );
 					readWriteCacheableItem1.getTags().remove("ORM");
 
-					ReadWriteVersionedCacheableItem readWriteVersionedCacheableItem1 = s1.get( ReadWriteVersionedCacheableItem.class, 1L );
+					ReadWriteVersionedCacheableItem readWriteVersionedCacheableItem1 = s1.find( ReadWriteVersionedCacheableItem.class, 1L );
 					readWriteVersionedCacheableItem1.setName( AFTER );
 					readWriteVersionedCacheableItem1.getTags().remove("ORM");
 
-					NonStrictReadWriteCacheableItem nonStrictReadWriteCacheableItem1 = s1.get( NonStrictReadWriteCacheableItem.class, 1L );
+					NonStrictReadWriteCacheableItem nonStrictReadWriteCacheableItem1 = s1.find( NonStrictReadWriteCacheableItem.class, 1L );
 					nonStrictReadWriteCacheableItem1.setName( AFTER );
 					nonStrictReadWriteCacheableItem1.getTags().remove("ORM");
 
-					NonStrictReadWriteVersionedCacheableItem nonStrictReadWriteVersionedCacheableItem1 = s1.get( NonStrictReadWriteVersionedCacheableItem.class, 1L );
+					NonStrictReadWriteVersionedCacheableItem nonStrictReadWriteVersionedCacheableItem1 = s1.find( NonStrictReadWriteVersionedCacheableItem.class, 1L );
 					nonStrictReadWriteVersionedCacheableItem1.setName( AFTER );
 					nonStrictReadWriteVersionedCacheableItem1.getTags().remove("ORM");
 
@@ -164,10 +164,10 @@ public void testUpdateAndFlushThenRefresh() {
 					inTransaction(
 							sessionFactory,
 							s2 -> {
-								ReadWriteCacheableItem readWriteCacheableItem2 = s2.get( ReadWriteCacheableItem.class, 1L );
-								ReadWriteVersionedCacheableItem readWriteVersionedCacheableItem2 = s2.get( ReadWriteVersionedCacheableItem.class, 1L );
-								NonStrictReadWriteCacheableItem nonStrictReadWriteCacheableItem2 = s2.get( NonStrictReadWriteCacheableItem.class, 1L );
-								NonStrictReadWriteVersionedCacheableItem nonStrictReadWriteVersionedCacheableItem2 = s2.get( NonStrictReadWriteVersionedCacheableItem.class, 1L );
+								ReadWriteCacheableItem readWriteCacheableItem2 = s2.find( ReadWriteCacheableItem.class, 1L );
+								ReadWriteVersionedCacheableItem readWriteVersionedCacheableItem2 = s2.find( ReadWriteVersionedCacheableItem.class, 1L );
+								NonStrictReadWriteCacheableItem nonStrictReadWriteCacheableItem2 = s2.find( NonStrictReadWriteCacheableItem.class, 1L );
+								NonStrictReadWriteVersionedCacheableItem nonStrictReadWriteVersionedCacheableItem2 = s2.find( NonStrictReadWriteVersionedCacheableItem.class, 1L );
 
 								assertEquals( BEFORE, readWriteCacheableItem2.getName() );
 								assertEquals( 2, readWriteCacheableItem2.getTags().size() );