Skip to content

HHH-19846 - Drop JUnit 4 usage #11102

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

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
+7,638 −9,377
Draft

HHH-19846 - Drop JUnit 4 usage #11102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8a075e5
HHH-19846 - Drop JUnit 4 usage
sebersole Oct 9, 2025
e928181
HHH-19846 - Drop JUnit 4 usage
sebersole Oct 10, 2025
81de9a9
HHH-19846 - Drop JUnit 4 usage
sebersole Oct 10, 2025
f5bff93
HHH-19846 - Drop JUnit 4 usage
sebersole Oct 14, 2025
655353a
HHH-19846 - Drop JUnit 4 usage
sebersole Oct 14, 2025
3a7b82d
HHH-19846 - Drop JUnit 4 usage
sebersole Oct 14, 2025
99363e0
HHH-19846 - Drop JUnit 4 usage
sebersole Oct 14, 2025
e315f90
HHH-19846 - Drop JUnit 4 usage
sebersole Oct 14, 2025
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
62 changes: 28 additions & 34 deletions .../test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneMapsIdFlushModeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
*/
package org.hibernate.orm.test.annotations.manytoone;

import java.util.HashSet;
import java.util.Set;

import jakarta.persistence.Entity;
import jakarta.persistence.FlushModeType;
import jakarta.persistence.GeneratedValue;
Expand All @@ -15,56 +12,53 @@
import jakarta.persistence.ManyToOne;
import jakarta.persistence.MapsId;
import jakarta.persistence.OneToMany;

import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
import org.junit.Test;

import org.hibernate.testing.DialectChecks;
import org.hibernate.testing.RequiresDialectFeature;
import org.hibernate.testing.orm.junit.DialectFeatureChecks;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.JiraKey;
import org.hibernate.testing.transaction.TransactionUtil;
import org.hibernate.testing.orm.junit.RequiresDialectFeature;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.util.HashSet;
import java.util.Set;

/**
* @author Chris Cranford
*/
@SuppressWarnings("JUnitMalformedDeclaration")
@JiraKey(value = "HHH-13044")
@RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class)
public class ManyToOneMapsIdFlushModeTest extends BaseEntityManagerFunctionalTestCase {
@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class<?>[] { ParentEntity.class, ChildEntity.class };
}

@RequiresDialectFeature(feature= DialectFeatureChecks.SupportsIdentityColumns.class)
@DomainModel(annotatedClasses = { ManyToOneMapsIdFlushModeTest.ParentEntity.class, ManyToOneMapsIdFlushModeTest.ChildEntity.class })
@SessionFactory
public class ManyToOneMapsIdFlushModeTest {
@Test
public void testFlushModeCommitWithMapsIdAndIdentity() {
final ParentEntity parent = TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> {
entityManager.setFlushMode( FlushModeType.COMMIT );
public void testFlushModeCommitWithMapsIdAndIdentity(SessionFactoryScope factoryScope) {
final ParentEntity parent = factoryScope.fromTransaction( (session) -> {
session.setFlushMode( FlushModeType.COMMIT );

final ParentEntity parentEntity = new ParentEntity();
var parentEntity = new ParentEntity();
parentEntity.setData( "test" );

final ChildEntity childEntity = new ChildEntity();
var childEntity = new ChildEntity();
parentEntity.addChild( childEntity );

entityManager.persist( parentEntity );
entityManager.persist( childEntity );
session.persist( parentEntity );
session.persist( childEntity );

return parentEntity;
} );

TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> {
final ParentEntity parentEntity = entityManager.find( ParentEntity.class, parent.getId() );
assertNotNull( parentEntity );
assertNotNull( parentEntity.getChildren() );
assertTrue( !parentEntity.getChildren().isEmpty() );
factoryScope.inTransaction( (session) -> {
final ParentEntity parentEntity = session.find( ParentEntity.class, parent.getId() );
Assertions.assertNotNull( parentEntity );
Assertions.assertNotNull( parentEntity.getChildren() );
Assertions.assertFalse( parentEntity.getChildren().isEmpty() );

final ChildEntity childEntity = parentEntity.getChildren().iterator().next();
assertNotNull( childEntity );
assertEquals( parentEntity.getId(), childEntity.getId() );
Assertions.assertNotNull( childEntity );
Assertions.assertEquals( parentEntity.getId(), childEntity.getId() );
} );
}

Expand Down
Loading
Loading