HHH-13217 : Correct warning and update test to fail if the query succeeds

Author: gbadner

hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java

@@ -1864,6 +1864,6 @@ void attemptToAssociateProxyWithTwoOpenSessions(
 	void ignoreImmutablePropertyModification(String propertyName, String entityName);
 
 	@LogMessage(level = WARN)
-	@Message(value = "An entity cannot be annotated with both @Inheritance and @MappedSuperclass: %s.", id = 503)
+	@Message(value = "A class should not be annotated with both @Inheritance and @MappedSuperclass. @Inheritance will be ignored for: %s.", id = 503)
 	void unsupportedMappedSuperclassWithEntityInheritance(String entityName);
 }

hibernate-core/src/test/java/org/hibernate/test/inheritance/MappedSuperclassInheritanceTest.java

@@ -31,6 +31,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  *
@@ -60,7 +61,7 @@ public void buildEntityManagerFactory() {
 		super.buildEntityManagerFactory();
 
 		assertTrue( triggerable.wasTriggered() );
-		assertTrue( triggerable.triggerMessage().contains( "An entity cannot be annotated with both @Inheritance and @MappedSuperclass" ) );
+		assertTrue( triggerable.triggerMessage().contains( "A class should not be annotated with both @Inheritance and @MappedSuperclass. @Inheritance will be ignored for" ) );
 	}
 
 	@Test
@@ -72,6 +73,7 @@ public void test() {
 			try {
 				//Check the @Inheritance annotation was ignored
 				entityManager.createQuery("from Employee").getResultList();
+				fail();
 			} catch (Exception expected) {
 				QuerySyntaxException rootException = (QuerySyntaxException) ExceptionUtil.rootCause(expected);
 				assertEquals("Employee is not mapped", rootException.getMessage());