Skip to content

HHH-19847 - Drop JUnit 4 support: removed some leftover junit4 references from jcache #11270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2025
Merged

HHH-19847 - Drop JUnit 4 support: removed some leftover junit4 references from jcache #11270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/CacheableNaturalIdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions hibernate-jcache/src/test/java/org/hibernate/orm/test/caching/SecondLevelCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;


/**
Expand Down Expand Up @@ -74,7 +74,7 @@
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);

Check notice

Code scanning / CodeQL

Unread local variable Note test

Variable 'Person person' is never read.
//end::caching-entity-native-example[]
});

Expand Down Expand Up @@ -208,7 +208,7 @@
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);

Check notice

Code scanning / CodeQL

Unread local variable Note test

Variable 'Person person' is never read.
//end::caching-management-cache-mode-entity-native-example[]
});

Expand Down
6 changes: 2 additions & 4 deletions hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/HibernateCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) );
Expand Down Expand Up @@ -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 );

Expand Down Expand Up @@ -209,7 +207,7 @@ public void testGeneralUsage() {
mgr.addEmailToPerson( steveId, "steve@tc.com" );
mgr.addEmailToPerson( steveId, "sharrif@tc.com" );
mgr.addTalismanToPerson( steveId, "rabbit foot" );
mgr.addTalismanToPerson( steveId, "john de conqueroo" );
mgr.addTalismanToPerson( steveId, "john de conqueror" );

PhoneNumber p1 = new PhoneNumber();
p1.setNumberType( "Office" );
Expand Down
10 changes: 5 additions & 5 deletions hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/InsertedDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
}
);
Expand Down Expand Up @@ -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();
}
);
Expand All @@ -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" );
}
);
Expand All @@ -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();
}
);
Expand All @@ -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" );
}
);
Expand Down
16 changes: 8 additions & 8 deletions hibernate-jcache/src/test/java/org/hibernate/orm/test/jcache/RefreshUpdatedDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand All @@ -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() );
Expand Down