Skip to content

Commit c31cf7e

Browse files
jrenaatjrenaat
committed
HHH-19846 - Remove JUnit4: org.hibernate.orm.test.jpa.procedure
Signed-off-by: Jan Schatteman <[email protected]>
1 parent 2a49dac commit c31cf7e

10 files changed

+296
-375
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/AbstractStoredProcedureTest.java‎

Lines changed: 52 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -8,82 +8,80 @@
88

99
import org.hibernate.engine.spi.SessionFactoryImplementor;
1010
import org.hibernate.engine.spi.SharedSessionContractImplementor;
11-
import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
1211
import org.hibernate.procedure.internal.NamedCallableQueryMementoImpl;
1312
import org.hibernate.procedure.spi.NamedCallableQueryMemento;
1413
import org.hibernate.procedure.spi.ParameterStrategy;
1514
import org.hibernate.procedure.spi.ProcedureParameterImplementor;
15+
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
1616
import org.hibernate.type.BasicType;
1717
import org.hibernate.type.descriptor.java.IntegerJavaType;
1818
import org.hibernate.type.descriptor.java.LongJavaType;
1919
import org.hibernate.type.descriptor.java.StringJavaType;
2020

21-
import org.junit.Test;
21+
import org.junit.jupiter.api.Test;
2222

23-
import jakarta.persistence.EntityManager;
24-
25-
import static org.junit.Assert.assertEquals;
26-
import static org.junit.Assert.assertNotNull;
23+
import static org.junit.jupiter.api.Assertions.assertEquals;
24+
import static org.junit.jupiter.api.Assertions.assertNotNull;
2725

2826
/**
2927
* @author Strong Liu <[email protected]>
3028
*/
31-
public abstract class AbstractStoredProcedureTest extends BaseEntityManagerFunctionalTestCase {
29+
public abstract class AbstractStoredProcedureTest {
3230
@Test
33-
public void testNamedStoredProcedureBinding() {
34-
EntityManager em = getOrCreateEntityManager();
35-
SessionFactoryImplementor sf = em.getEntityManagerFactory().unwrap( SessionFactoryImplementor.class );
36-
final NamedCallableQueryMementoImpl m1 = (NamedCallableQueryMementoImpl) sf.getQueryEngine()
37-
.getNamedObjectRepository()
38-
.getCallableQueryMemento( "s1" );
39-
assertNotNull( m1 );
40-
assertEquals( "p1", m1.getCallableName() );
41-
assertEquals( ParameterStrategy.NAMED, m1.getParameterStrategy() );
42-
List<NamedCallableQueryMemento.ParameterMemento> list = m1.getParameterMementos();
43-
assertEquals( 2, list.size() );
44-
NamedCallableQueryMemento.ParameterMemento memento = list.get( 0 );
45-
ProcedureParameterImplementor parameterImplementor = memento.resolve( (SharedSessionContractImplementor) em );
46-
assertEquals( "p11", parameterImplementor.getName() );
47-
assertEquals( jakarta.persistence.ParameterMode.IN, parameterImplementor.getMode() );
48-
BasicType hibernateType = (BasicType) parameterImplementor.getHibernateType();
49-
assertEquals( IntegerJavaType.INSTANCE, hibernateType.getJavaTypeDescriptor() );
50-
assertEquals( Integer.class, parameterImplementor.getParameterType() );
51-
52-
memento = list.get( 1 );
53-
parameterImplementor = memento.resolve( (SharedSessionContractImplementor) em );
54-
assertEquals( "p12", parameterImplementor.getName() );
55-
assertEquals( jakarta.persistence.ParameterMode.IN, parameterImplementor.getMode() );
56-
hibernateType = (BasicType) parameterImplementor.getHibernateType();
57-
assertEquals( IntegerJavaType.INSTANCE, hibernateType.getJavaTypeDescriptor() );
58-
assertEquals( Integer.class, parameterImplementor.getParameterType() );
31+
public void testNamedStoredProcedureBinding(EntityManagerFactoryScope scope) {
32+
scope.inEntityManager( em -> {
33+
SessionFactoryImplementor sf = em.getEntityManagerFactory().unwrap( SessionFactoryImplementor.class );
34+
final NamedCallableQueryMementoImpl m1 = (NamedCallableQueryMementoImpl) sf.getQueryEngine()
35+
.getNamedObjectRepository()
36+
.getCallableQueryMemento( "s1" );
37+
assertNotNull( m1 );
38+
assertEquals( "p1", m1.getCallableName() );
39+
assertEquals( ParameterStrategy.NAMED, m1.getParameterStrategy() );
40+
List<NamedCallableQueryMemento.ParameterMemento> list = m1.getParameterMementos();
41+
assertEquals( 2, list.size() );
42+
NamedCallableQueryMemento.ParameterMemento memento = list.get( 0 );
43+
ProcedureParameterImplementor parameterImplementor = memento.resolve( (SharedSessionContractImplementor) em );
44+
assertEquals( "p11", parameterImplementor.getName() );
45+
assertEquals( jakarta.persistence.ParameterMode.IN, parameterImplementor.getMode() );
46+
BasicType hibernateType = (BasicType) parameterImplementor.getHibernateType();
47+
assertEquals( IntegerJavaType.INSTANCE, hibernateType.getJavaTypeDescriptor() );
48+
assertEquals( Integer.class, parameterImplementor.getParameterType() );
5949

50+
memento = list.get( 1 );
51+
parameterImplementor = memento.resolve( (SharedSessionContractImplementor) em );
52+
assertEquals( "p12", parameterImplementor.getName() );
53+
assertEquals( jakarta.persistence.ParameterMode.IN, parameterImplementor.getMode() );
54+
hibernateType = (BasicType) parameterImplementor.getHibernateType();
55+
assertEquals( IntegerJavaType.INSTANCE, hibernateType.getJavaTypeDescriptor() );
56+
assertEquals( Integer.class, parameterImplementor.getParameterType() );
6057

61-
final NamedCallableQueryMementoImpl m2 = (NamedCallableQueryMementoImpl) sf.getQueryEngine()
62-
.getNamedObjectRepository()
63-
.getCallableQueryMemento( "s2" );
64-
assertNotNull( m2 );
65-
assertEquals( "p2", m2.getCallableName() );
66-
assertEquals( ParameterStrategy.POSITIONAL, m2.getParameterStrategy() );
67-
list = m2.getParameterMementos();
58+
final NamedCallableQueryMementoImpl m2 = (NamedCallableQueryMementoImpl) sf.getQueryEngine()
59+
.getNamedObjectRepository()
60+
.getCallableQueryMemento( "s2" );
61+
assertNotNull( m2 );
62+
assertEquals( "p2", m2.getCallableName() );
63+
assertEquals( ParameterStrategy.POSITIONAL, m2.getParameterStrategy() );
64+
list = m2.getParameterMementos();
6865

69-
memento = list.get( 0 );
70-
parameterImplementor = memento.resolve( (SharedSessionContractImplementor) em );
71-
assertEquals( Integer.valueOf( 1 ), parameterImplementor.getPosition() );
72-
assertEquals( jakarta.persistence.ParameterMode.INOUT, parameterImplementor.getMode() );
73-
hibernateType = (BasicType) parameterImplementor.getHibernateType();
66+
memento = list.get( 0 );
67+
parameterImplementor = memento.resolve( (SharedSessionContractImplementor) em );
68+
assertEquals( Integer.valueOf( 1 ), parameterImplementor.getPosition() );
69+
assertEquals( jakarta.persistence.ParameterMode.INOUT, parameterImplementor.getMode() );
70+
hibernateType = (BasicType) parameterImplementor.getHibernateType();
7471

75-
assertEquals( StringJavaType.INSTANCE, hibernateType.getJavaTypeDescriptor() );
76-
assertEquals( String.class, parameterImplementor.getParameterType() );
72+
assertEquals( StringJavaType.INSTANCE, hibernateType.getJavaTypeDescriptor() );
73+
assertEquals( String.class, parameterImplementor.getParameterType() );
7774

78-
memento = list.get( 1 );
79-
parameterImplementor = memento.resolve( (SharedSessionContractImplementor) em );
75+
memento = list.get( 1 );
76+
parameterImplementor = memento.resolve( (SharedSessionContractImplementor) em );
8077

81-
assertEquals( Integer.valueOf( 2 ), parameterImplementor.getPosition() );
82-
assertEquals( jakarta.persistence.ParameterMode.INOUT, parameterImplementor.getMode() );
83-
hibernateType = (BasicType) parameterImplementor.getHibernateType();
78+
assertEquals( Integer.valueOf( 2 ), parameterImplementor.getPosition() );
79+
assertEquals( jakarta.persistence.ParameterMode.INOUT, parameterImplementor.getMode() );
80+
hibernateType = (BasicType) parameterImplementor.getHibernateType();
8481

85-
assertEquals( LongJavaType.INSTANCE, hibernateType.getJavaTypeDescriptor() );
86-
assertEquals( Long.class, parameterImplementor.getParameterType() );
82+
assertEquals( LongJavaType.INSTANCE, hibernateType.getJavaTypeDescriptor() );
83+
assertEquals( Long.class, parameterImplementor.getParameterType() );
84+
} );
8785

8886
}
8987
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/AnnotationTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
package org.hibernate.orm.test.jpa.procedure;
66

77

8+
import org.hibernate.testing.orm.junit.Jpa;
9+
810
/**
911
* @author Strong Liu
1012
*/
13+
@Jpa(annotatedClasses = {User.class})
1114
public class AnnotationTest extends AbstractStoredProcedureTest {
12-
@Override
13-
protected Class<?>[] getAnnotatedClasses() {
14-
return new Class[] { User.class };
15-
}
1615
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/jpa/procedure/H2StoreProcedureTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import static org.hamcrest.core.Is.is;
3030
import static org.hamcrest.core.IsNot.not;
3131
import static org.hamcrest.core.IsNull.nullValue;
32-
import static org.junit.Assert.assertThat;
33-
import static org.junit.Assert.fail;
32+
import static org.hamcrest.MatcherAssert.assertThat;
33+
import static org.junit.jupiter.api.Assertions.fail;
3434

3535
/**
3636
* @author Andrea Boriero
@@ -71,7 +71,7 @@ public static ResultSet getAllEntities(Connection conn) throws SQLException {
7171
}
7272

7373
public static ResultSet entityById(Connection conn, long id) throws SQLException {
74-
return conn.createStatement().executeQuery( "select * from MY_ENTITY where id = " + Long.toString( id ) );
74+
return conn.createStatement().executeQuery( "select * from MY_ENTITY where id = " + id );
7575
}
7676

7777
@Test

0 commit comments

Comments
 (0)