[#1906] Fix MutationDelegateTest, MutationDelegateJoinedInheritanceTest and MutationDelegateIdentityTest update query assertions

Author: dreab8

hibernate-reactive-core/src/test/java/org/hibernate/reactive/MutationDelegateIdentityTest.java

@@ -142,8 +142,8 @@ public void testUpdateGeneratedValuesAndIdentity(VertxTestContext context) {
 						.invoke( identityAndValues -> {
 							assertThat( entity.getUpdateDate() ).isNotNull();
 							assertThat( sqlTracker.getLoggedQueries().size() ).isEqualTo( expectedQuerySize );
-							assertThat( sqlTracker.getLoggedQueries().get( 0 ) )
-									.startsWith( "select" ).contains( "update" );
+							assertThat( sqlTracker.getLoggedQueries().get( 0 ) ).startsWith( "select" );
+							assertThat( sqlTracker.getLoggedQueries().get( 1 ) ).contains( "update " );
 						} )
 				) )
 		);
@@ -182,7 +182,7 @@ public void testInsertGeneratedValuesAndIdentityAndRowId(VertxTestContext contex
 						.call( s::flush )
 						.invoke( () -> {
 							assertThat( entity.getUpdateDate() ).isNotNull();
-							assertThat( sqlTracker.getLoggedQueries().get( 0 ) ).contains( "update" );
+							assertThat( sqlTracker.getLoggedQueries().get( 0 ) ).contains( "update " );
 							assertNumberOfOccurrenceInQueryNoSpace( 0, "id_column", shouldHaveRowId ? 0 : 1 );
 						} )
 				)
@@ -227,10 +227,19 @@ public void testInsertGeneratedValuesAndIdentityAndRowIdAndNaturalId(VertxTestCo
 		);
 	}
 
+	/**
+	 * The method is used to verify that the query logged at position `queryNumber`
+	 * contains the `expectedNumberOfOccurrences` occurrences of the value `toCkeck`.
+	 * e.g. `assertNumberOfOccurrenceInQueryNoSpace(1, "id", 3)` verifies the 1st executed query contains 3 occurrences of `id`
+	 *
+	 * @param queryNumber the position of the logged query
+	 * @param toCheck the String we want to check the number of occurrences in the query
+	 * @param expectedNumberOfOccurrences the number of occurrences of the `toCkeck` value we expect
+	 */
 	private static void assertNumberOfOccurrenceInQueryNoSpace(int queryNumber, String toCheck, int expectedNumberOfOccurrences) {
 		String query = sqlTracker.getLoggedQueries().get( queryNumber );
 		int actual = query.split( toCheck, -1 ).length - 1;
-		assertThat( actual ).as( "number of " + toCheck ).isEqualTo( expectedNumberOfOccurrences );
+		assertThat( actual ).as( "Unexpected number of '" + toCheck + "' in the query " + query ).isEqualTo( expectedNumberOfOccurrences );
 	}
 
 	private static GeneratedValuesMutationDelegate getDelegate(Class<?> entityClass, MutationType mutationType) {

hibernate-reactive-core/src/test/java/org/hibernate/reactive/MutationDelegateJoinedInheritanceTest.java

@@ -136,8 +136,8 @@ public void testUpdateBaseEntity(VertxTestContext context) {
 								.invoke( baseEntity -> {
 									assertThat( entity.getUpdateDate() ).isNotNull();
 									assertThat( sqlTracker.getLoggedQueries() ).hasSize( expectedQueriesSize );
-									assertThat( sqlTracker.getLoggedQueries().get( 0 ) )
-											.startsWith( "select" ).contains( "update" );
+									assertThat( sqlTracker.getLoggedQueries().get( 0 ) ).startsWith( "select" );
+									assertThat( sqlTracker.getLoggedQueries().get( 1 ) ).contains( "update " );
 								} )
 						)
 				)
@@ -158,7 +158,8 @@ public void testUpdateChildEntity(VertxTestContext context) {
 							assertThat( entity.getChildUpdateDate() ).isNotNull();
 
 							assertThat( sqlTracker.getLoggedQueries() ).hasSize( 3 );
-							assertThat( sqlTracker.getLoggedQueries().get( 0 ) ).startsWith( "select" ).contains( "update" );
+							assertThat( sqlTracker.getLoggedQueries().get( 0 ) ).startsWith( "select" );
+							assertThat( sqlTracker.getLoggedQueries().get( 1 ) ).contains( "update " );
 							// Note: this is a current restriction, mutation delegates only retrieve generated values
 							// on the "root" table, and we expect other values to be read through a subsequent select
 							assertThat( sqlTracker.getLoggedQueries().get( 2 ) ).startsWith( "select" );

hibernate-reactive-core/src/test/java/org/hibernate/reactive/MutationDelegateTest.java

@@ -111,9 +111,8 @@ public void testUpdateGeneratedValues(VertxTestContext context) {
 						.invoke( valuesOnly -> {
 							assertThat( entity.getUpdateDate() ).isNotNull();
 							assertThat( sqlTracker.getLoggedQueries() ).hasSize( expectedQueriesSize );
-							assertThat( sqlTracker.getLoggedQueries().get( 0 ) )
-									.startsWith( "select" )
-									.contains( "update" );
+							assertThat( sqlTracker.getLoggedQueries().get( 0 ) ).startsWith( "select" );
+							assertThat( sqlTracker.getLoggedQueries().get( 1 ) ).contains( "update " );
 						} )
 				)
 		);
@@ -147,7 +146,7 @@ public void testGeneratedValuesAndRowId(VertxTestContext context) {
 						} )
 						.call( s::flush )
 						.invoke( () -> {
-							assertThat( sqlTracker.getLoggedQueries().get( 0 ) ).contains( "update" );
+							assertThat( sqlTracker.getLoggedQueries().get( 0 ) ).contains( "update " );
 							assertNumberOfOccurrenceInQueryNoSpace( 0, "id_column", shouldHaveRowId ? 0 : 1 );
 						} )
 				)
@@ -181,10 +180,19 @@ public void testInsertGeneratedValuesAndNaturalId(VertxTestContext context) {
 		);
 	}
 
+	/**
+	 * The method is used to verify that the query logged at position `queryNumber`
+	 * contains the `expectedNumberOfOccurrences` occurrences of the value `toCkeck`.
+	 * e.g. `assertNumberOfOccurrenceInQueryNoSpace(1, "id", 3)` verifies the 1st executed query contains 3 occurrences of `id`
+	 *
+	 * @param queryNumber the position of the logged query
+	 * @param toCheck the String we want to check the number of occurrences in the query
+	 * @param expectedNumberOfOccurrences the number of occurrences of the `toCkeck` value we expect
+	 */
 	private static void assertNumberOfOccurrenceInQueryNoSpace(int queryNumber, String toCheck, int expectedNumberOfOccurrences) {
 		String query = sqlTracker.getLoggedQueries().get( queryNumber );
 		int actual = query.split( toCheck, -1 ).length - 1;
-		assertThat( actual ).as( "number of " + toCheck ).isEqualTo( expectedNumberOfOccurrences );
+		assertThat( actual ).as( "Unexpected number of '" + toCheck + "' in the query " + query ).isEqualTo( expectedNumberOfOccurrences );
 	}
 
 	private static GeneratedValuesMutationDelegate getDelegate(Class<?> entityClass, MutationType mutationType) {