Skip to content

Commit 01e4ca3

Browse files
dreab8dreab8
committed
HHH-19846 Drop JUnit 4 usage
1 parent 1a8a81f commit 01e4ca3

File tree

3 files changed

+35
-54
lines changed

3 files changed

+35
-54
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.hibernate.annotations.Immutable;
1212
import org.hibernate.boot.MetadataSources;
1313
import org.hibernate.boot.registry.StandardServiceRegistry;
14-
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
1514
import org.hibernate.boot.spi.MetadataImplementor;
1615
import org.hibernate.cache.spi.access.AccessType;
1716
import org.hibernate.cfg.AvailableSettings;
@@ -36,10 +35,9 @@ public class DefaultCacheConcurrencyPropertyTest {
3635
@JiraKey(value = "HHH-9763")
3736
public void testExplicitDefault() {
3837

39-
final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder()
38+
try (StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder()
4039
.applySetting( AvailableSettings.DEFAULT_CACHE_CONCURRENCY_STRATEGY, "read-only" )
41-
.build();
42-
try {
40+
.build()) {
4341
assertThat( ssr.getService( ConfigurationService.class ).getSettings()
4442
.get( AvailableSettings.DEFAULT_CACHE_CONCURRENCY_STRATEGY ) )
4543
.isEqualTo( "read-only" );
@@ -58,9 +56,6 @@ public void testExplicitDefault() {
5856
assertThat( persister.getCacheAccessStrategy() ).isNotNull();
5957
}
6058
}
61-
finally {
62-
StandardServiceRegistryBuilder.destroy( ssr );
63-
}
6459
}
6560

6661
@Entity(name = "TheEntity")

‎hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/PersisterClassProviderTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public class PersisterClassProviderTest {
2626

2727
@Test
2828
public void testPersisterClassProvider() {
29-
3029
Configuration cfg = new Configuration();
3130
cfg.addAnnotatedClass( Gate.class );
3231
ServiceRegistry serviceRegistry = ServiceRegistryUtil.serviceRegistryBuilder()

‎hibernate-core/src/test/java/org/hibernate/orm/test/engine/spi/EntityEntryTest.java‎

Lines changed: 33 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,21 @@
44
*/
55
package org.hibernate.orm.test.engine.spi;
66

7-
import java.io.ByteArrayInputStream;
8-
import java.io.ByteArrayOutputStream;
9-
import java.io.InputStream;
10-
import java.io.ObjectInputStream;
11-
import java.io.ObjectOutputStream;
12-
137
import org.hibernate.LockMode;
148
import org.hibernate.engine.internal.EntityEntryImpl;
159
import org.hibernate.engine.spi.EntityEntry;
1610
import org.hibernate.engine.spi.PersistenceContext;
1711
import org.hibernate.engine.spi.SessionImplementor;
1812
import org.hibernate.engine.spi.Status;
13+
import org.junit.jupiter.api.Test;
1914

20-
import org.junit.Assert;
21-
import org.junit.Test;
15+
import java.io.ByteArrayInputStream;
16+
import java.io.ByteArrayOutputStream;
17+
import java.io.InputStream;
18+
import java.io.ObjectInputStream;
19+
import java.io.ObjectOutputStream;
2220

23-
import static org.junit.Assert.assertEquals;
24-
import static org.junit.Assert.assertFalse;
25-
import static org.junit.Assert.assertTrue;
21+
import static org.assertj.core.api.Assertions.assertThat;
2622
import static org.mockito.Mockito.mock;
2723
import static org.mockito.Mockito.when;
2824

@@ -36,27 +32,27 @@ public class EntityEntryTest {
3632
@Test
3733
public void packedAttributesAreSetByConstructor() {
3834
EntityEntry entityEntry = createEntityEntry();
39-
assertEquals( LockMode.OPTIMISTIC, entityEntry.getLockMode() );
40-
Assert.assertEquals( Status.MANAGED, entityEntry.getStatus() );
41-
assertTrue( entityEntry.isExistsInDatabase() );
42-
assertTrue( entityEntry.isBeingReplicated() );
35+
assertThat( entityEntry.getLockMode() ).isEqualTo( LockMode.OPTIMISTIC );
36+
assertThat( entityEntry.getStatus() ).isEqualTo( Status.MANAGED );
37+
assertThat( entityEntry.isExistsInDatabase() ).isTrue();
38+
assertThat( entityEntry.isBeingReplicated() ).isTrue();
4339
}
4440

4541
@Test
4642
public void testLockModeCanBeSetAndDoesNotAffectOtherPackedAttributes() {
4743
// Given
4844
EntityEntry entityEntry = createEntityEntry();
49-
assertEquals( LockMode.OPTIMISTIC, entityEntry.getLockMode() );
50-
assertEquals( Status.MANAGED, entityEntry.getStatus() );
51-
assertTrue( entityEntry.isExistsInDatabase() );
52-
assertTrue( entityEntry.isBeingReplicated() );
45+
assertThat( entityEntry.getLockMode() ).isEqualTo( LockMode.OPTIMISTIC );
46+
assertThat( entityEntry.getStatus() ).isEqualTo( Status.MANAGED );
47+
assertThat( entityEntry.isExistsInDatabase() ).isTrue();
48+
assertThat( entityEntry.isBeingReplicated() ).isTrue();
5349
// When
5450
entityEntry.setLockMode( LockMode.PESSIMISTIC_READ );
5551
// Then
56-
assertEquals( LockMode.PESSIMISTIC_READ, entityEntry.getLockMode() );
57-
assertEquals( Status.MANAGED, entityEntry.getStatus() );
58-
assertTrue( entityEntry.isExistsInDatabase() );
59-
assertTrue( entityEntry.isBeingReplicated() );
52+
assertThat( entityEntry.getLockMode() ).isEqualTo( LockMode.PESSIMISTIC_READ );
53+
assertThat( entityEntry.getStatus() ).isEqualTo( Status.MANAGED );
54+
assertThat( entityEntry.isExistsInDatabase() ).isTrue();
55+
assertThat( entityEntry.isBeingReplicated() ).isTrue();
6056
}
6157

6258
@Test
@@ -66,10 +62,10 @@ public void testStatusCanBeSetAndDoesNotAffectOtherPackedAttributes() {
6662
// When
6763
entityEntry.setStatus( Status.DELETED );
6864
// Then
69-
assertEquals( LockMode.OPTIMISTIC, entityEntry.getLockMode() );
70-
assertEquals( Status.DELETED, entityEntry.getStatus() );
71-
assertTrue( entityEntry.isExistsInDatabase() );
72-
assertTrue( entityEntry.isBeingReplicated() );
65+
assertThat( entityEntry.getLockMode() ).isEqualTo( LockMode.OPTIMISTIC );
66+
assertThat( entityEntry.getStatus() ).isEqualTo( Status.DELETED );
67+
assertThat( entityEntry.isExistsInDatabase() ).isTrue();
68+
assertThat( entityEntry.isBeingReplicated() ).isTrue();
7369
}
7470

7571
@Test
@@ -79,10 +75,10 @@ public void testPostDeleteSetsStatusAndExistsInDatabaseWithoutAffectingOtherPack
7975
// When
8076
entityEntry.postDelete();
8177
// Then
82-
assertEquals( LockMode.OPTIMISTIC, entityEntry.getLockMode() );
83-
assertEquals( Status.GONE, entityEntry.getStatus() );
84-
assertFalse( entityEntry.isExistsInDatabase() );
85-
assertTrue( entityEntry.isBeingReplicated() );
78+
assertThat( entityEntry.getLockMode() ).isEqualTo( LockMode.OPTIMISTIC );
79+
assertThat( entityEntry.getStatus() ).isEqualTo( Status.GONE );
80+
assertThat( entityEntry.isExistsInDatabase() ).isFalse();
81+
assertThat( entityEntry.isBeingReplicated() ).isTrue();
8682
}
8783

8884
@Test
@@ -91,39 +87,30 @@ public void testSerializationAndDeserializationKeepCorrectPackedAttributes() thr
9187

9288
ByteArrayOutputStream baos = new ByteArrayOutputStream();
9389
ObjectOutputStream oos = new ObjectOutputStream( baos );
94-
entityEntry.serialize(oos);
90+
entityEntry.serialize( oos );
9591
oos.flush();
9692

9793
InputStream is = new ByteArrayInputStream( baos.toByteArray() );
9894
EntityEntry deserializedEntry =
9995
EntityEntryImpl.deserialize( new ObjectInputStream( is ),
10096
getPersistenceContextMock() );
10197

102-
assertEquals( LockMode.OPTIMISTIC, deserializedEntry.getLockMode() );
103-
assertEquals( Status.MANAGED, deserializedEntry.getStatus() );
104-
assertTrue( deserializedEntry.isExistsInDatabase() );
105-
assertTrue( deserializedEntry.isBeingReplicated() );
98+
assertThat( deserializedEntry.getLockMode() ).isEqualTo( LockMode.OPTIMISTIC );
99+
assertThat( deserializedEntry.getStatus() ).isEqualTo( Status.MANAGED );
100+
assertThat( deserializedEntry.isExistsInDatabase() ).isTrue();
101+
assertThat( deserializedEntry.isBeingReplicated() ).isTrue();
106102
}
107103

108104
private EntityEntry createEntityEntry() {
109105
return new EntityEntryImpl(
110-
// status
111106
Status.MANAGED,
112-
// loadedState
113-
new Object[]{},
114-
// rowId
107+
new Object[] {},
115108
1L,
116-
// id
117109
42L,
118-
// version
119110
23L,
120-
// lockMode
121111
LockMode.OPTIMISTIC,
122-
// existsInDatabase
123112
true,
124-
// persister
125113
null,
126-
// disableVersionIncrement
127114
true,
128115
getPersistenceContextMock()
129116
);

0 commit comments

Comments
 (0)