Skip to content

Commit 0cda6aa

Browse files
jrenaatjrenaat
committed
HHH-19846 - Remove JUnit4: org.hibernate.orm.test.mapping.basic/bitset
Signed-off-by: Jan Schatteman <[email protected]>
1 parent ef71870 commit 0cda6aa

35 files changed

+305
-487
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/AutoQuotingTest.java‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,28 @@
44
*/
55
package org.hibernate.orm.test.mapping.basic;
66

7-
import java.util.Map;
87
import jakarta.persistence.Entity;
98
import jakarta.persistence.Id;
109

1110
import org.hibernate.cfg.AvailableSettings;
12-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
1311

14-
import org.junit.Test;
15-
16-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
12+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
13+
import org.hibernate.testing.orm.junit.Jpa;
14+
import org.hibernate.testing.orm.junit.Setting;
15+
import org.junit.jupiter.api.Test;
1716

1817
/**
1918
* @author Vlad Mihalcea
2019
*/
21-
public class AutoQuotingTest extends BaseEntityManagerFunctionalTestCase {
22-
23-
@Override
24-
protected Class<?>[] getAnnotatedClasses() {
25-
return new Class<?>[] {
26-
Product.class
27-
};
28-
}
29-
30-
@Override
31-
protected Map buildSettings() {
32-
Map settings = super.buildSettings();
33-
settings.put(AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, true);
34-
return settings;
35-
}
20+
@Jpa(
21+
annotatedClasses = {AutoQuotingTest.Product.class},
22+
integrationSettings = {@Setting(name = AvailableSettings.GLOBALLY_QUOTED_IDENTIFIERS, value = "true")}
23+
)
24+
public class AutoQuotingTest {
3625

3726
@Test
38-
public void test() {
39-
doInJPA(this::entityManagerFactory, entityManager -> {
27+
public void test(EntityManagerFactoryScope scope) {
28+
scope.inTransaction( entityManager -> {
4029
//tag::basic-auto-quoting-persistence-example[]
4130
Product product = new Product();
4231
product.setId(1L);

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BlobByteArrayTest.java‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,21 @@
88
import jakarta.persistence.Id;
99
import jakarta.persistence.Lob;
1010

11-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
11+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
12+
import org.hibernate.testing.orm.junit.Jpa;
13+
import org.junit.jupiter.api.Test;
1214

13-
import org.junit.Test;
14-
15-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
16-
import static org.junit.Assert.assertArrayEquals;
15+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
1716

1817
/**
1918
* @author Vlad Mihalcea
2019
*/
21-
public class BlobByteArrayTest extends BaseEntityManagerFunctionalTestCase {
22-
23-
@Override
24-
protected Class<?>[] getAnnotatedClasses() {
25-
return new Class<?>[] {
26-
Product.class
27-
};
28-
}
20+
@Jpa( annotatedClasses = {BlobByteArrayTest.Product.class} )
21+
public class BlobByteArrayTest {
2922

3023
@Test
31-
public void test() {
32-
Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
24+
public void test(EntityManagerFactoryScope scope) {
25+
Integer productId = scope.fromTransaction( entityManager -> {
3326
final Product product = new Product();
3427
product.setId(1);
3528
product.setName("Mobile phone");
@@ -38,7 +31,7 @@ public void test() {
3831
entityManager.persist(product);
3932
return product.getId();
4033
});
41-
doInJPA(this::entityManagerFactory, entityManager -> {
34+
scope.inTransaction( entityManager -> {
4235
Product product = entityManager.find(Product.class, productId);
4336

4437
assertArrayEquals(new byte[] {1, 2, 3}, product.getImage());

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BlobTest.java‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,24 @@
1313
import jakarta.persistence.Id;
1414
import jakarta.persistence.Lob;
1515

16-
import org.hibernate.Session;
1716
import org.hibernate.engine.jdbc.proxy.BlobProxy;
18-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
1917

20-
import org.junit.Test;
18+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
19+
import org.hibernate.testing.orm.junit.Jpa;
20+
import org.junit.jupiter.api.Test;
2121

22-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
23-
import static org.junit.Assert.assertArrayEquals;
24-
import static org.junit.Assert.fail;
22+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
23+
import static org.junit.jupiter.api.Assertions.fail;
2524

2625
/**
2726
* @author Vlad Mihalcea
2827
*/
29-
public class BlobTest extends BaseEntityManagerFunctionalTestCase {
30-
31-
@Override
32-
protected Class<?>[] getAnnotatedClasses() {
33-
return new Class<?>[] {
34-
Product.class
35-
};
36-
}
28+
@Jpa( annotatedClasses = {BlobTest.Product.class} )
29+
public class BlobTest {
3730

3831
@Test
39-
public void test() {
40-
Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
41-
Session session = entityManager.unwrap(Session.class);
32+
public void test(EntityManagerFactoryScope scope) {
33+
Integer productId = scope.fromTransaction( entityManager -> {
4234

4335
//tag::basic-blob-persist-example[]
4436
byte[] image = new byte[] {1, 2, 3};
@@ -54,7 +46,7 @@ public void test() {
5446

5547
return product.getId();
5648
});
57-
doInJPA(this::entityManagerFactory, entityManager -> {
49+
scope.inTransaction( entityManager -> {
5850
try {
5951
//tag::basic-blob-find-example[]
6052

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/CalendarWithTemporalTimestampTest.java‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,23 @@
1313
import jakarta.persistence.Temporal;
1414
import jakarta.persistence.TemporalType;
1515

16-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
17-
18-
import org.junit.Test;
19-
20-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
16+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
17+
import org.hibernate.testing.orm.junit.Jpa;
18+
import org.junit.jupiter.api.Test;
2119

2220
/**
2321
* @author Vlad Mihalcea
2422
*/
25-
public class CalendarWithTemporalTimestampTest extends BaseEntityManagerFunctionalTestCase {
26-
27-
@Override
28-
protected Class<?>[] getAnnotatedClasses() {
29-
return new Class<?>[] {
30-
DateEvent.class
31-
};
32-
}
23+
@Jpa( annotatedClasses = {CalendarWithTemporalTimestampTest.DateEvent.class} )
24+
public class CalendarWithTemporalTimestampTest {
3325

3426
@Test
35-
public void testLifecycle() {
27+
public void testLifecycle(EntityManagerFactoryScope scope) {
3628
final Calendar calendar = new GregorianCalendar();
37-
doInJPA(this::entityManagerFactory, entityManager -> {
29+
scope.inTransaction( entityManager -> {
3830
entityManager.persist(new DateEvent(calendar));
3931
});
40-
doInJPA(this::entityManagerFactory, entityManager -> {
32+
scope.inTransaction( entityManager -> {
4133
DateEvent dateEvent = entityManager.createQuery("from DateEvent", DateEvent.class).getSingleResult();
4234
//Assert.assertEquals(calendar, dateEvent.getTimestamp());
4335
});

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClobCharArrayTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.junit.jupiter.api.AfterEach;
1414
import org.junit.jupiter.api.Test;
1515

16-
import static org.junit.Assert.assertArrayEquals;
16+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
1717

1818
/**
1919
* @author Vlad Mihalcea

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClobStringTest.java‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,21 @@
88
import jakarta.persistence.Id;
99
import jakarta.persistence.Lob;
1010

11-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
11+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
12+
import org.hibernate.testing.orm.junit.Jpa;
13+
import org.junit.jupiter.api.Test;
1214

13-
import org.junit.Test;
14-
15-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
16-
import static org.junit.Assert.assertEquals;
15+
import static org.junit.jupiter.api.Assertions.assertEquals;
1716

1817
/**
1918
* @author Vlad Mihalcea
2019
*/
21-
public class ClobStringTest extends BaseEntityManagerFunctionalTestCase {
22-
23-
@Override
24-
protected Class<?>[] getAnnotatedClasses() {
25-
return new Class<?>[] {
26-
Product.class
27-
};
28-
}
20+
@Jpa( annotatedClasses = {ClobStringTest.Product.class} )
21+
public class ClobStringTest {
2922

3023
@Test
31-
public void test() {
32-
Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
24+
public void test(EntityManagerFactoryScope scope) {
25+
Integer productId = scope.fromTransaction( entityManager -> {
3326
final Product product = new Product();
3427
product.setId(1);
3528
product.setName("Mobile phone");
@@ -38,7 +31,7 @@ public void test() {
3831
entityManager.persist(product);
3932
return product.getId();
4033
});
41-
doInJPA(this::entityManagerFactory, entityManager -> {
34+
scope.inTransaction( entityManager -> {
4235
Product product = entityManager.find(Product.class, productId);
4336
assertEquals("My product warranty", product.getWarranty());
4437
});

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ClobTest.java‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,23 @@
1515

1616
import org.hibernate.Session;
1717
import org.hibernate.engine.jdbc.proxy.ClobProxy;
18-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
1918

20-
import org.junit.Test;
19+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
20+
import org.hibernate.testing.orm.junit.Jpa;
21+
import org.junit.jupiter.api.Test;
2122

22-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
23-
import static org.junit.Assert.assertEquals;
24-
import static org.junit.Assert.fail;
23+
import static org.junit.jupiter.api.Assertions.assertEquals;
24+
import static org.junit.jupiter.api.Assertions.fail;
2525

2626
/**
2727
* @author Vlad Mihalcea
2828
*/
29-
public class ClobTest extends BaseEntityManagerFunctionalTestCase {
30-
31-
@Override
32-
protected Class<?>[] getAnnotatedClasses() {
33-
return new Class<?>[] {
34-
Product.class
35-
};
36-
}
29+
@Jpa( annotatedClasses = {ClobTest.Product.class} )
30+
public class ClobTest {
3731

3832
@Test
39-
public void test() {
40-
Integer productId = doInJPA(this::entityManagerFactory, entityManager -> {
33+
public void test(EntityManagerFactoryScope scope) {
34+
Integer productId = scope.fromTransaction( entityManager -> {
4135
Session session = entityManager.unwrap(Session.class);
4236

4337
//tag::basic-clob-persist-example[]
@@ -54,7 +48,7 @@ public void test() {
5448

5549
return product.getId();
5650
});
57-
doInJPA(this::entityManagerFactory, entityManager -> {
51+
scope.inTransaction( entityManager -> {
5852
try {
5953
//tag::basic-clob-find-example[]
6054

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ColumnTransformerTest.java‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,45 +11,39 @@
1111
import org.hibernate.annotations.ColumnTransformer;
1212
import org.hibernate.annotations.CompositeType;
1313
import org.hibernate.dialect.H2Dialect;
14-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
1514

16-
import org.hibernate.testing.RequiresDialect;
17-
import org.junit.Test;
15+
import org.hibernate.testing.orm.junit.RequiresDialect;
16+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
17+
import org.hibernate.testing.orm.junit.Jpa;
18+
import org.junit.jupiter.api.Test;
1819

1920
import jakarta.persistence.AttributeOverride;
2021
import jakarta.persistence.AttributeOverrides;
2122
import jakarta.persistence.Column;
2223
import jakarta.persistence.Entity;
2324
import jakarta.persistence.Id;
2425

25-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
26-
import static org.junit.Assert.assertEquals;
26+
import static org.junit.jupiter.api.Assertions.assertEquals;
2727

2828
/**
2929
* @author Vlad Mihalcea
3030
*/
3131
@RequiresDialect(H2Dialect.class)
32-
public class ColumnTransformerTest extends BaseEntityManagerFunctionalTestCase {
33-
34-
@Override
35-
protected Class<?>[] getAnnotatedClasses() {
36-
return new Class<?>[] {
37-
Savings.class
38-
};
39-
}
32+
@Jpa( annotatedClasses = {ColumnTransformerTest.Savings.class} )
33+
public class ColumnTransformerTest {
4034

4135
@Test
42-
public void testLifecycle() {
36+
public void testLifecycle(EntityManagerFactoryScope scope) {
4337
//tag::mapping-column-read-and-write-composite-type-persistence-example[]
44-
doInJPA(this::entityManagerFactory, entityManager -> {
38+
scope.inTransaction( entityManager -> {
4539
//tag::basic-datetime-temporal-date-persist-example[]
4640
Savings savings = new Savings();
4741
savings.setId(1L);
4842
savings.setWallet(new MonetaryAmount(BigDecimal.TEN, Currency.getInstance(Locale.US)));
4943
entityManager.persist(savings);
5044
});
5145

52-
doInJPA(this::entityManagerFactory, entityManager -> {
46+
scope.inTransaction( entityManager -> {
5347
Savings savings = entityManager.find(Savings.class, 1L);
5448
assertEquals(10, savings.getWallet().getAmount().intValue());
5549
assertEquals(Currency.getInstance(Locale.US), savings.getWallet().getCurrency());

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/DateWithTemporalDateTest.java‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,19 @@
1212
import jakarta.persistence.Temporal;
1313
import jakarta.persistence.TemporalType;
1414

15-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
16-
17-
import org.junit.Test;
18-
19-
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
15+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
16+
import org.hibernate.testing.orm.junit.Jpa;
17+
import org.junit.jupiter.api.Test;
2018

2119
/**
2220
* @author Vlad Mihalcea
2321
*/
24-
public class DateWithTemporalDateTest extends BaseEntityManagerFunctionalTestCase {
25-
26-
@Override
27-
protected Class<?>[] getAnnotatedClasses() {
28-
return new Class<?>[] {
29-
DateEvent.class
30-
};
31-
}
22+
@Jpa( annotatedClasses = {DateWithTemporalDateTest.DateEvent.class} )
23+
public class DateWithTemporalDateTest {
3224

3325
@Test
34-
public void testLifecycle() {
35-
doInJPA(this::entityManagerFactory, entityManager -> {
26+
public void testLifecycle(EntityManagerFactoryScope scope) {
27+
scope.inTransaction( entityManager -> {
3628
//tag::basic-datetime-temporal-date-persist-example[]
3729
DateEvent dateEvent = new DateEvent(new Date());
3830
entityManager.persist(dateEvent);

0 commit comments

Comments
 (0)