[hibernate-commits] Hibernate SVN: r17747 - in validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator: util and 1 other directory.

Author: hardy.ferentschik Date: 2009-10-14 13:06:14 -0400 (Wed, 14 Oct 2009) New Revision: 17747 Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/SizeValidatorTest.java validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ValidatorTypeTest.java Log: Made sure that we consistently use the TestNg Assert class instead of AssertJUnit Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/SizeValidatorTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/SizeValidatorTest.java 2009-10-14 17:05:10 UTC (rev 17746) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/constraints/impl/SizeValidatorTest.java 2009-10-14 17:06:14 UTC (rev 17747) @@ -26,7 +26,7 @@ import javax.validation.constraints.Size; import static org.testng.Assert.assertTrue; -import static org.testng.AssertJUnit.assertFalse; +import static org.testng.Assert.assertFalse; import org.testng.annotations.Test; import org.hibernate.validator.util.annotationfactory.AnnotationDescriptor; Modified: validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ValidatorTypeTest.java =================================================================== --- validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ValidatorTypeTest.java 2009-10-14 17:05:10 UTC (rev 17746) +++ validator/trunk/hibernate-validator/src/test/java/org/hibernate/validator/util/ValidatorTypeTest.java 2009-10-14 17:06:14 UTC (rev 17747) @@ -1,48 +1,48 @@ -// $Id$ -/* -* JBoss, Home of Professional Open Source -* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ -package org.hibernate.validator.util; - -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import javax.validation.ConstraintValidator; - -import static org.testng.Assert.assertEquals; -import static org.testng.AssertJUnit.assertNull; -import org.testng.annotations.Test; - -/** - * Tests for message resolution. - * - * @author Emmanuel Bernard - */ -public class ValidatorTypeTest { - - @Test - public void testTypeDiscovery() { - List<Class<? extends ConstraintValidator<Positive, ?>>> validators = - new ArrayList<Class<? extends ConstraintValidator<Positive, ?>>>(); - validators.add( PositiveConstraintValidator.class ); - Map<Type, Class<? extends ConstraintValidator<?, ?>>> validatorsTypes = ValidatorTypeHelper - .getValidatorsTypes( validators ); - - assertEquals( validatorsTypes.get( Integer.class ), PositiveConstraintValidator.class ); - assertNull( validatorsTypes.get( String.class ) ); - } +// $Id$ +/* +* JBoss, Home of Professional Open Source +* Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package org.hibernate.validator.util; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import javax.validation.ConstraintValidator; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; +import org.testng.annotations.Test; + +/** + * Tests for message resolution. + * + * @author Emmanuel Bernard + */ +public class ValidatorTypeTest { + + @Test + public void testTypeDiscovery() { + List<Class<? extends ConstraintValidator<Positive, ?>>> validators = + new ArrayList<Class<? extends ConstraintValidator<Positive, ?>>>(); + validators.add( PositiveConstraintValidator.class ); + Map<Type, Class<? extends ConstraintValidator<?, ?>>> validatorsTypes = ValidatorTypeHelper + .getValidatorsTypes( validators ); + + assertEquals( validatorsTypes.get( Integer.class ), PositiveConstraintValidator.class ); + assertNull( validatorsTypes.get( String.class ) ); + } }