Skip to content

Commit

Permalink
BVTCK-32 Fixing wrong assertion for return value node names
Browse files Browse the repository at this point in the history
  • Loading branch information
@gunnarmorling
gunnarmorling committed Jan 26, 2013
1 parent 18644fa commit a166fff
Showing 1 changed file with 35 additions and 35 deletions.
70 changes: 35 additions & 35 deletions ...in/java/org/hibernate/beanvalidation/tck/tests/methodvalidation/MethodValidationTest.java
View file
Expand Up @@ -868,8 +868,8 @@ public void methodReturnValueValidationTargetsReturnValueAndCascadedConstraints(
);
assertCorrectPathNodeNames(
violations,
names( methodName, "$retval" ),
names( methodName, "$retval", "name" )
names( methodName, null ),
names( methodName, null, "name" )
);
assertCorrectPathDescriptorKinds(
violations,
Expand Down Expand Up @@ -909,9 +909,9 @@ public void methodReturnValueValidationIncludesConstraintsFromSuperClass() throw
);
assertCorrectPathNodeNames(
violations,
names( methodName, "$retval" ),
names( methodName, "$retval" ),
names( methodName, "$retval", "name" )
names( methodName, null ),
names( methodName, null ),
names( methodName, null, "name" )
);
assertCorrectPathDescriptorKinds(
violations,
Expand Down Expand Up @@ -953,9 +953,9 @@ public void methodReturnValueValidationIncludesConstraintsFromImplementedInterfa
);
assertCorrectPathNodeNames(
violations,
names( methodName, "$retval" ),
names( methodName, "$retval" ),
names( methodName, "$retval", "name" )
names( methodName, null ),
names( methodName, null ),
names( methodName, null, "name" )
);
assertCorrectPathDescriptorKinds(
violations,
Expand Down Expand Up @@ -996,7 +996,7 @@ public void methodReturnValueValidationIsAppliedGroupWise() throws Exception {
);
assertCorrectPathNodeNames(
violations,
names( methodName, "$retval" )
names( methodName, null )
);
assertCorrectPathDescriptorKinds(
violations,
Expand All @@ -1019,8 +1019,8 @@ public void methodReturnValueValidationIsAppliedGroupWise() throws Exception {
);
assertCorrectPathNodeNames(
violations,
names( methodName, "$retval", "name" ),
names( methodName, "$retval" )
names( methodName, null, "name" ),
names( methodName, null )
);
assertCorrectPathDescriptorKinds(
violations,
Expand Down Expand Up @@ -1054,7 +1054,7 @@ public void methodReturnValueValidationPerformsGroupConversion() throws Exceptio
assertCorrectNumberOfViolations( violations, 1 );

assertCorrectConstraintTypes( violations, Size.class );
assertCorrectPathNodeNames( violations, names( methodName, "$retval", "name" ) );
assertCorrectPathNodeNames( violations, names( methodName, null, "name" ) );
assertCorrectPathDescriptorKinds(
violations,
kinds( Kind.METHOD, Kind.RETURN_VALUE, Kind.PROPERTY )
Expand Down Expand Up @@ -1094,7 +1094,7 @@ public void methodReturnValueValidationValidatesEachConstraintOnlyOnce() throws
);
assertCorrectPathNodeNames(
violations,
names( methodName, "$retval" )
names( methodName, null )
);
assertCorrectPathDescriptorKinds(
violations,
Expand Down Expand Up @@ -1133,8 +1133,8 @@ public void methodReturnValueValidationUsingSequence() throws Exception {
assertCorrectConstraintTypes( violations, ValidOrder.class );
assertCorrectPathNodeNames(
violations,
names( methodName, "$retval" ),
names( methodName, "$retval", "name" )
names( methodName, null ),
names( methodName, null, "name" )
);
assertCorrectPathDescriptorKinds(
violations,
Expand All @@ -1158,7 +1158,7 @@ public void methodReturnValueValidationUsingSequence() throws Exception {
assertCorrectPathNodeNames(
violations,
names( methodName ),
names( methodName, "$retval" )
names( methodName, null )
);
assertCorrectPathDescriptorKinds(
violations,
Expand Down Expand Up @@ -1197,8 +1197,8 @@ public void methodReturnValueValidationWithRedefinedDefaultGroupSequence() throw
assertCorrectConstraintTypes( violations, Size.class, ValidOrder.class );
assertCorrectPathNodeNames(
violations,
names( methodName, "$retval" ),
names( methodName, "$retval", "name" )
names( methodName, null ),
names( methodName, null, "name" )
);
assertCorrectPathDescriptorKinds(
violations,
Expand All @@ -1221,8 +1221,8 @@ public void methodReturnValueValidationWithRedefinedDefaultGroupSequence() throw
assertCorrectConstraintTypes( violations, Size.class, ValidRetailOrder.class );
assertCorrectPathNodeNames(
violations,
names( methodName, "$retval" ),
names( methodName, "$retval", "name" )
names( methodName, null ),
names( methodName, null, "name" )
);
assertCorrectPathDescriptorKinds(
violations,
Expand Down Expand Up @@ -1259,8 +1259,8 @@ public void constructorReturnValueValidationTargetsReturnValueAndCascadedConstra
);
assertCorrectPathNodeNames(
violations,
names( className, "$retval" ),
names( className, "$retval", "name" )
names( className, null ),
names( className, null, "name" )
);
assertCorrectPathDescriptorKinds(
violations,
Expand Down Expand Up @@ -1295,7 +1295,7 @@ public void constructorReturnValueValidationDoesNotIncludeConstraintsFromSuperCl
);
assertCorrectPathNodeNames(
violations,
names( className, "$retval" )
names( className, null )
);
assertCorrectPathDescriptorKinds(
violations,
Expand Down Expand Up @@ -1331,7 +1331,7 @@ public void constructorReturnValueValidationIsAppliedGroupWise() throws Exceptio
);
assertCorrectPathNodeNames(
violations,
names( className, "$retval" )
names( className, null )
);
assertCorrectPathDescriptorKinds(
violations,
Expand All @@ -1353,8 +1353,8 @@ public void constructorReturnValueValidationIsAppliedGroupWise() throws Exceptio
);
assertCorrectPathNodeNames(
violations,
names( className, "$retval", "name" ),
names( className, "$retval" )
names( className, null, "name" ),
names( className, null )
);
assertCorrectPathDescriptorKinds(
violations,
Expand Down Expand Up @@ -1385,7 +1385,7 @@ public void constructorReturnValueValidationPerformsGroupConversion() throws Exc
assertCorrectNumberOfViolations( violations, 1 );

assertCorrectConstraintTypes( violations, Size.class );
assertCorrectPathNodeNames( violations, names( className, "$retval", "name" ) );
assertCorrectPathNodeNames( violations, names( className, null, "name" ) );
assertCorrectPathDescriptorKinds(
violations,
kinds( Kind.CONSTRUCTOR, Kind.RETURN_VALUE, Kind.PROPERTY )
Expand Down Expand Up @@ -1422,7 +1422,7 @@ public void constructorReturnValueValidationValidatesEachConstraintOnlyOnce() th
);
assertCorrectPathNodeNames(
violations,
names( className, "$retval" )
names( className, null )
);
assertCorrectPathDescriptorKinds(
violations,
Expand Down Expand Up @@ -1458,8 +1458,8 @@ public void constructorReturnValueValidationUsingSequence() throws Exception {
assertCorrectConstraintTypes( violations, ValidOrderService.class );
assertCorrectPathNodeNames(
violations,
names( className, "$retval" ),
names( className, "$retval", "name" )
names( className, null ),
names( className, null, "name" )
);
assertCorrectPathDescriptorKinds(
violations,
Expand All @@ -1482,7 +1482,7 @@ public void constructorReturnValueValidationUsingSequence() throws Exception {
assertCorrectPathNodeNames(
violations,
names( className ),
names( className, "$retval" )
names( className, null )
);
assertCorrectPathDescriptorKinds(
violations,
Expand Down Expand Up @@ -1522,8 +1522,8 @@ public void constructorReturnValueValidationWithRedefinedDefaultGroupSequence()
assertCorrectConstraintTypes( violations, Size.class, ValidOrderService.class );
assertCorrectPathNodeNames(
violations,
names( className, "$retval" ),
names( className, "$retval", "name" )
names( className, null ),
names( className, null, "name" )
);
assertCorrectPathDescriptorKinds(
violations,
Expand All @@ -1544,8 +1544,8 @@ public void constructorReturnValueValidationWithRedefinedDefaultGroupSequence()
assertCorrectConstraintTypes( violations, Pattern.class, ValidRetailOrderService.class );
assertCorrectPathNodeNames(
violations,
names( className, "$retval" ),
names( className, "$retval", "name" )
names( className, null ),
names( className, null, "name" )
);
assertCorrectPathDescriptorKinds(
violations,
Expand Down

0 comments on commit a166fff

Please sign in to comment.