Skip to content

HHH-19846 Drop JUnit 4 usage #11177

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

HHH-19846 Drop JUnit 4 usage #11177

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
37 changes: 19 additions & 18 deletions hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/ReflectionOptimizerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,30 @@
package org.hibernate.orm.test.bytecode;

import static org.hibernate.bytecode.internal.BytecodeProviderInitiator.buildDefaultBytecodeProvider;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;

import org.hibernate.bytecode.spi.BytecodeProvider;
import org.hibernate.bytecode.spi.ReflectionOptimizer;

import org.hibernate.testing.orm.junit.JiraKey;
import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

/**
* @author Steve Ebersole
*/
public class ReflectionOptimizerTest extends BaseUnitTestCase {
public class ReflectionOptimizerTest {

private static BytecodeProvider provider;

@BeforeClass
@BeforeAll
public static void initBytecodeProvider() {
provider = buildDefaultBytecodeProvider();
}

@AfterClass
@AfterAll
public static void clearBytecodeProvider() {
if ( provider != null ) {
provider.resetCaches();
Expand All @@ -50,35 +49,37 @@ public void testReflectionOptimization() {
assertNotNull( optimizer.getAccessOptimizer() );

Object instance = optimizer.getInstantiationOptimizer().newInstance();
assertEquals( instance.getClass(), Bean.class );
Bean bean = ( Bean ) instance;
assertEquals( Bean.class, instance.getClass() );
Bean bean = (Bean) instance;

optimizer.getAccessOptimizer().setPropertyValues( bean, BeanReflectionHelper.TEST_VALUES );
assertEquals( bean.getSomeString(), BeanReflectionHelper.TEST_VALUES[0] );
assertEquals( BeanReflectionHelper.TEST_VALUES[0], bean.getSomeString() );
Object[] values = optimizer.getAccessOptimizer().getPropertyValues( bean );
assertEquivalent( values, BeanReflectionHelper.TEST_VALUES );
}

@Test
@JiraKey(value = "HHH-12584")
public void testAbstractClass() {
ReflectionOptimizer reflectionOptimizer = provider.getReflectionOptimizer( AbstractClass.class, new String[]{ "getProperty" },
new String[]{ "setProperty" }, new Class[]{ String.class } );
ReflectionOptimizer reflectionOptimizer = provider.getReflectionOptimizer( AbstractClass.class,
new String[] {"getProperty"},
new String[] {"setProperty"}, new Class[] {String.class} );
assertNotNull( reflectionOptimizer );
}

@Test
@JiraKey(value = "HHH-12584")
public void testInterface() {
ReflectionOptimizer reflectionOptimizer = provider.getReflectionOptimizer( Interface.class, new String[]{ "getProperty" },
new String[]{ "setProperty" }, new Class[]{ String.class } );
ReflectionOptimizer reflectionOptimizer = provider.getReflectionOptimizer( Interface.class,
new String[] {"getProperty"},
new String[] {"setProperty"}, new Class[] {String.class} );
assertNotNull( reflectionOptimizer );
}

private void assertEquivalent(Object[] checkValues, Object[] values) {
assertEquals( "Different lengths", checkValues.length, values.length );
assertEquals( checkValues.length, values.length, "Different lengths" );
for ( int i = 0; i < checkValues.length; i++ ) {
assertEquals( "different values at index [" + i + "]", checkValues[i], values[i] );
assertEquals( checkValues[i], values[i], "different values at index [" + i + "]" );
}
}

Expand Down
142 changes: 72 additions & 70 deletions .../test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/LazySqlResultMappingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@

import org.hibernate.Hibernate;

import org.hibernate.testing.FailureExpected;
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.FailureExpected;
import org.hibernate.testing.orm.junit.JiraKey;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.runner.RunWith;

import jakarta.persistence.Basic;
import jakarta.persistence.Entity;
Expand All @@ -26,102 +27,103 @@
import jakarta.persistence.SqlResultSetMapping;
import jakarta.persistence.Table;

import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;

import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

/**
* @author Jan Schatteman
* @author Christian Beikov
*/
@RunWith( BytecodeEnhancerRunner.class )
public class LazySqlResultMappingTest extends BaseCoreFunctionalTestCase {

@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class[]{ User.class };
}

@Before
public void prepareData() {
doInHibernate( this::sessionFactory,
session -> {
session.persist(new User(1L, (byte)1));
}
@DomainModel(
annotatedClasses = {
LazySqlResultMappingTest.User.class
}
)
@SessionFactory
@BytecodeEnhanced
public class LazySqlResultMappingTest {

@BeforeEach
public void prepareData(SessionFactoryScope scope) {
scope.inTransaction( session -> {
session.persist( new User( 1L, (byte) 1 ) );
}
);
}

@After
public void cleanupData() {
doInHibernate( this::sessionFactory,
session -> {
session.createMutationQuery("delete from User").executeUpdate();
}
);
@AfterEach
public void cleanupData(SessionFactoryScope scope) {
scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
}

@Test
public void testGetIdAndPrincipalUsingFieldResults() {
doInHibernate( this::sessionFactory,
session -> {
List<User> users = session.createNamedQuery( "getIdAndPrincipalUsingFieldResults", User.class ).getResultList();
Assertions.assertTrue( Hibernate.isPropertyInitialized( users.get(0), "principal" ) );
}
public void testGetIdAndPrincipalUsingFieldResults(SessionFactoryScope scope) {
scope.inTransaction( session -> {
List<User> users = session.createNamedQuery( "getIdAndPrincipalUsingFieldResults", User.class )
.getResultList();
Assertions.assertTrue( Hibernate.isPropertyInitialized( users.get( 0 ), "principal" ) );
}
);
}

@Test
@JiraKey( value = "HHH-953" )
public void testGetIdAndPrincipalWithoutUsingFieldResults() {
doInHibernate( this::sessionFactory,
session -> {
List<User> users = session.createNamedQuery( "getIdAndPrincipalWithoutUsingFieldResults", User.class ).getResultList();
Assertions.assertTrue( Hibernate.isPropertyInitialized( users.get(0), "principal" ) );
}
@JiraKey(value = "HHH-953")
public void testGetIdAndPrincipalWithoutUsingFieldResults(SessionFactoryScope scope) {
scope.inTransaction( session -> {
List<User> users = session.createNamedQuery( "getIdAndPrincipalWithoutUsingFieldResults",
User.class ).getResultList();
Assertions.assertTrue( Hibernate.isPropertyInitialized( users.get( 0 ), "principal" ) );
}
);
}

@Test
@JiraKey( value = "HHH-15667" )
@FailureExpected(jiraKey = "HHH-15667", message = "SQLGrammarException: Unable to find column position by name: principal")
public void testGetIdWithoutUsingFieldResults() {
doInHibernate( this::sessionFactory,
session -> {
List<User> users = session.createNamedQuery( "getIdWithoutUsingFieldResults", User.class ).getResultList();
Assertions.assertFalse( Hibernate.isPropertyInitialized( users.get(0), "principal" ) );
}
@JiraKey(value = "HHH-15667")
@FailureExpected(jiraKey = "HHH-15667",
reason = "SQLGrammarException: Unable to find column position by name: principal")
public void testGetIdWithoutUsingFieldResults(SessionFactoryScope scope) {
scope.inTransaction( session -> {
List<User> users = session.createNamedQuery( "getIdWithoutUsingFieldResults", User.class )
.getResultList();
Assertions.assertFalse( Hibernate.isPropertyInitialized( users.get( 0 ), "principal" ) );
}
);
}

@Test
public void testGetIdUsingFieldResults() {
doInHibernate( this::sessionFactory,
session -> {
List<User> users = session.createNamedQuery( "getIdUsingFieldResults", User.class ).getResultList();
Assertions.assertFalse( Hibernate.isPropertyInitialized( users.get(0), "principal" ) );
}
public void testGetIdUsingFieldResults(SessionFactoryScope scope) {
scope.inTransaction( session -> {
List<User> users = session.createNamedQuery( "getIdUsingFieldResults", User.class ).getResultList();
Assertions.assertFalse( Hibernate.isPropertyInitialized( users.get( 0 ), "principal" ) );
}
);
}

@NamedNativeQuery(name = "getIdAndPrincipalUsingFieldResults", query = "select u.id as id, u.principal as principal from user_tbl u", resultSetMapping = "id_and_principal_with_fields")
@NamedNativeQuery(name = "getIdUsingFieldResults", query = "select u.id as id from user_tbl u", resultSetMapping = "id_with_fields")
@NamedNativeQuery(name = "getIdAndPrincipalWithoutUsingFieldResults", query = "select u.id as id, u.principal as principal from user_tbl u", resultSetMapping = "without_fields")
@NamedNativeQuery(name = "getIdWithoutUsingFieldResults", query = "select u.id as id from user_tbl u", resultSetMapping = "without_fields")

@SqlResultSetMapping( name = "id_and_principal_with_fields",
entities = @EntityResult( entityClass = User.class, fields = { @FieldResult(name = "id", column = "id"), @FieldResult(name = "principal", column = "principal") } )
@NamedNativeQuery(name = "getIdAndPrincipalUsingFieldResults",
query = "select u.id as id, u.principal as principal from user_tbl u",
resultSetMapping = "id_and_principal_with_fields")
@NamedNativeQuery(name = "getIdUsingFieldResults", query = "select u.id as id from user_tbl u",
resultSetMapping = "id_with_fields")
@NamedNativeQuery(name = "getIdAndPrincipalWithoutUsingFieldResults",
query = "select u.id as id, u.principal as principal from user_tbl u", resultSetMapping = "without_fields")
@NamedNativeQuery(name = "getIdWithoutUsingFieldResults", query = "select u.id as id from user_tbl u",
resultSetMapping = "without_fields")

@SqlResultSetMapping(name = "id_and_principal_with_fields",
entities = @EntityResult(entityClass = User.class,
fields = {@FieldResult(name = "id", column = "id"), @FieldResult(name = "principal",
column = "principal")})
)
@SqlResultSetMapping( name = "id_with_fields",
entities = @EntityResult( entityClass = User.class, fields = { @FieldResult(name = "id", column = "id") } )
@SqlResultSetMapping(name = "id_with_fields",
entities = @EntityResult(entityClass = User.class, fields = {@FieldResult(name = "id", column = "id")})
)
@SqlResultSetMapping( name = "without_fields",
entities = @EntityResult( entityClass = User.class )
@SqlResultSetMapping(name = "without_fields",
entities = @EntityResult(entityClass = User.class)
)

@Entity( name = "User")
@Entity(name = "User")
@Table(name = "user_tbl")
private static class User {
static class User {
@Id
private Long id;
@Basic(fetch = FetchType.LAZY)
Expand Down
Loading
Loading