Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-enabled additional test

This commit is contained in:
Andrea Boriero 2021-09-16 16:57:58 +02:00
parent 7b6ee23f19
commit 83e5ba0450
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
hibernate-core/src/test/java/org/hibernate/jpa/test/xml/XmlAndAnnotationAttributeOverrideTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/jpa/xml/XmlAndAnnotationAttributeOverrideTest.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later. * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>. * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/ */
package org.hibernate.jpa.test.xml; package org.hibernate.orm.test.jpa.xml;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
@ -17,42 +17,38 @@ import javax.persistence.GeneratedValue;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.MappedSuperclass; import javax.persistence.MappedSuperclass;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
import org.hibernate.test.util.SchemaUtil; import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
import org.junit.Test; import org.hibernate.testing.orm.junit.Jpa;
public class XmlAndAnnotationAttributeOverrideTest extends BaseEntityManagerFunctionalTestCase { import org.hibernate.orm.test.util.SchemaUtil;
import org.junit.jupiter.api.Test;
@Jpa(annotatedClasses = {
XmlAndAnnotationAttributeOverrideTest.MappedSuperclassType.class, XmlAndAnnotationAttributeOverrideTest.DerivedEntityType.class, XmlAndAnnotationAttributeOverrideTest.EmbeddableType.class
},
// Using an empty orm.xml: the mere presence of an orm.xml used to trigger the bug,
// regardless of its content
xmlMappings = "org/hibernate/jpa/test/xml/orm-empty.xml"
)
public class XmlAndAnnotationAttributeOverrideTest {
@Test @Test
@TestForIssue(jiraKey = "HHH-14827") @TestForIssue(jiraKey = "HHH-14827")
public void testDerivedClassAttributeOverriding() { public void testDerivedClassAttributeOverriding(EntityManagerFactoryScope scope) {
assertThat( SchemaUtil.getColumnNames( entityManagerFactory(), DerivedEntityType.class ) ) assertThat( SchemaUtil.getColumnNames( scope.getEntityManagerFactory(), DerivedEntityType.class ) )
.contains( "custom_name" ) .contains( "custom_name" )
.doesNotContain( "name" ); .doesNotContain( "name" );
} }
@Test @Test
public void testEmbeddedAttributeOverriding() { public void testEmbeddedAttributeOverriding(EntityManagerFactoryScope scope) {
assertThat( SchemaUtil.getColumnNames( entityManagerFactory(), DerivedEntityType.class ) ) assertThat( SchemaUtil.getColumnNames( scope.getEntityManagerFactory(), DerivedEntityType.class ) )
.contains( "custom_embeddable_name" ) .contains( "custom_embeddable_name" )
.doesNotContain( "embeddable_name" ); .doesNotContain( "embeddable_name" );
} }
@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class[] { MappedSuperclassType.class, DerivedEntityType.class, EmbeddableType.class };
}
@Override
public String[] getEjb3DD() {
return new String[] {
// Using an empty orm.xml: the mere presence of an orm.xml used to trigger the bug,
// regardless of its content.
"org/hibernate/jpa/test/xml/orm-empty.xml"
};
}
@MappedSuperclass @MappedSuperclass
public static class MappedSuperclassType { public static class MappedSuperclassType {