HV-999 Upgrading to TCK 1.1.4.Final; Adding tests removed from the TCK to HV's own tests

Author: gunnarmorling

engine/src/test/java/org/hibernate/validator/test/internal/xml/InvalidXmlConfigurationTest.java

@@ -0,0 +1,44 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.test.internal.xml;
+
+import javax.validation.ValidationException;
+
+import org.hibernate.validator.testutil.ValidationXmlTestHelper;
+import org.hibernate.validator.testutil.ValidatorUtil;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/**
+ * @author Hardy Ferentschik
+ * @author Gunnar Morling
+ */
+public class InvalidXmlConfigurationTest {
+
+	private static ValidationXmlTestHelper validationXmlTestHelper;
+
+	@BeforeClass
+	public static void setupValidationXmlTestHelper() {
+		validationXmlTestHelper = new ValidationXmlTestHelper( InvalidXmlConfigurationTest.class );
+	}
+
+	/**
+	 * Tests requirement 8.a from the BV 1.1 spec.
+	 */
+	@Test(expectedExceptions=ValidationException.class, expectedExceptionsMessageRegExp="HV000100.*")
+	public void testInvalidValidationXml() {
+		validationXmlTestHelper.runWithCustomValidationXml(
+				"validation-InvalidXmlConfigurationTest.xml", new Runnable() {
+
+			@Override
+			public void run() {
+				ValidatorUtil.getValidator();
+			}
+		}
+		);
+	}
+}

engine/src/test/java/org/hibernate/validator/test/internal/xml/UnknownVersionInValidationXmlTest.java

@@ -0,0 +1,43 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.test.internal.xml;
+
+import javax.validation.ValidationException;
+
+import org.hibernate.validator.testutil.ValidationXmlTestHelper;
+import org.hibernate.validator.testutil.ValidatorUtil;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/**
+ * @author Gunnar Morling
+ */
+public class UnknownVersionInValidationXmlTest {
+
+	private static ValidationXmlTestHelper validationXmlTestHelper;
+
+	@BeforeClass
+	public static void setupValidationXmlTestHelper() {
+		validationXmlTestHelper = new ValidationXmlTestHelper( InvalidXmlConfigurationTest.class );
+	}
+
+	/**
+	 * Tests requirement 8.1.4.c from the BV 1.1 spec.
+	 */
+	@Test(expectedExceptions=ValidationException.class, expectedExceptionsMessageRegExp="HV000122.*")
+	public void testInvalidValidationXml() {
+		validationXmlTestHelper.runWithCustomValidationXml(
+				"validation-UnknownVersionInValidationXmlTest.xml", new Runnable() {
+
+			@Override
+			public void run() {
+				ValidatorUtil.getValidator();
+			}
+		}
+		);
+	}
+}

engine/src/test/resources/org/hibernate/validator/test/internal/xml/validation-InvalidXmlConfigurationTest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
+    xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.0.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+</validation-confi>

engine/src/test/resources/org/hibernate/validator/test/internal/xml/validation-UnknownVersionInValidationXmlTest.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<validation-config
+        xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.1.xsd"
+        version="1.2">
+</validation-config>

tck-runner/pom.xml

@@ -20,7 +20,7 @@
     <name>Hibernate Validator TCK Runner</name>
     <description>Aggregates dependencies and runs the JSR-349 TCK</description>
     <properties>
-        <tck.version>1.1.2.Final</tck.version>
+        <tck.version>1.1.4.Final</tck.version>
         <tck.suite.file>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml</tck.suite.file>
         <wildflyTargetDir>${project.build.directory}/wildfly-${wildfly.version}</wildflyTargetDir>
         <validation.provider>org.hibernate.validator.HibernateValidator</validation.provider>