Skip to content

HHH-19916 - More drop JUnit 4 usage work #11212

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

Merged
merged 1 commit into from
Nov 13, 2025
+4,684 −5,412
Merged

HHH-19916 - More drop JUnit 4 usage work #11212

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
36 changes: 14 additions & 22 deletions hibernate-core/src/test/java/org/hibernate/orm/test/boot/cfgXml/CfgXmlParsingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,45 +4,37 @@
*/
package org.hibernate.orm.test.boot.cfgXml;

import org.hibernate.boot.registry.StandardServiceRegistry;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.internal.util.config.ConfigurationException;

import org.hibernate.testing.junit4.BaseUnitTestCase;
import org.hibernate.testing.orm.junit.ExpectedException;
import org.hibernate.testing.util.ServiceRegistryUtil;
import org.junit.Test;

import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

/**
* @author Steve Ebersole
*/
public class CfgXmlParsingTest extends BaseUnitTestCase {
public class CfgXmlParsingTest {
@Test
public void testCfgXmlWithSchemaLocation() {
StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder()
try (var ssr = ServiceRegistryUtil.serviceRegistryBuilder()
.configure( "org/hibernate/orm/test/boot/cfgXml/hibernate.cfg.xml" )
.build();
try {
.build()) {
final ConfigurationService cs = ssr.getService( ConfigurationService.class );
// augmented form
assertNotNull( cs.getSettings().get( "hibernate.cache.provider_class" ) );
Assertions.assertNotNull( cs.getSettings().get( "hibernate.cache.provider_class" ) );
// original form
assertNotNull( cs.getSettings().get( "cache.provider_class" ) );
}
finally {
StandardServiceRegistryBuilder.destroy( ssr );
Assertions.assertNotNull( cs.getSettings().get( "cache.provider_class" ) );
}
}

@Test(expected = ConfigurationException.class )
@Test
@ExpectedException(ConfigurationException.class)
public void testCfgXmlWithBadNamespaceAndSchemaLocation() {
StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder()
try (var ssr = ServiceRegistryUtil.serviceRegistryBuilder()
.configure( "org/hibernate/orm/test/boot/cfgXml/badnamespace.cfg.xml" )
.build();
StandardServiceRegistryBuilder.destroy( ssr );
fail( "Expecting the bad namespace to fail" );
.build()) {
Assertions.fail( "Expecting the bad namespace to fail" );
}
}
}
283 changes: 143 additions & 140 deletions .../orm/test/cdi/general/hibernatesearch/extended/HibernateSearchExtendedCdiSupportTest.java
View file
Open in desktop

Large diffs are not rendered by default.

43 changes: 21 additions & 22 deletions ...nate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableToOneTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,48 @@
*/
package org.hibernate.orm.test.embeddable;

import java.util.ArrayList;
import java.util.List;
import jakarta.persistence.Basic;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.OrderBy;

import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
import org.hibernate.metamodel.CollectionClassification;
import org.hibernate.query.Query;
import org.hibernate.testing.orm.junit.DomainModel;
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.Test;

import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Test;
import java.util.ArrayList;
import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;
import static org.hibernate.cfg.AvailableSettings.DEFAULT_LIST_SEMANTICS;

public class OrderByEmbeddableToOneTest extends BaseCoreFunctionalTestCase {

@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class[] { Containing.class, Embed.class, Contained.class };
}

@Override
protected void configure(Configuration configuration) {
super.configure( configuration );
configuration.setProperty( DEFAULT_LIST_SEMANTICS, CollectionClassification.BAG );
@SuppressWarnings("JUnitMalformedDeclaration")
@DomainModel(annotatedClasses = {
OrderByEmbeddableToOneTest.Containing.class,
OrderByEmbeddableToOneTest.Embed.class,
OrderByEmbeddableToOneTest.Contained.class
})
@SessionFactory
public class OrderByEmbeddableToOneTest {
@AfterEach
void tearDown(SessionFactoryScope factoryScope) {
factoryScope.dropData();
}

@Test
public void test() {
inTransaction( session -> {
public void test(SessionFactoryScope factoryScope) {
factoryScope.inTransaction( session -> {
saveComposition( session, 1 );
saveComposition( session, 11 );
saveComposition( session, 21 );
} );

inTransaction( session -> {
factoryScope.inTransaction( session -> {
Query<Containing> query = session.createQuery( "select c from containing c order by c.id asc", Containing.class );

List<Containing> resultList = query.getResultList();
Expand Down
43 changes: 21 additions & 22 deletions hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/OrderByEmbeddableX2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,48 @@
*/
package org.hibernate.orm.test.embeddable;

import java.util.ArrayList;
import java.util.List;
import jakarta.persistence.Basic;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Embedded;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.OrderBy;

import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
import org.hibernate.metamodel.CollectionClassification;
import org.hibernate.query.Query;
import org.hibernate.testing.orm.junit.DomainModel;
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.Test;

import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Test;
import java.util.ArrayList;
import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;
import static org.hibernate.cfg.AvailableSettings.DEFAULT_LIST_SEMANTICS;

public class OrderByEmbeddableX2Test extends BaseCoreFunctionalTestCase {

@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class[] { Containing.class, Embed.class, Contained.class };
}

@Override
protected void configure(Configuration configuration) {
super.configure( configuration );
configuration.setProperty( DEFAULT_LIST_SEMANTICS, CollectionClassification.BAG );
@SuppressWarnings("JUnitMalformedDeclaration")
@DomainModel(annotatedClasses = {
OrderByEmbeddableX2Test.Containing.class,
OrderByEmbeddableX2Test.Embed.class,
OrderByEmbeddableX2Test.Contained.class
})
@SessionFactory
public class OrderByEmbeddableX2Test {
@AfterEach
void tearDown(SessionFactoryScope factoryScope) {
factoryScope.dropData();
}

@Test
public void test() {
inTransaction( session -> {
public void test(SessionFactoryScope factoryScope) {
factoryScope.inTransaction( session -> {
saveComposition( session, 1 );
saveComposition( session, 11 );
saveComposition( session, 21 );
} );

inTransaction( session -> {
factoryScope.inTransaction( session -> {
Query<Containing> query = session.createQuery( "select c from containing c order by c.id asc", Containing.class );

List<Containing> resultList = query.getResultList();
Expand Down
63 changes: 28 additions & 35 deletions ...nate-core/src/test/java/org/hibernate/orm/test/entityname/EntityNameFromSubClassTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,42 @@
* Copyright Red Hat Inc. and Hibernate Authors
*/
package org.hibernate.orm.test.entityname;
import org.junit.Test;

import org.hibernate.Session;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;

import static org.junit.Assert.assertEquals;
import org.hibernate.testing.orm.junit.DomainModel;
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.jupiter.api.Test;

/**
* @author stliu
*/
public class EntityNameFromSubClassTest extends BaseCoreFunctionalTestCase {

@Override
protected String getBaseForMappings() {
return "org/hibernate/orm/test/";
@SuppressWarnings("JUnitMalformedDeclaration")
@DomainModel(xmlMappings = "org/hibernate/orm/test/entityname/Vehicle.hbm.xml")
@SessionFactory
public class EntityNameFromSubClassTest {
@AfterEach
void tearDown(SessionFactoryScope factoryScope) {
factoryScope.dropData();
}

@Override
public String[] getMappings() {
return new String[] { "entityname/Vehicle.hbm.xml" };
}

@SuppressWarnings( {"unchecked"})
@Test
public void testEntityName() {
Session s = openSession();
s.beginTransaction();
Person stliu = new Person();
stliu.setName("stliu");
Car golf = new Car();
golf.setOwner("stliu");
stliu.getCars().add(golf);
s.persist(stliu);
s.getTransaction().commit();
s.close();

s=openSession();
s.beginTransaction();
Person p = (Person)s.get(Person.class, stliu.getId());
assertEquals(1, p.getCars().size());
assertEquals(Car.class, p.getCars().iterator().next().getClass());
s.getTransaction().commit();
s.close();
public void testEntityName(SessionFactoryScope factoryScope) {
factoryScope.inTransaction( (s) -> {
Person stliu = new Person();
stliu.setName("stliu");
Car golf = new Car();
golf.setOwner("stliu");
stliu.getCars().add(golf);
s.persist(stliu);
} );

factoryScope.inTransaction( (s) -> {
Person p = s.find( Person.class, 1 );
Assertions.assertEquals( 1, p.getCars().size() );
Assertions.assertEquals( Car.class, p.getCars().iterator().next().getClass() );
} );
}

}
Loading
Loading