Skip to content

Commit 7e9bf7e

Browse files
committed
HHH-19324 - Switch tests using hbm.xml to use mapping.xml
1 parent 53bfb21 commit 7e9bf7e

File tree

5 files changed

+74
-32
lines changed

5 files changed

+74
-32
lines changed

hibernate-core/src/test/java/org/hibernate/orm/test/collection/idbag/PersistentIdBagTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @author Steve Ebersole
2424
*/
2525
@DomainModel(
26-
xmlMappings = "org/hibernate/orm/test/collection/idbag/Mappings.hbm.xml"
26+
xmlMappings = "org/hibernate/orm/test/collection/idbag/Mappings.xml"
2727
)
2828
@SessionFactory
2929
public class PersistentIdBagTest {

hibernate-core/src/test/java/org/hibernate/orm/test/collection/lazynocascade/LazyAssociationNoCascadeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* @author Vasily Kochnev
1717
*/
1818
@DomainModel(
19-
xmlMappings = "org/hibernate/orm/test/collection/lazynocascade/Parent.hbm.xml"
19+
xmlMappings = "org/hibernate/orm/test/collection/lazynocascade/Parent.xml"
2020
)
2121
@SessionFactory
2222
public class LazyAssociationNoCascadeTest {

hibernate-core/src/test/resources/org/hibernate/orm/test/collection/lazynocascade/Parent.hbm.xml

Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
~ SPDX-License-Identifier: Apache-2.0
4+
~ Copyright Red Hat Inc. and Hibernate Authors
5+
-->
6+
<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping"
7+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
8+
version="7.0">
9+
<package>org.hibernate.orm.test.collection.lazynocascade</package>
10+
11+
<entity class="Parent">
12+
<attributes>
13+
<id name="id">
14+
<generated-value generator="increment"/>
15+
</id>
16+
<one-to-many name="children">
17+
<join-column name="parent_fk"/>
18+
<cascade>
19+
<cascade-all/>
20+
</cascade>
21+
</one-to-many>
22+
</attributes>
23+
</entity>
24+
25+
<entity class="BaseChild">
26+
<inheritance strategy="SINGLE_TABLE"/>
27+
<discriminator-column/>
28+
<attributes>
29+
<id name="id">
30+
<generated-value generator="increment"/>
31+
</id>
32+
<many-to-one name="dependency">
33+
<join-column name="dependency_fk"/>
34+
</many-to-one>
35+
</attributes>
36+
</entity>
37+
38+
<entity class="Child">
39+
<attributes>
40+
<basic name="name"/>
41+
</attributes>
42+
</entity>
43+
</entity-mappings>
44+
45+
46+
47+
48+
<!--<!DOCTYPE hibernate-mapping PUBLIC-->
49+
<!-- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"-->
50+
<!-- "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">-->
51+
<!--<hibernate-mapping package="org.hibernate.orm.test.collection.lazynocascade">-->
52+
<!-- <class name="Parent">-->
53+
<!-- <id name="id" column="parent_id">-->
54+
<!-- <generator class="increment"/>-->
55+
<!-- </id>-->
56+
<!-- <set name="children" cascade="all">-->
57+
<!-- <key column="parent_id"/>-->
58+
<!-- <one-to-many class="BaseChild"/>-->
59+
<!-- </set>-->
60+
<!-- </class>-->
61+
62+
<!-- <class name="BaseChild" >-->
63+
<!-- <id name="id" column="base_child_id">-->
64+
<!-- <generator class="increment"/>-->
65+
<!-- </id>-->
66+
<!-- <discriminator/>-->
67+
<!-- <many-to-one name="dependency" column="dependency_id" class="BaseChild" lazy="proxy"/>-->
68+
<!-- <subclass name="Child">-->
69+
<!-- <property name="name" column="name" type="string"/>-->
70+
<!-- </subclass>-->
71+
<!-- </class>-->
72+
<!--</hibernate-mapping>-->

0 commit comments

Comments
 (0)