HV-955 Moving runWithCustomValidationXml() to separate helper class

Author: gunnarmorling

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

@@ -11,6 +11,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+
 import javax.validation.BootstrapConfiguration;
 import javax.validation.Configuration;
 import javax.validation.ConstraintViolation;
@@ -27,7 +28,9 @@
 import org.hibernate.validator.cfg.ConstraintMapping;
 import org.hibernate.validator.cfg.defs.SizeDef;
 import org.hibernate.validator.testutil.TestForIssue;
+import org.hibernate.validator.testutil.ValidationXmlTestHelper;
 import org.hibernate.validator.testutil.ValidatorUtil;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import static org.hibernate.validator.internal.util.CollectionHelper.asSet;
@@ -41,6 +44,13 @@
  */
 public class XmlMappingTest {
 
+	private static ValidationXmlTestHelper validationXmlTestHelper;
+
+	@BeforeClass
+	public static void setupValidationXmlTestHelper() {
+		validationXmlTestHelper = new ValidationXmlTestHelper( XmlMappingTest.class );
+	}
+
 	@Test
 	@TestForIssue(jiraKey = "HV-214")
 	public void testConstraintInheritanceWithXmlConfiguration() {
@@ -182,7 +192,7 @@ public void shouldFailToLoadConstraintMappingWithUnsupportedVersion() {
 
 	@Test
 	public void testParameterNameProviderConfiguration() {
-		runWithCustomValidationXml(
+		validationXmlTestHelper.runWithCustomValidationXml(
 				"parameter-name-provider-validation.xml", new Runnable() {
 
 			@Override
@@ -211,7 +221,7 @@ public void run() {
 	@Test
 	@TestForIssue(jiraKey = "HV-707")
 	public void shouldReturnDefaultExecutableTypesForValidationXmlWithoutTypesGiven() {
-		runWithCustomValidationXml(
+		validationXmlTestHelper.runWithCustomValidationXml(
 				"bv-1.0-validation.xml", new Runnable() {
 
 			@Override
@@ -248,7 +258,7 @@ public void shouldReturnDefaultExecutableTypesIfNoValidationXmlIsGiven() {
 
 	@Test
 	public void testLoadingOfBv10ValidationXml() {
-		runWithCustomValidationXml(
+		validationXmlTestHelper.runWithCustomValidationXml(
 				"bv-1.0-validation.xml", new Runnable() {
 
 			@Override
@@ -273,7 +283,7 @@ public void run() {
 			expectedExceptionsMessageRegExp = "HV000122: Unsupported schema version for META-INF/validation.xml: 2\\.0\\."
 	)
 	public void shouldFailToLoadValidationXmlWithUnsupportedVersion() {
-		runWithCustomValidationXml(
+		validationXmlTestHelper.runWithCustomValidationXml(
 				"unsupported-validation.xml", new Runnable() {
 
 			@Override
@@ -289,7 +299,7 @@ public void run() {
 			expectedExceptionsMessageRegExp = "HV000100: Unable to parse META-INF/validation.xml."
 	)
 	public void shouldFailToLoad10ValidationXmlWithParameterNameProvider() {
-		runWithCustomValidationXml(
+		validationXmlTestHelper.runWithCustomValidationXml(
 				"invalid-bv-1.0-validation.xml", new Runnable() {
 
 			@Override
@@ -316,34 +326,4 @@ public void testCascadedValidation() {
 		assertEquals( violations.size(), 1 );
 		assertCorrectConstraintTypes( violations, NotNull.class );
 	}
-
-	/**
-	 * Executes the given runnable, using the specified file as replacement for
-	 * {@code META-INF/validation.xml}.
-	 *
-	 * @param validationXmlName The file to be used as validation.xml file.
-	 * @param runnable The runnable to execute.
-	 */
-	private void runWithCustomValidationXml(final String validationXmlName, Runnable runnable) {
-		ClassLoader previousContextCl = Thread.currentThread().getContextClassLoader();
-
-		try {
-			Thread.currentThread().setContextClassLoader(
-					new ClassLoader( previousContextCl ) {
-						@Override
-						public InputStream getResourceAsStream(String name) {
-							if ( name.equals( "META-INF/validation.xml" ) ) {
-								return XmlMappingTest.class.getResourceAsStream( validationXmlName );
-							}
-
-							return super.getResourceAsStream( name );
-						}
-					}
-			);
-			runnable.run();
-		}
-		finally {
-			Thread.currentThread().setContextClassLoader( previousContextCl );
-		}
-	}
 }

test-utils/src/main/java/org/hibernate/validator/testutil/ValidationXmlTestHelper.java

@@ -0,0 +1,59 @@
+/*
+ * 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.testutil;
+
+import java.io.InputStream;
+
+/**
+ * Helps tests with using a specific file as {@code META-INF/validation.xml}.
+ *
+ * @author Gunnar Morling
+ */
+public class ValidationXmlTestHelper {
+
+	private final Class<?> clazz;
+
+	/**
+	 * Creates a new {@code ValidationXmlTestHelper}.
+	 *
+	 * @param clazz
+	 *            A class through which the specified {@code validation.xml} stand-in will be loaded.
+	 */
+	public ValidationXmlTestHelper(Class<?> clazz) {
+		this.clazz = clazz;
+	}
+
+	/**
+	 * Executes the given runnable, using the specified file as replacement for
+	 * {@code META-INF/validation.xml}.
+	 *
+	 * @param validationXmlName The file to be used as validation.xml file.
+	 * @param runnable The runnable to execute.
+	 */
+	public void runWithCustomValidationXml(final String validationXmlName, Runnable runnable) {
+		ClassLoader previousContextCl = Thread.currentThread().getContextClassLoader();
+
+		try {
+			Thread.currentThread().setContextClassLoader(
+					new ClassLoader( previousContextCl ) {
+						@Override
+						public InputStream getResourceAsStream(String name) {
+							if ( name.equals( "META-INF/validation.xml" ) ) {
+								return clazz.getResourceAsStream( validationXmlName );
+							}
+
+							return super.getResourceAsStream( name );
+						}
+					}
+			);
+			runnable.run();
+		}
+		finally {
+			Thread.currentThread().setContextClassLoader( previousContextCl );
+		}
+	}
+}