From e1a1d61abd330feec17d6ae3650be5bba9b4ac9d Mon Sep 17 00:00:00 2001
From: Timon Borter <timon.borter.1@postfinance.ch>
Date: Fri, 19 Jan 2024 13:35:04 +0100
Subject: [PATCH] fix: allow configuration of xml validator via constructor

---
 .../xml/DomXmlMessageValidator.java           | 13 +++++++--
 .../xml/schema/XmlSchemaValidation.java       | 16 +++++++++++
 .../xml/DomXmlMessageValidatorTest.java       | 28 ++++++++++++++++++-
 3 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/DomXmlMessageValidator.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/DomXmlMessageValidator.java
index d0b5d5fbed..345332fd43 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/DomXmlMessageValidator.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/DomXmlMessageValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2010 the original author or authors.
+ * Copyright 2006-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import java.util.Map.Entry;
 import javax.xml.XMLConstants;
 import javax.xml.namespace.NamespaceContext;
-
 import org.citrusframework.CitrusSettings;
 import org.citrusframework.XmlValidationHelper;
 import org.citrusframework.context.TestContext;
@@ -64,7 +63,15 @@ public class DomXmlMessageValidator extends AbstractMessageValidator<XmlMessageV
     private NamespaceContextBuilder namespaceContextBuilder;
 
     /** Default schema validator */
-    private final XmlSchemaValidation schemaValidator = new XmlSchemaValidation();
+    private final XmlSchemaValidation schemaValidator;
+
+    public DomXmlMessageValidator() {
+        this(new XmlSchemaValidation());
+    }
+
+    public DomXmlMessageValidator(XmlSchemaValidation schemaValidator) {
+        this.schemaValidator = schemaValidator;
+    }
 
     @Override
     public void validateMessage(Message receivedMessage, Message controlMessage,
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/schema/XmlSchemaValidation.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/schema/XmlSchemaValidation.java
index 6007ec6330..b7b5fdf6e0 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/schema/XmlSchemaValidation.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/schema/XmlSchemaValidation.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * 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.citrusframework.validation.xml.schema;
 
 import org.citrusframework.XmlValidationHelper;
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/DomXmlMessageValidatorTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/DomXmlMessageValidatorTest.java
index ca403b1eaf..d65ccb2083 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/DomXmlMessageValidatorTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/DomXmlMessageValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2010 the original author or authors.
+ * Copyright 2006-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,6 +49,12 @@
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
+import static org.mockito.Mockito.mock;
+import static org.springframework.test.util.ReflectionTestUtils.getField;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
+
 /**
  * @author Christoph Deppisch
  */
@@ -96,6 +102,26 @@ protected TestContextFactory createTestContextFactory() {
         return factory;
     }
 
+    @Test
+    public void constructorWithoutArguments() {
+        Object xmlSchemaValidation = getField(validator, DomXmlMessageValidator.class, "schemaValidator");
+
+        assertTrue(xmlSchemaValidation instanceof XmlSchemaValidation);
+        assertNotNull(xmlSchemaValidation);
+    }
+
+    @Test
+    public void allArgsConstructor() {
+        XmlSchemaValidation xmlSchemaValidationMock = mock(XmlSchemaValidation.class);
+        DomXmlMessageValidator domXmlMessageValidator = new DomXmlMessageValidator(xmlSchemaValidationMock);
+
+        Object xmlSchemaValidation = getField(domXmlMessageValidator, DomXmlMessageValidator.class, "schemaValidator");
+
+        assertTrue(xmlSchemaValidation instanceof XmlSchemaValidation);
+        assertNotNull(xmlSchemaValidation);
+        assertEquals(xmlSchemaValidationMock, xmlSchemaValidation);
+    }
+
     @Test
     public void validateXMLSchema() throws SAXException, IOException, ParserConfigurationException {
         Message message = new DefaultMessage("<message xmlns='http://citrusframework.org/test'>"