Skip to content

Commit 87ab8a0

Browse files
sebersolesebersole
committed
HHH-19324 - Switch tests using hbm.xml to use mapping.xml
1 parent 0926c86 commit 87ab8a0

File tree

20 files changed

+214
-337
lines changed

20 files changed

+214
-337
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cacheable/CacheableHbmXmlTest.java‎

Lines changed: 0 additions & 123 deletions
This file was deleted.

‎hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdBasicTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
@ServiceRegistry(
2929
settings = @Setting( name = AvailableSettings.HBM2DDL_AUTO, value = "create-drop" )
3030
)
31-
@DomainModel( xmlMappings = "org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdBasic.hbm.xml" )
31+
@DomainModel( xmlMappings = "org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdBasic.xml")
3232
@SessionFactory
3333
public class DynamicCompositeIdBasicTests {
3434
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOneTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
@ServiceRegistry(
3535
settings = @Setting( name = AvailableSettings.HBM2DDL_AUTO, value = "create-drop" )
3636
)
37-
@DomainModel( xmlMappings = "org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOne.hbm.xml" )
37+
@DomainModel( xmlMappings = "org/hibernate/orm/test/bootstrap/binding/hbm/cid/nonaggregated/dynamic/DynamicCompositeIdManyToOne.xml")
3838
@SessionFactory
3939
public class DynamicCompositeIdManyToOneTests {
4040
@Test

‎hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/dynamic/SimpleDynamicHbmTests.java‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/dynamic/SimpleDynamicXmlTests.java‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
* Copyright Red Hat Inc. and Hibernate Authors
4+
*/
5+
package org.hibernate.orm.test.bootstrap.binding.hbm.simple.dynamic;
6+
7+
import org.hibernate.cfg.AvailableSettings;
8+
import org.hibernate.engine.spi.SessionFactoryImplementor;
9+
import org.hibernate.metamodel.mapping.AttributeMapping;
10+
import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping;
11+
import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
12+
import org.hibernate.persister.entity.EntityPersister;
13+
14+
import org.hibernate.testing.orm.junit.DomainModel;
15+
import org.hibernate.testing.orm.junit.ServiceRegistry;
16+
import org.hibernate.testing.orm.junit.SessionFactory;
17+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
18+
import org.hibernate.testing.orm.junit.Setting;
19+
import org.junit.jupiter.api.Test;
20+
21+
import static org.hamcrest.CoreMatchers.instanceOf;
22+
import static org.hamcrest.CoreMatchers.is;
23+
import static org.hamcrest.CoreMatchers.notNullValue;
24+
import static org.hamcrest.MatcherAssert.assertThat;
25+
26+
/**
27+
* @author Steve Ebersole
28+
*/
29+
@SuppressWarnings("JUnitMalformedDeclaration")
30+
@ServiceRegistry(
31+
settings = @Setting( name = AvailableSettings.HBM2DDL_AUTO, value = "create-drop" )
32+
)
33+
@DomainModel(xmlMappings = "org/hibernate/orm/test/bootstrap/binding/hbm/simple/dynamic/SimpleDynamicEntity.xml")
34+
@SessionFactory
35+
public class SimpleDynamicXmlTests {
36+
@Test
37+
public void testBinding(SessionFactoryScope factoryScope) {
38+
final SessionFactoryImplementor sessionFactory = factoryScope.getSessionFactory();
39+
40+
final EntityPersister entityDescriptor = sessionFactory.getRuntimeMetamodels()
41+
.getMappingMetamodel()
42+
.findEntityDescriptor( "SimpleDynamicEntity" );
43+
44+
final EntityIdentifierMapping identifierMapping = entityDescriptor.getIdentifierMapping();
45+
assertThat( identifierMapping, instanceOf( BasicEntityIdentifierMapping.class ) );
46+
final BasicEntityIdentifierMapping bid = (BasicEntityIdentifierMapping) identifierMapping;
47+
assertThat( bid.getFetchableName(), is( "id" ) );
48+
assertThat( bid.getPartName(), is( EntityIdentifierMapping.ID_ROLE_NAME ) );
49+
50+
assertThat( entityDescriptor.getNumberOfAttributeMappings(), is( 1 ) );
51+
assertThat( entityDescriptor.getNumberOfDeclaredAttributeMappings(), is( 1 ) );
52+
final AttributeMapping nameAttr = entityDescriptor.findAttributeMapping( "name" );
53+
assertThat( nameAttr, notNullValue() );
54+
}
55+
56+
@Test
57+
public void testUsage(SessionFactoryScope factoryScope) {
58+
factoryScope.inTransaction( (session) -> {
59+
session.createQuery( "from SimpleDynamicEntity" ).list();
60+
session.createQuery( "select e from SimpleDynamicEntity e" ).list();
61+
session.createQuery( "select e from SimpleDynamicEntity e where e.name = 'abc'" ).list();
62+
} );
63+
}
64+
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/pojo/SimpleHbmTests.java‎ renamed to ‎hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/hbm/simple/pojo/SimplePojoXmlTests.java‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,18 @@
44
*/
55
package org.hibernate.orm.test.bootstrap.binding.hbm.simple.pojo;
66

7-
import org.hibernate.boot.MetadataSources;
7+
import org.hibernate.cfg.AvailableSettings;
88
import org.hibernate.engine.spi.SessionFactoryImplementor;
99
import org.hibernate.metamodel.mapping.AttributeMapping;
1010
import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping;
1111
import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
1212
import org.hibernate.persister.entity.EntityPersister;
1313

14+
import org.hibernate.testing.orm.junit.DomainModel;
1415
import org.hibernate.testing.orm.junit.ServiceRegistry;
15-
import org.hibernate.testing.orm.junit.ServiceRegistryScope;
16+
import org.hibernate.testing.orm.junit.SessionFactory;
17+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
18+
import org.hibernate.testing.orm.junit.Setting;
1619
import org.junit.jupiter.api.Test;
1720

1821
import static org.hamcrest.CoreMatchers.instanceOf;
@@ -23,14 +26,16 @@
2326
/**
2427
* @author Steve Ebersole
2528
*/
26-
@ServiceRegistry
27-
public class SimpleHbmTests {
29+
@SuppressWarnings("JUnitMalformedDeclaration")
30+
@ServiceRegistry(
31+
settings = @Setting( name = AvailableSettings.HBM2DDL_AUTO, value = "create-drop" )
32+
)
33+
@DomainModel(xmlMappings = "org/hibernate/orm/test/bootstrap/binding/hbm/simple/pojo/SimpleEntity.xml")
34+
@SessionFactory
35+
public class SimplePojoXmlTests {
2836
@Test
29-
public void testBinding(ServiceRegistryScope scope) {
30-
final SessionFactoryImplementor sessionFactory = (SessionFactoryImplementor) new MetadataSources( scope.getRegistry() )
31-
.addResource( "org/hibernate/orm/test/bootstrap/binding/hbm/simple/pojo/SimpleEntity.hbm.xml" )
32-
.buildMetadata()
33-
.buildSessionFactory();
37+
public void testBinding(SessionFactoryScope factoryScope) {
38+
final SessionFactoryImplementor sessionFactory = factoryScope.getSessionFactory();
3439

3540
final EntityPersister entityDescriptor = sessionFactory.getRuntimeMetamodels()
3641
.getMappingMetamodel()
@@ -47,4 +52,13 @@ public void testBinding(ServiceRegistryScope scope) {
4752
final AttributeMapping nameAttr = entityDescriptor.findAttributeMapping( "name" );
4853
assertThat( nameAttr, notNullValue() );
4954
}
55+
56+
@Test
57+
void testUsage(SessionFactoryScope factoryScope) {
58+
factoryScope.inTransaction( (session) -> {
59+
session.createQuery( "from SimpleEntity" ).list();
60+
session.createQuery( "select e from SimpleEntity e" ).list();
61+
session.createQuery( "select e from SimpleEntity e where e.name = 'abc'" ).list();
62+
} );
63+
}
5064
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/mixed/HBMManyToOneAnnotationMissingPrimaryKeyTest.java‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)