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-10-12 12:09:15 +02:00
parent 6b5cb2cfc4
commit 9b48207ba0
1 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
hibernate-core/src/test/java/org/hibernate/test/ecid/EmbeddedIdWithMapsIdTargetingDerivedEntityTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/ecid/EmbeddedIdWithMapsIdTargetingDerivedEntityTest.java
View File

@ -4,30 +4,33 @@
* 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.test.ecid; package org.hibernate.orm.test.ecid;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hibernate.test.util.SchemaUtil.getColumnNames;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.persistence.Column;
import javax.persistence.Embeddable;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.ManyToOne;
import javax.persistence.MapsId;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.hibernate.testing.orm.junit.DomainModel;
import org.junit.Test; import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.junit.jupiter.api.Test;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.EmbeddedId;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.Id;
import jakarta.persistence.Inheritance;
import jakarta.persistence.InheritanceType;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.MapsId;
import jakarta.persistence.OneToMany;
import jakarta.persistence.Table;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hibernate.orm.test.util.SchemaUtil.getColumnNames;
/** /**
* Test that bootstrap doesn't throw an exception * Test that bootstrap doesn't throw an exception
@ -55,16 +58,21 @@ import org.junit.Test;
* at org.hibernate.testing.junit4.TestClassMetadata.performCallbackInvocation(TestClassMetadata.java:205) * at org.hibernate.testing.junit4.TestClassMetadata.performCallbackInvocation(TestClassMetadata.java:205)
*/ */
@TestForIssue(jiraKey = "HHH-13295") @TestForIssue(jiraKey = "HHH-13295")
public class EmbeddedIdWithMapsIdTargetingDerivedEntityTest extends BaseNonConfigCoreFunctionalTestCase { @DomainModel(
annotatedClasses = {
@Override EmbeddedIdWithMapsIdTargetingDerivedEntityTest.Attendance.class,
protected Class<?>[] getAnnotatedClasses() { EmbeddedIdWithMapsIdTargetingDerivedEntityTest.AttendanceId.class,
return new Class[] { Attendance.class, AttendanceId.class, Lecture.class, Student.class, User.class }; EmbeddedIdWithMapsIdTargetingDerivedEntityTest.Lecture.class,
} EmbeddedIdWithMapsIdTargetingDerivedEntityTest.Student.class,
EmbeddedIdWithMapsIdTargetingDerivedEntityTest.User.class
}
)
@SessionFactory
public class EmbeddedIdWithMapsIdTargetingDerivedEntityTest {
@Test @Test
public void metadataTest() { public void metadataTest(SessionFactoryScope scope) {
assertThat( getColumnNames( "attendance", metadata() ) ) assertThat( getColumnNames( "attendance", scope.getMetadataImplementor() ) )
// Just check we're using @MapsId; otherwise the test wouldn't be able to reproduce HHH-13295. // Just check we're using @MapsId; otherwise the test wouldn't be able to reproduce HHH-13295.
.containsExactlyInAnyOrder( "student_id", "lecture_id" ); .containsExactlyInAnyOrder( "student_id", "lecture_id" );
} }
@ -73,8 +81,8 @@ public class EmbeddedIdWithMapsIdTargetingDerivedEntityTest extends BaseNonConfi
// but it feels wrong to have a test class with just an empty test method, // but it feels wrong to have a test class with just an empty test method,
// so just check that persisting/loading works correctly. // so just check that persisting/loading works correctly.
@Test @Test
public void smokeTest() { public void smokeTest(SessionFactoryScope scope) {
inTransaction( s -> { scope.inTransaction( s -> {
Lecture lecture = new Lecture( 1L ); Lecture lecture = new Lecture( 1L );
s.persist( lecture ); s.persist( lecture );
Student student = new Student( 2L ); Student student = new Student( 2L );
@ -85,7 +93,7 @@ public class EmbeddedIdWithMapsIdTargetingDerivedEntityTest extends BaseNonConfi
s.persist( attendance ); s.persist( attendance );
} ); } );
inTransaction( s -> { scope.inTransaction( s -> {
Attendance attendance = s.get( Attendance.class, new AttendanceId( 1L, 2L ) ); Attendance attendance = s.get( Attendance.class, new AttendanceId( 1L, 2L ) );
assertThat( attendance.getId() ) assertThat( attendance.getId() )
.extracting( AttendanceId::getLectureId ) .extracting( AttendanceId::getLectureId )