fix annoying assertions that test error message text

Author: gavinking

hibernate-core/src/test/java/org/hibernate/orm/test/procedure/MySQLStoredProcedureTest.java

@@ -408,10 +408,7 @@ public void testStoredProcedureNullParameterHibernateWithoutSettingTheParameter(
 				fail( "Should have thrown exception" );
 			}
 			catch (IllegalArgumentException e) {
-				assertEquals(
-						"The parameter at position [1] was not set! You need to call the setParameter method.",
-						e.getMessage()
-				);
+				assertTrue( e.getMessage().contains( "parameter at position 1" ) );
 			}
 		} );
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLFunctionProcedureTest.java

@@ -369,7 +369,6 @@ public void testFunctionProcedureNullParameterHibernateWithoutSettingTheParamete
 					procedureCall.execute();
 				} ) );
 
-		assertThat( exception.getMessage() )
-				.isEqualTo( "The parameter named [param] was not set! You need to call the setParameter method." );
+		assertThat( exception.getMessage() ).contains( "parameter named 'param'" );
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLStoredProcedureTest.java

@@ -39,10 +39,10 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Vlad Mihalcea
@@ -230,10 +230,7 @@ public void testStoredProcedureNullParameterHibernateWithoutSettingTheParameter(
 				fail( "Should have thrown exception" );
 			}
 			catch (IllegalArgumentException e) {
-				assertEquals(
-						"The parameter named [param] was not set! You need to call the setParameter method.",
-						e.getMessage()
-				);
+				assertTrue( e.getMessage().contains( "parameter named 'param'" ) );
 			}
 		} );
 	}
@@ -253,7 +250,7 @@ public void testStoredProcedureInAndOutAndRefCursorParameters(EntityManagerFacto
 					query.execute();
 					ResultSet rs = (ResultSet) query.getOutputParameterValue( "rec_out" );
 					try {
-						Assertions.assertTrue( rs.next() );
+						assertTrue( rs.next() );
 						assertThat( rs.getString( "street" ), is( STREET ) );
 						assertThat( rs.getString( "city" ), is( CITY ) );
 						assertThat( rs.getString( "zip" ), is( ZIP ) );
@@ -280,7 +277,7 @@ public void testStoredProcedureInAndOutAndRefCursorParametersDifferentRegistrati
 					query.execute();
 					ResultSet rs = (ResultSet) query.getOutputParameterValue( "rec_out" );
 					try {
-						Assertions.assertTrue( rs.next() );
+						assertTrue( rs.next() );
 						assertThat( rs.getString( "street" ), is( STREET ) );
 						assertThat( rs.getString( "city" ), is( CITY ) );
 						assertThat( rs.getString( "zip" ), is( ZIP ) );
@@ -307,7 +304,7 @@ public void testStoredProcedureInAndOutAndRefCursorParametersDifferentRegistrati
 					query.execute();
 					ResultSet rs = (ResultSet) query.getOutputParameterValue( "rec_out" );
 					try {
-						Assertions.assertTrue( rs.next() );
+						assertTrue( rs.next() );
 						assertThat( rs.getString( "street" ), is( STREET ) );
 						assertThat( rs.getString( "city" ), is( CITY ) );
 						assertThat( rs.getString( "zip" ), is( ZIP ) );