Polishing.

Simplify tests.

See #2884
Original pull request: #2891

Author: mp911de

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlParserQueryEnhancerUnitTests.java

@@ -17,22 +17,21 @@
 
 import static org.assertj.core.api.Assumptions.*;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * TCK Tests for {@link HqlQueryParser} mixed into {@link JpaQueryEnhancer}.
  *
  * @author Greg Turnquist
- * @since 3.1
  */
 public class HqlParserQueryEnhancerUnitTests extends QueryEnhancerTckTests {
 
-	public static final String HQL_PARSER_DOES_NOT_SUPPORT_NATIVE_QUERIES = "HqlParser does not support native queries";
-
 	@Override
 	QueryEnhancer createQueryEnhancer(DeclaredQuery query) {
+
+		assumeThat(query.isNativeQuery()).isFalse();
+
 		return JpaQueryEnhancer.forHql(query);
 	}
 
@@ -50,16 +49,4 @@ void shouldDeriveJpqlCountQuery(String query, String expected) {
 		super.shouldDeriveJpqlCountQuery(query, expected);
 	}
 
-	@Disabled(HQL_PARSER_DOES_NOT_SUPPORT_NATIVE_QUERIES)
-	@Override
-	void findProjectionClauseWithIncludedFrom() {}
-
-	@Disabled(HQL_PARSER_DOES_NOT_SUPPORT_NATIVE_QUERIES)
-	@Override
-	void shouldDeriveNativeCountQuery(String query, String expected) {}
-
-	@Disabled(HQL_PARSER_DOES_NOT_SUPPORT_NATIVE_QUERIES)
-	@Override
-	void shouldDeriveNativeCountQueryWithVariable(String query, String expected) {}
-
 }

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/JpqlParserQueryEnhancerUnitTests.java

@@ -17,23 +17,22 @@
 
 import static org.assertj.core.api.Assumptions.*;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * TCK Tests for {@link JpqlQueryParser} mixed into {@link JpaQueryEnhancer}.
  *
  * @author Greg Turnquist
- * @since 3.1
  */
 public class JpqlParserQueryEnhancerUnitTests extends QueryEnhancerTckTests {
 
-	public static final String JPQL_PARSER_DOES_NOT_SUPPORT_NATIVE_QUERIES = "JpqlParser does not support native queries";
-
 	@Override
-	QueryEnhancer createQueryEnhancer(DeclaredQuery declaredQuery) {
-		return JpaQueryEnhancer.forJpql(declaredQuery);
+	QueryEnhancer createQueryEnhancer(DeclaredQuery query) {
+
+		assumeThat(query.isNativeQuery()).isFalse();
+
+		return JpaQueryEnhancer.forJpql(query);
 	}
 
 	@Override
@@ -53,15 +52,4 @@ void shouldDeriveJpqlCountQuery(String query, String expected) {
 		super.shouldDeriveJpqlCountQuery(query, expected);
 	}
 
-	@Disabled(JPQL_PARSER_DOES_NOT_SUPPORT_NATIVE_QUERIES)
-	@Override
-	void findProjectionClauseWithIncludedFrom() {}
-
-	@Disabled(JPQL_PARSER_DOES_NOT_SUPPORT_NATIVE_QUERIES)
-	@Override
-	void shouldDeriveNativeCountQuery(String query, String expected) {}
-
-	@Disabled(JPQL_PARSER_DOES_NOT_SUPPORT_NATIVE_QUERIES)
-	@Override
-	void shouldDeriveNativeCountQueryWithVariable(String query, String expected) {}
 }