HHH-19555 improve tests

Author: gavinking

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/ManyToOneImplicitJoinTableRestrictionTest.java

@@ -23,7 +23,8 @@
 @Jpa(annotatedClasses =
 		{ManyToOneImplicitJoinTableRestrictionTest.X.class,
 		ManyToOneImplicitJoinTableRestrictionTest.Y.class})
-@SkipForDialect(dialectClass = SybaseDialect.class, matchSubTypes = true, reason = "Sybase doesn't have support for upserts")
+@SkipForDialect(dialectClass = SybaseDialect.class, matchSubTypes = true,
+		reason = "Sybase doesn't have support for upserts")
 class ManyToOneImplicitJoinTableRestrictionTest {
 	@JiraKey("HHH-19555") @Test
 	void test(EntityManagerFactoryScope scope) {
@@ -47,6 +48,16 @@ void test(EntityManagerFactoryScope scope) {
 			var id = s.createNativeQuery( "select x_id from Y_X", long.class ).getSingleResult();
 			assertEquals( -1L, id );
 		} );
+		scope.inTransaction( s -> {
+			Y y =
+					s.createQuery( "from Y where id = ?1", Y.class )
+							.setParameter( 1, 0L )
+							.getSingleResult();
+			assertEquals("Gavin", y.name);
+			assertNull(y.x);
+			var id = s.createNativeQuery( "select x_id from Y_X", long.class ).getSingleResult();
+			assertEquals( -1L, id );
+		} );
 		scope.inTransaction( s -> {
 			Y y = s.find( Y.class, 0L );
 			X x = new X();
@@ -63,6 +74,16 @@ void test(EntityManagerFactoryScope scope) {
 			var id = s.createNativeQuery( "select x_id from Y_X", long.class ).getSingleResult();
 			assertEquals( 1L, id );
 		} );
+		scope.inTransaction( s -> {
+			Y y =
+					s.createQuery( "from Y where id = ?1", Y.class )
+							.setParameter( 1, 0L )
+							.getSingleResult();
+			assertEquals("Gavin", y.name);
+			assertNotNull(y.x);
+			var id = s.createNativeQuery( "select x_id from Y_X", long.class ).getSingleResult();
+			assertEquals( 1L, id );
+		} );
 		scope.inTransaction( s -> {
 			Y y = s.find( Y.class, 0L );
 			y.x = null;
@@ -75,6 +96,14 @@ void test(EntityManagerFactoryScope scope) {
 			var id = s.createNativeQuery( "select x_id from Y_X", long.class ).getSingleResultOrNull();
 			assertNull( id );
 		} );
+		scope.inTransaction( s -> {
+			Y y =
+					s.createQuery( "from Y where id = ?1", Y.class )
+							.setParameter( 1, 0L )
+							.getSingleResult();
+			assertEquals("Gavin", y.name);
+			assertNull(y.x);
+		} );
 	}
 
 	@Entity(name="Y")

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/ManyToOneImplicitJoinTableTest.java

@@ -38,6 +38,16 @@ void test(EntityManagerFactoryScope scope) {
 			assertNotNull(y.x);
 			assertEquals( 1L, y.x.id );
 		} );
+		scope.inTransaction( s -> {
+			Y y =
+					s.createQuery( "from Y where id = ?1", Y.class )
+							.setParameter( 1, 0L )
+							.getSingleResult();
+			assertEquals("Gavin", y.name);
+			assertNotNull(y.x);
+			var id = s.createNativeQuery( "select x_id from Y_X", long.class ).getSingleResult();
+			assertEquals( 1L, id );
+		} );
 		scope.inTransaction( s -> {
 			Y y = s.find( Y.class, 0L );
 			X x = new X();
@@ -52,6 +62,16 @@ void test(EntityManagerFactoryScope scope) {
 			assertNotNull(y.x);
 			assertEquals( -1L, y.x.id );
 		} );
+		scope.inTransaction( s -> {
+			Y y =
+					s.createQuery( "from Y where id = ?1", Y.class )
+							.setParameter( 1, 0L )
+							.getSingleResult();
+			assertEquals("Gavin", y.name);
+			assertNotNull(y.x);
+			var id = s.createNativeQuery( "select x_id from Y_X", long.class ).getSingleResult();
+			assertEquals( -1L, id );
+		} );
 		scope.inTransaction( s -> {
 			Y y = s.find( Y.class, 0L );
 			y.x = null;
@@ -62,6 +82,14 @@ void test(EntityManagerFactoryScope scope) {
 			assertEquals("Gavin", y.name);
 			assertNull(y.x);
 		} );
+		scope.inTransaction( s -> {
+			Y y =
+					s.createQuery( "from Y where id = ?1", Y.class )
+							.setParameter( 1, 0L )
+							.getSingleResult();
+			assertEquals("Gavin", y.name);
+			assertNull(y.x);
+		} );
 	}
 
 	@Entity(name="Y")