BVTCK-88 Retrieve method parameter names via new API in Java 8

See BVAL-498. The TCK is now compiled with the -parameters argument.
jakartaee · Nov 9, 2016 · 6aa4daa · 6aa4daa
1 parent a717bfe
commit 6aa4daa
Show file tree

Hide file tree

Showing 15 changed files with 119 additions and 118 deletions.
diff --git a/tests/pom.xml b/tests/pom.xml
@@ -148,6 +148,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <compilerArgument>-proc:none</compilerArgument>
+                    <compilerArgument>-parameters</compilerArgument>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/...nvalidation/tck/tests/constraints/application/method/MethodValidationRequirementTest.java b/...nvalidation/tck/tests/constraints/application/method/MethodValidationRequirementTest.java
@@ -234,7 +234,7 @@ public void testMethodParameterIsMarkedAsCascaded() throws Exception {
 		assertNodeNames(
 				constraintViolations.iterator().next().getPropertyPath(),
 				"setUser",
-				"arg0",
+				"user",
 				"name"
 		);
 	}
@@ -255,7 +255,7 @@ public void testConstructorParameterIsMarkedAsCascaded() throws Exception {
 		assertNodeNames(
 				constraintViolations.iterator().next().getPropertyPath(),
 				"CalendarEvent",
-				"arg0",
+				"user",
 				"name"
 		);
 	}
@@ -368,7 +368,7 @@ public void testCascadedMethodParameterIsValidatedRecursively() throws Exception
 		assertNodeNames(
 				constraintViolations.iterator().next().getPropertyPath(),
 				"setUser",
-				"arg0",
+				"user",
 				"account",
 				"login"
 		);
@@ -390,7 +390,7 @@ public void testCascadedConstructorParameterIsValidatedRecursively() throws Exce
 		assertNodeNames(
 				constraintViolations.iterator().next().getPropertyPath(),
 				"CalendarEvent",
-				"arg0",
+				"user",
 				"account",
 				"login"
 		);

diff --git a/...onstraints/inheritance/method/validdeclarations/ValidMethodConstraintDeclarationTest.java b/...onstraints/inheritance/method/validdeclarations/ValidMethodConstraintDeclarationTest.java
@@ -215,7 +215,7 @@ public void testParameterConstraintMarkedAsCascadedAtConstructorInSubClass() thr
 		assertNodeNames(
 				violations.iterator().next().getPropertyPath(),
 				"CalendarServiceSubClass",
-				"arg0",
+				"defaultEvent",
 				"name"
 		);
 	}

diff --git a/...rc/main/java/org/hibernate/beanvalidation/tck/tests/metadata/ParameterDescriptorTest.java b/...rc/main/java/org/hibernate/beanvalidation/tck/tests/metadata/ParameterDescriptorTest.java
@@ -105,8 +105,8 @@ public void testGetNameForMethod() {
 		List<ParameterDescriptor> parameters = Executables.parameterConstrainedMethod()
 				.getParameterDescriptors();
 
-		assertEquals( parameters.get( 0 ).getName(), "arg0", "Wrong parameter name" );
-		assertEquals( parameters.get( 1 ).getName(), "arg1", "Wrong parameter name" );
+		assertEquals( parameters.get( 0 ).getName(), "firstName", "Wrong parameter name" );
+		assertEquals( parameters.get( 1 ).getName(), "lastName", "Wrong parameter name" );
 	}
 
 	@Test
@@ -115,8 +115,8 @@ public void testGetNameForConstructor() {
 		List<ParameterDescriptor> parameters = Executables.parameterConstrainedConstructor()
 				.getParameterDescriptors();
 
-		assertEquals( parameters.get( 0 ).getName(), "arg0", "Wrong parameter name" );
-		assertEquals( parameters.get( 1 ).getName(), "arg1", "Wrong parameter name" );
+		assertEquals( parameters.get( 0 ).getName(), "firstName", "Wrong parameter name" );
+		assertEquals( parameters.get( 1 ).getName(), "lastName", "Wrong parameter name" );
 	}
 
 	@Test

diff --git a/...ethodvalidation/ExecutableValidationIgnoresValidatedExecutableAnnotationSettingsTest.java b/...ethodvalidation/ExecutableValidationIgnoresValidatedExecutableAnnotationSettingsTest.java
@@ -85,7 +85,7 @@ public void testValidateParametersYieldsConstraintViolationIfValidateExecutableI
 		);
 
 		assertCorrectConstraintTypes( violations, NotNull.class );
-		assertCorrectPathNodeNames( violations, names( methodName, "arg0" ) );
+		assertCorrectPathNodeNames( violations, names( methodName, "name" ) );
 		assertCorrectPathNodeKinds( violations, kinds( ElementKind.METHOD, ElementKind.PARAMETER ) );
 	}
 
@@ -102,7 +102,7 @@ public void testValidateConstructorParametersYieldsConstraintViolationIfValidate
 		);
 
 		assertCorrectConstraintTypes( violations, NotNull.class );
-		assertCorrectPathNodeNames( violations, names( LineItem.class.getSimpleName(), "arg0" ) );
+		assertCorrectPathNodeNames( violations, names( LineItem.class.getSimpleName(), "name" ) );
 		assertCorrectPathNodeKinds( violations, kinds( ElementKind.CONSTRUCTOR, ElementKind.PARAMETER ) );
 	}
 
@@ -159,7 +159,7 @@ public void testValidateParametersYieldsConstraintViolationIfValidateExecutableI
 		);
 
 		assertCorrectConstraintTypes( violations, NotNull.class );
-		assertCorrectPathNodeNames( violations, names( methodName, "arg0" ) );
+		assertCorrectPathNodeNames( violations, names( methodName, "name" ) );
 		assertCorrectPathNodeKinds( violations, kinds( ElementKind.METHOD, ElementKind.PARAMETER ) );
 	}
 
@@ -176,7 +176,7 @@ public void testValidateConstructorParametersYieldsConstraintViolationIfValidate
 		);
 
 		assertCorrectConstraintTypes( violations, NotNull.class );
-		assertCorrectPathNodeNames( violations, names( WarehouseItem.class.getSimpleName(), "arg0" ) );
+		assertCorrectPathNodeNames( violations, names( WarehouseItem.class.getSimpleName(), "name" ) );
 		assertCorrectPathNodeKinds( violations, kinds( ElementKind.CONSTRUCTOR, ElementKind.PARAMETER ) );
 	}
 

diff --git a/...tests/methodvalidation/ExecutableValidationIgnoresValidatedExecutableXmlSettingsTest.java b/...tests/methodvalidation/ExecutableValidationIgnoresValidatedExecutableXmlSettingsTest.java
@@ -89,7 +89,7 @@ public void testValidateParametersYieldsConstraintViolationIfValidateExecutableI
 		);
 
 		assertCorrectConstraintTypes( violations, NotNull.class );
-		assertCorrectPathNodeNames( violations, names( methodName, "arg0" ) );
+		assertCorrectPathNodeNames( violations, names( methodName, "name" ) );
 		assertCorrectPathNodeKinds( violations, kinds( ElementKind.METHOD, ElementKind.PARAMETER ) );
 	}
 
@@ -111,7 +111,7 @@ public void testValidateConstructorParametersYieldsConstraintViolationIfValidate
 		);
 
 		assertCorrectConstraintTypes( violations, NotNull.class );
-		assertCorrectPathNodeNames( violations, names( StockItem.class.getSimpleName(), "arg0" ) );
+		assertCorrectPathNodeNames( violations, names( StockItem.class.getSimpleName(), "name" ) );
 		assertCorrectPathNodeKinds( violations, kinds( ElementKind.CONSTRUCTOR, ElementKind.PARAMETER ) );
 	}
 

diff --git a/...in/java/org/hibernate/beanvalidation/tck/tests/methodvalidation/MethodValidationTest.java b/...in/java/org/hibernate/beanvalidation/tck/tests/methodvalidation/MethodValidationTest.java
@@ -114,9 +114,9 @@ public void methodParameterValidationTargetsParameterCrossParameterAndCascadedCo
 		assertCorrectPathNodeNames(
 				violations,
 				names( methodName, TestUtil.CROSS_PARAMETER_NODE_NAME ),
-				names( methodName, "arg0" ),
-				names( methodName, "arg1", "name" ),
-				names( methodName, "arg2" )
+				names( methodName, "customer" ),
+				names( methodName, "item", "name" ),
+				names( methodName, "quantity" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -157,9 +157,9 @@ public void methodParameterValidationIncludesConstraintsFromSuperClass() throws
 		assertCorrectPathNodeNames(
 				violations,
 				names( methodName, TestUtil.CROSS_PARAMETER_NODE_NAME ),
-				names( methodName, "arg0" ),
-				names( methodName, "arg1", "name" ),
-				names( methodName, "arg2" )
+				names( methodName, "customer" ),
+				names( methodName, "item", "name" ),
+				names( methodName, "quantity" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -201,9 +201,9 @@ public void methodParameterValidationIncludesConstraintsFromImplementedInterface
 		assertCorrectPathNodeNames(
 				violations,
 				names( methodName, TestUtil.CROSS_PARAMETER_NODE_NAME ),
-				names( methodName, "arg0" ),
-				names( methodName, "arg1", "name" ),
-				names( methodName, "arg2" )
+				names( methodName, "customer" ),
+				names( methodName, "item", "name" ),
+				names( methodName, "quantity" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -244,7 +244,7 @@ public void methodParameterValidationIsAppliedGroupWise() throws Exception {
 		assertCorrectPathNodeNames(
 				violations,
 				names( methodName, TestUtil.CROSS_PARAMETER_NODE_NAME ),
-				names( methodName, "arg0" )
+				names( methodName, "customer" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -266,8 +266,8 @@ public void methodParameterValidationIsAppliedGroupWise() throws Exception {
 		);
 		assertCorrectPathNodeNames(
 				violations,
-				names( methodName, "arg1", "name" ),
-				names( methodName, "arg2" )
+				names( methodName, "item", "name" ),
+				names( methodName, "quantity" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -298,7 +298,7 @@ public void methodParameterValidationPerformsGroupConversion() throws Exception
 		);
 
 		assertCorrectConstraintTypes( violations, Size.class );
-		assertCorrectPathNodeNames( violations, names( methodName, "arg1", "name" ) );
+		assertCorrectPathNodeNames( violations, names( methodName, "item", "name" ) );
 		assertCorrectPathNodeKinds(
 				violations,
 				kinds( ElementKind.METHOD, ElementKind.PARAMETER, ElementKind.PROPERTY )
@@ -336,9 +336,9 @@ public void methodParameterValidationValidatesEachConstraintOnlyOnce() throws Ex
 		assertCorrectPathNodeNames(
 				violations,
 				names( methodName, TestUtil.CROSS_PARAMETER_NODE_NAME ),
-				names( methodName, "arg0" ),
-				names( methodName, "arg1", "name" ),
-				names( methodName, "arg2" )
+				names( methodName, "customer" ),
+				names( methodName, "item", "name" ),
+				names( methodName, "quantity" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -374,8 +374,8 @@ public void methodParameterValidationUsingSequence() throws Exception {
 		assertCorrectConstraintTypes( violations, Size.class, NotNull.class );
 		assertCorrectPathNodeNames(
 				violations,
-				names( methodName, "arg0" ),
-				names( methodName, "arg1", "name" )
+				names( methodName, "customer" ),
+				names( methodName, "item", "name" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -397,7 +397,7 @@ public void methodParameterValidationUsingSequence() throws Exception {
 		assertCorrectPathNodeNames(
 				violations,
 				names( methodName, TestUtil.CROSS_PARAMETER_NODE_NAME ),
-				names( methodName, "arg2" )
+				names( methodName, "quantity" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -431,8 +431,8 @@ public void methodParameterValidationWithRedefinedDefaultGroupSequence() throws
 		assertCorrectConstraintTypes( violations, Size.class, NotNull.class );
 		assertCorrectPathNodeNames(
 				violations,
-				names( methodName, "arg0" ),
-				names( methodName, "arg1", "name" )
+				names( methodName, "customer" ),
+				names( methodName, "item", "name" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -459,8 +459,8 @@ public void methodParameterValidationWithRedefinedDefaultGroupSequence() throws
 		assertCorrectPathNodeNames(
 				violations,
 				names( methodName, TestUtil.CROSS_PARAMETER_NODE_NAME ),
-				names( methodName, "arg1", "name" ),
-				names( methodName, "arg2" )
+				names( methodName, "item", "name" ),
+				names( methodName, "quantity" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -498,9 +498,9 @@ public void constructorParameterValidationTargetsParameterCrossParameterAndCasca
 		assertCorrectPathNodeNames(
 				violations,
 				names( className, TestUtil.CROSS_PARAMETER_NODE_NAME ),
-				names( className, "arg0" ),
-				names( className, "arg1", "name" ),
-				names( className, "arg2" )
+				names( className, "customer" ),
+				names( className, "item", "name" ),
+				names( className, "quantity" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -557,7 +557,7 @@ public void constructorParameterValidationIsAppliedGroupWise() throws Exception
 		assertCorrectPathNodeNames(
 				violations,
 				names( className, TestUtil.CROSS_PARAMETER_NODE_NAME ),
-				names( className, "arg0" )
+				names( className, "customer" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -578,8 +578,8 @@ public void constructorParameterValidationIsAppliedGroupWise() throws Exception
 		);
 		assertCorrectPathNodeNames(
 				violations,
-				names( className, "arg1", "name" ),
-				names( className, "arg2" )
+				names( className, "item", "name" ),
+				names( className, "quantity" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -607,7 +607,7 @@ public void constructorParameterValidationPerformsGroupConversion() throws Excep
 		);
 
 		assertCorrectConstraintTypes( violations, Size.class );
-		assertCorrectPathNodeNames( violations, names( className, "arg1", "name" ) );
+		assertCorrectPathNodeNames( violations, names( className, "item", "name" ) );
 		assertCorrectPathNodeKinds(
 				violations,
 				kinds( ElementKind.CONSTRUCTOR, ElementKind.PARAMETER, ElementKind.PROPERTY )
@@ -642,9 +642,9 @@ public void constructorParameterValidationValidatesEachConstraintOnlyOnce() thro
 		assertCorrectPathNodeNames(
 				violations,
 				names( className, TestUtil.CROSS_PARAMETER_NODE_NAME ),
-				names( className, "arg0" ),
-				names( className, "arg1", "name" ),
-				names( className, "arg2" )
+				names( className, "customer" ),
+				names( className, "item", "name" ),
+				names( className, "quantity" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -677,8 +677,8 @@ public void constructorParameterValidationUsingSequence() throws Exception {
 		assertCorrectConstraintTypes( violations, Size.class, NotNull.class );
 		assertCorrectPathNodeNames(
 				violations,
-				names( className, "arg0" ),
-				names( className, "arg1", "name" )
+				names( className, "customer" ),
+				names( className, "item", "name" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -699,7 +699,7 @@ public void constructorParameterValidationUsingSequence() throws Exception {
 		assertCorrectPathNodeNames(
 				violations,
 				names( className, TestUtil.CROSS_PARAMETER_NODE_NAME ),
-				names( className, "arg2" )
+				names( className, "quantity" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -732,8 +732,8 @@ public void constructorParameterValidationWithRedefinedDefaultGroupSequence() th
 		assertCorrectConstraintTypes( violations, Size.class, NotNull.class );
 		assertCorrectPathNodeNames(
 				violations,
-				names( className, "arg0" ),
-				names( className, "arg1", "name" )
+				names( className, "customer" ),
+				names( className, "item", "name" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,
@@ -759,8 +759,8 @@ public void constructorParameterValidationWithRedefinedDefaultGroupSequence() th
 		assertCorrectPathNodeNames(
 				violations,
 				names( className, TestUtil.CROSS_PARAMETER_NODE_NAME ),
-				names( className, "arg1", "name" ),
-				names( className, "arg2" )
+				names( className, "item", "name" ),
+				names( className, "quantity" )
 		);
 		assertCorrectPathNodeKinds(
 				violations,