From bab7fe4c69a34aa6b196c20f9782eab8b4b698f2 Mon Sep 17 00:00:00 2001
From: Kristian Enge <kristian.ienge@gmail.com>
Date: Tue, 7 Jun 2016 16:53:51 +0200
Subject: [PATCH 1/4] Introduced ValidationRunner to hold the state of the
 validation

---
 .../Difi.Felles.Utility.Tester.csproj         |  1 +
 .../Validation/TestGenerator.cs               | 10 +++
 .../Validation/ValidationMessagesTests.cs     | 23 +-----
 .../Validation/ValidationRunnerTests.cs       | 40 ++++++++++
 .../Validation/XmlValidatorTests.cs           | 76 +++++++++++++++----
 .../Difi.Felles.Utility.csproj                |  5 +-
 .../Validation/ValidationMessages.cs          | 10 +--
 .../Validation/ValidationRunner.cs            | 60 +++++++++++++++
 Difi.Felles.Utility/XmlValidator.cs           | 57 +++-----------
 9 files changed, 191 insertions(+), 91 deletions(-)
 create mode 100755 Difi.Felles.Utility.Tester/Validation/ValidationRunnerTests.cs
 create mode 100755 Difi.Felles.Utility/Validation/ValidationRunner.cs

diff --git a/Difi.Felles.Utility.Tester/Difi.Felles.Utility.Tester.csproj b/Difi.Felles.Utility.Tester/Difi.Felles.Utility.Tester.csproj
index e2ee753..d6b7cc9 100755
--- a/Difi.Felles.Utility.Tester/Difi.Felles.Utility.Tester.csproj
+++ b/Difi.Felles.Utility.Tester/Difi.Felles.Utility.Tester.csproj
@@ -77,6 +77,7 @@
     <Compile Include="Utilities\XmlUtility.cs" />
     <Compile Include="Validation\TestGenerator.cs" />
     <Compile Include="Validation\ValidationMessagesTests.cs" />
+    <Compile Include="Validation\ValidationRunnerTests.cs" />
     <Compile Include="Validation\XmlValidatorTestImplementation.cs" />
     <Compile Include="Validation\XmlValidatorTests.cs" />
   </ItemGroup>
diff --git a/Difi.Felles.Utility.Tester/Validation/TestGenerator.cs b/Difi.Felles.Utility.Tester/Validation/TestGenerator.cs
index 5c850dd..6598b73 100755
--- a/Difi.Felles.Utility.Tester/Validation/TestGenerator.cs
+++ b/Difi.Felles.Utility.Tester/Validation/TestGenerator.cs
@@ -1,5 +1,8 @@
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
+using System.Xml;
+using System.Xml.Schema;
 using ApiClientShared;
 
 namespace Difi.Felles.Utility.Tester.Validation
@@ -60,5 +63,12 @@ public List<string> ExpectedValidationMessages
                 }
             }
         }
+
+        public static XmlSchemaSet XmlSchemaSet()
+        {
+            var xmlSchemaSet = new XmlSchemaSet();
+            xmlSchemaSet.Add("http://tempuri.org/po.xsd", XmlReader.Create(new MemoryStream(ResourceUtility.ReadAllBytes(true,"Xsd.Sample.xsd"))));
+            return xmlSchemaSet;
+        }  
     }
 }
\ No newline at end of file
diff --git a/Difi.Felles.Utility.Tester/Validation/ValidationMessagesTests.cs b/Difi.Felles.Utility.Tester/Validation/ValidationMessagesTests.cs
index 72f4268..85f1e2e 100755
--- a/Difi.Felles.Utility.Tester/Validation/ValidationMessagesTests.cs
+++ b/Difi.Felles.Utility.Tester/Validation/ValidationMessagesTests.cs
@@ -58,27 +58,6 @@ public void OutputsCorrectly()
                 Assert.AreSame(expectedError, messages.ToString());
             }
         }
-
-        [TestClass]
-        public class ResetMethod : ValidationMessagesTests
-        {
-            [TestMethod]
-            public void ResetsState()
-            {
-                var messages = new ValidationMessages();
-                const string expectedError = "Error";
-                var expectedList = new List<string> {expectedError};
-                messages.Add(XmlSeverityType.Error, expectedError);
-                CollectionAssert.AreEqual(expectedList, messages);
-
-                messages.Reset();
-
-                CollectionAssert.AreEqual(new List<string>(), messages);
-                Assert.AreEqual("", messages.ToString());
-                Assert.IsFalse(messages.HasErrors);
-                Assert.IsFalse(messages.HasWarnings);
-                Assert.AreEqual(0, messages.Count);
-            }
-        }
+        
     }
 }
\ No newline at end of file
diff --git a/Difi.Felles.Utility.Tester/Validation/ValidationRunnerTests.cs b/Difi.Felles.Utility.Tester/Validation/ValidationRunnerTests.cs
new file mode 100755
index 0000000..9b68d64
--- /dev/null
+++ b/Difi.Felles.Utility.Tester/Validation/ValidationRunnerTests.cs
@@ -0,0 +1,40 @@
+using Difi.Felles.Utility.Validation;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Difi.Felles.Utility.Tester.Validation
+{
+    [TestClass]
+    public class ValidationRunnerTests
+    {
+        [TestClass]
+        public class ConstructorMethod : ValidationRunnerTests
+        {
+            [TestMethod]
+            public void SimpleInitialization()
+            {
+                //Arrange
+                var validationRunner = new ValidationRunner(TestGenerator.XmlSchemaSet());
+
+                //Act
+
+                //Assert
+                Assert.IsTrue(1 == 1);
+            }
+
+            [TestMethod]
+            public void AddsValidationMessage()
+            {
+                //Arrange
+                var validationRunner = new ValidationRunner(TestGenerator.XmlSchemaSet());
+                var invalidTestCouple = new TestGenerator.InvalidContentTestCouple();
+
+                //Act
+                validationRunner.Validate(invalidTestCouple.Input());
+
+                //Assert
+                Assert.AreEqual(1, validationRunner.ValidationMessages.Count);
+            }
+            
+        }
+    }
+}
\ No newline at end of file
diff --git a/Difi.Felles.Utility.Tester/Validation/XmlValidatorTests.cs b/Difi.Felles.Utility.Tester/Validation/XmlValidatorTests.cs
index 675079f..5ea0815 100755
--- a/Difi.Felles.Utility.Tester/Validation/XmlValidatorTests.cs
+++ b/Difi.Felles.Utility.Tester/Validation/XmlValidatorTests.cs
@@ -1,4 +1,5 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Collections.Generic;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Difi.Felles.Utility.Tester.Validation
 {
@@ -8,16 +9,59 @@ public class XmlValidatorTests
         [TestClass]
         public class ValidateMethod : XmlValidatorTests
         {
+            [TestMethod]
+            public void ValidateReturnsBoolAndOutsString()
+            {
+                //Arrange
+                var invalidContentTestCouple = new TestGenerator.InvalidContentTestCouple();
+                XmlValidator validator = new XmlValidatorTestImplementation();
+                string validationMessage;
+                //Act
+                var status = validator.Validate(invalidContentTestCouple.Input(), out validationMessage);
+
+                //Assert
+                Assert.IsTrue(invalidContentTestCouple.ExpectedValidationMessages.Contains(validationMessage));
+                Assert.IsFalse(status);
+            }
+
+            [TestMethod]
+            public void ValidateReturnsBoolAndOutsListOfStrings()
+            {
+                //Arrange
+                var invalidContentTestCouple = new TestGenerator.InvalidContentTestCouple();
+                XmlValidator validator = new XmlValidatorTestImplementation();
+                List<string> validationMessages;
+                //Act
+                var status = validator.Validate(invalidContentTestCouple.Input(), out validationMessages);
+
+                //Assert
+                Assert.IsTrue(invalidContentTestCouple.ExpectedValidationMessages.Contains(validationMessages.ToString()));
+                Assert.IsFalse(status);
+            }
+
+            [TestMethod]
+            public void ValidateReturnsBool()
+            {
+                //Arrange
+                var invalidContentTestCouple = new TestGenerator.InvalidContentTestCouple();
+                XmlValidator validator = new XmlValidatorTestImplementation();
+                //Act
+                var status = validator.Validate(invalidContentTestCouple.Input());
+
+                //Assert
+                Assert.IsFalse(status);
+            }
+
             [TestMethod]
             public void ValidateWithCorrectXmlShouldReturnTrueAndGiveNoValidationMessages()
             {
                 var validTestCouple = new TestGenerator.ValidTestCouple();
                 XmlValidator validator = new XmlValidatorTestImplementation();
-
-                var validateResult = validator.Validate(validTestCouple.Input());
+                List<string> messagesList;
+                var validateResult = validator.Validate(validTestCouple.Input(), out messagesList);
 
                 Assert.IsTrue(validateResult);
-                Assert.AreEqual(0, validator.ValidationMessages.Count);
+                Assert.AreEqual(0, messagesList.Count);
             }
 
             [TestMethod]
@@ -25,10 +69,10 @@ public void ValidateWithInvalidContentShouldReturnFalseAndGiveValidationError()
             {
                 var invalidContentTestCouple = new TestGenerator.InvalidContentTestCouple();
                 XmlValidator validator = new XmlValidatorTestImplementation();
+                List<string> messagesList;
+                var validateResult = validator.Validate(invalidContentTestCouple.Input(), out messagesList);
 
-                var validateResult = validator.Validate(invalidContentTestCouple.Input());
-
-                Assert.IsTrue(invalidContentTestCouple.ExpectedValidationMessages.Contains(validator.ValidationMessages.ToString()));
+                Assert.IsTrue(invalidContentTestCouple.ExpectedValidationMessages.Contains(messagesList.ToString()));
                 Assert.IsFalse(validateResult);
             }
 
@@ -37,10 +81,11 @@ public void ValidateWithInvalidSyntaxShouldReturnFalseAndGiveValidationError()
             {
                 var invalidSyntaxTestRequest = new TestGenerator.InvalidSyntaxTestCouple();
                 XmlValidator validator = new XmlValidatorTestImplementation();
+                List<string> messagesList;
 
-                var validateResult = validator.Validate(invalidSyntaxTestRequest.Input());
+                var validateResult = validator.Validate(invalidSyntaxTestRequest.Input(), out messagesList);
 
-                Assert.IsTrue(invalidSyntaxTestRequest.ExpectedValidationMessages.Contains(validator.ValidationMessages.ToString()));
+                Assert.IsTrue(invalidSyntaxTestRequest.ExpectedValidationMessages.Contains(messagesList.ToString()));
                 Assert.IsFalse(validateResult);
             }
 
@@ -50,19 +95,20 @@ public void MultipleValidateShouldNotHoldValidationState()
                 XmlValidator validator = new XmlValidatorTestImplementation();
 
                 var invalidContentTestCouple = new TestGenerator.InvalidContentTestCouple();
-                var validateResult = validator.Validate(invalidContentTestCouple.Input());
+                List<string> messagesList;
+                var validateResult = validator.Validate(invalidContentTestCouple.Input(), out messagesList);
                 Assert.IsFalse(validateResult);
-                Assert.IsTrue(invalidContentTestCouple.ExpectedValidationMessages.Contains(validator.ValidationMessages.ToString()));
+                Assert.IsTrue(invalidContentTestCouple.ExpectedValidationMessages.Contains(messagesList.ToString()));
 
                 var validTestCouple = new TestGenerator.ValidTestCouple();
-                validateResult = validator.Validate(validTestCouple.Input());
+                validateResult = validator.Validate(validTestCouple.Input(), out messagesList);
                 Assert.IsTrue(validateResult);
-                Assert.AreEqual(0, validator.ValidationMessages.Count);
+                Assert.AreEqual(0, messagesList.Count);
 
                 var invalidSyntaxTestCouple = new TestGenerator.InvalidSyntaxTestCouple();
-                validateResult = validator.Validate(invalidSyntaxTestCouple.Input());
+                validateResult = validator.Validate(invalidSyntaxTestCouple.Input(), out messagesList);
                 Assert.IsFalse(validateResult);
-                Assert.IsTrue(invalidSyntaxTestCouple.ExpectedValidationMessages.Contains(validator.ValidationMessages.ToString()));
+                Assert.IsTrue(invalidSyntaxTestCouple.ExpectedValidationMessages.Contains(messagesList.ToString()));
             }
         }
     }
diff --git a/Difi.Felles.Utility/Difi.Felles.Utility.csproj b/Difi.Felles.Utility/Difi.Felles.Utility.csproj
index 4aba5cd..5fb5b46 100755
--- a/Difi.Felles.Utility/Difi.Felles.Utility.csproj
+++ b/Difi.Felles.Utility/Difi.Felles.Utility.csproj
@@ -58,6 +58,7 @@
     <Compile Include="CertificateChainValidator.cs" />
     <Compile Include="Utilities\NamespaceUtility.cs" />
     <Compile Include="Validation\ValidationMessages.cs" />
+    <Compile Include="Validation\ValidationRunner.cs" />
     <Compile Include="XmlValidator.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -80,7 +81,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Difi.Felles.Utility/Validation/ValidationMessages.cs b/Difi.Felles.Utility/Validation/ValidationMessages.cs
index a1940e0..db152da 100755
--- a/Difi.Felles.Utility/Validation/ValidationMessages.cs
+++ b/Difi.Felles.Utility/Validation/ValidationMessages.cs
@@ -7,9 +7,9 @@ namespace Difi.Felles.Utility.Validation
 {
     public class ValidationMessages : List<string>
     {
-        public bool HasErrors { get; private set; }
+        public bool HasErrors { get; private set; } = false;
 
-        public bool HasWarnings { get; private set; }
+        public bool HasWarnings { get; private set; } = false;
 
         internal void Add(XmlSeverityType severity, string message)
         {
@@ -32,11 +32,5 @@ public override string ToString()
         {
             return Count <= 0 ? "" : this.Aggregate((current, variable) => current + Environment.NewLine + variable);
         }
-
-        internal void Reset()
-        {
-            Clear();
-            HasWarnings = HasErrors = false;
-        }
     }
 }
\ No newline at end of file
diff --git a/Difi.Felles.Utility/Validation/ValidationRunner.cs b/Difi.Felles.Utility/Validation/ValidationRunner.cs
new file mode 100755
index 0000000..fe2d7ef
--- /dev/null
+++ b/Difi.Felles.Utility/Validation/ValidationRunner.cs
@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Xml;
+using System.Xml.Schema;
+
+namespace Difi.Felles.Utility.Validation
+{
+    public class ValidationRunner
+    {
+        private const string ToleratedXsdIdErrorEnUs = "It is an error if there is a member of the attribute uses of a type definition with type xs:ID or derived from xs:ID and another attribute with type xs:ID matches an attribute wildcard.";
+        private const string ToleratedXsdIdErrorNbNo = "Det er en feil hvis det finnes et medlem av attributtet som bruker en typedefinisjon med typen xs:ID eller avledet fra xs:ID og et annet attributt med typen xs:ID tilsvarer et attributtjokertegn.";
+        private const string ToleratedPrefixListErrorEnUs = "The 'PrefixList' attribute is invalid - The value '' is invalid according to its datatype 'http://www.w3.org/2001/XMLSchema:NMTOKENS' - The attribute value cannot be empty.";
+        private const string ToleratedPrefixListErrorNbNo = "Attributtet PrefixList er ugyldig - Verdien  er ugyldig i henhold til datatypen http://www.w3.org/2001/XMLSchema:NMTOKENS - Attributtverdien kan ikke være tom.";
+
+        internal static readonly List<string> ToleratedErrors = new List<string> {ToleratedXsdIdErrorEnUs, ToleratedXsdIdErrorNbNo, ToleratedPrefixListErrorEnUs, ToleratedPrefixListErrorNbNo};
+
+        private readonly XmlSchemaSet _schemaSet;
+
+        public ValidationRunner(XmlSchemaSet schemaSet)
+        {
+            _schemaSet = schemaSet;
+        }
+
+        public ValidationMessages ValidationMessages { get; } = new ValidationMessages();
+
+        public bool Validate(string document)
+        {
+            var settings = new XmlReaderSettings();
+            settings.Schemas.Add(_schemaSet);
+            settings.ValidationType = ValidationType.Schema;
+            settings.ValidationFlags = XmlSchemaValidationFlags.ReportValidationWarnings;
+            settings.ValidationEventHandler += ValidationEventHandler;
+
+            var xmlReader = XmlReader.Create(new MemoryStream(Encoding.UTF8.GetBytes(document)), settings);
+
+            while (xmlReader.Read())
+            {
+            }
+
+            return !ValidationMessages.HasErrors && !ValidationMessages.HasWarnings;
+        }
+
+        private void ValidationEventHandler(object sender, ValidationEventArgs e)
+        {
+            if (IsToleratedError(e))
+            {
+            }
+            else
+            {
+                ValidationMessages.Add(e.Severity, e.Message);
+            }
+        }
+
+        private static bool IsToleratedError(ValidationEventArgs e)
+        {
+            return ToleratedErrors.Contains(e.Message);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Difi.Felles.Utility/XmlValidator.cs b/Difi.Felles.Utility/XmlValidator.cs
index e27a6e2..9fa3733 100755
--- a/Difi.Felles.Utility/XmlValidator.cs
+++ b/Difi.Felles.Utility/XmlValidator.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
 using System.Xml;
 using System.Xml.Schema;
 using Difi.Felles.Utility.Validation;
@@ -9,60 +8,28 @@ namespace Difi.Felles.Utility
 {
     public abstract class XmlValidator
     {
-        private const string ToleratedXsdIdErrorEnUs = "It is an error if there is a member of the attribute uses of a type definition with type xs:ID or derived from xs:ID and another attribute with type xs:ID matches an attribute wildcard.";
-        private const string ToleratedXsdIdErrorNbNo = "Det er en feil hvis det finnes et medlem av attributtet som bruker en typedefinisjon med typen xs:ID eller avledet fra xs:ID og et annet attributt med typen xs:ID tilsvarer et attributtjokertegn.";
-        private const string ToleratedPrefixListErrorEnUs = "The 'PrefixList' attribute is invalid - The value '' is invalid according to its datatype 'http://www.w3.org/2001/XMLSchema:NMTOKENS' - The attribute value cannot be empty.";
-        private const string ToleratedPrefixListErrorNbNo = "Attributtet PrefixList er ugyldig - Verdien  er ugyldig i henhold til datatypen http://www.w3.org/2001/XMLSchema:NMTOKENS - Attributtverdien kan ikke være tom.";
-
-        private static readonly List<string> ToleratedErrors = new List<string> {ToleratedXsdIdErrorEnUs, ToleratedXsdIdErrorNbNo, ToleratedPrefixListErrorEnUs, ToleratedPrefixListErrorNbNo};
-
         private readonly XmlSchemaSet _schemaSet = new XmlSchemaSet();
 
-        protected XmlValidator()
-        {
-            ValidationMessages = new ValidationMessages();
-        }
-
-        public ValidationMessages ValidationMessages { get; }
-
         public bool Validate(string document)
         {
-            ResetState();
-
-            var settings = new XmlReaderSettings();
-            settings.Schemas.Add(_schemaSet);
-            settings.ValidationType = ValidationType.Schema;
-            settings.ValidationFlags = XmlSchemaValidationFlags.ReportValidationWarnings;
-            settings.ValidationEventHandler += ValidationEventHandler;
-
-            var xmlReader = System.Xml.XmlReader.Create(new MemoryStream(Encoding.UTF8.GetBytes(document)), settings);
-
-            while (xmlReader.Read())
-            {
-            }
-
-            return !ValidationMessages.HasErrors && !ValidationMessages.HasWarnings;
-        }
-
-        private void ResetState()
-        {
-            ValidationMessages.Reset();
+            var validationRunner = new ValidationRunner(_schemaSet);
+            return validationRunner.Validate(document);
         }
 
-        private void ValidationEventHandler(object sender, ValidationEventArgs e)
+        public bool Validate(string document, out string validationMessage)
         {
-            if (IsToleratedError(e))
-            {
-            }
-            else
-            {
-                ValidationMessages.Add(e.Severity, e.Message);
-            }
+            var validationRunner = new ValidationRunner(_schemaSet);
+            var status = validationRunner.Validate(document);
+            validationMessage = validationRunner.ValidationMessages.ToString();
+            return status;
         }
 
-        private static bool IsToleratedError(ValidationEventArgs e)
+        public bool Validate(string document, out List<string> validationMessages)
         {
-            return ToleratedErrors.Contains(e.Message);
+            var validationRunner = new ValidationRunner(_schemaSet);
+            var result = validationRunner.Validate(document);
+            validationMessages = validationRunner.ValidationMessages;
+            return result;
         }
 
         protected void AddXsd(string @namespace, string fileName)

From 8d1097b3a394506b150cbc03112e671c90b9b932 Mon Sep 17 00:00:00 2001
From: Kristian Enge <kristian.ienge@gmail.com>
Date: Tue, 7 Jun 2016 16:58:05 +0200
Subject: [PATCH 2/4] restricted access modifier to ValidationRunner

---
 Difi.Felles.Utility/Validation/ValidationRunner.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Difi.Felles.Utility/Validation/ValidationRunner.cs b/Difi.Felles.Utility/Validation/ValidationRunner.cs
index fe2d7ef..128e19c 100755
--- a/Difi.Felles.Utility/Validation/ValidationRunner.cs
+++ b/Difi.Felles.Utility/Validation/ValidationRunner.cs
@@ -6,7 +6,7 @@
 
 namespace Difi.Felles.Utility.Validation
 {
-    public class ValidationRunner
+    internal class ValidationRunner
     {
         private const string ToleratedXsdIdErrorEnUs = "It is an error if there is a member of the attribute uses of a type definition with type xs:ID or derived from xs:ID and another attribute with type xs:ID matches an attribute wildcard.";
         private const string ToleratedXsdIdErrorNbNo = "Det er en feil hvis det finnes et medlem av attributtet som bruker en typedefinisjon med typen xs:ID eller avledet fra xs:ID og et annet attributt med typen xs:ID tilsvarer et attributtjokertegn.";
@@ -17,14 +17,14 @@ public class ValidationRunner
 
         private readonly XmlSchemaSet _schemaSet;
 
-        public ValidationRunner(XmlSchemaSet schemaSet)
+        internal ValidationRunner(XmlSchemaSet schemaSet)
         {
             _schemaSet = schemaSet;
         }
 
-        public ValidationMessages ValidationMessages { get; } = new ValidationMessages();
+        internal ValidationMessages ValidationMessages { get; } = new ValidationMessages();
 
-        public bool Validate(string document)
+        internal bool Validate(string document)
         {
             var settings = new XmlReaderSettings();
             settings.Schemas.Add(_schemaSet);

From d634f95d9b28b7484d4a371c086b0f01c08911ba Mon Sep 17 00:00:00 2001
From: Kristian Enge <kristian.ienge@gmail.com>
Date: Tue, 7 Jun 2016 17:00:30 +0200
Subject: [PATCH 3/4] cleanup code

---
 Difi.Felles.Utility/XmlValidator.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Difi.Felles.Utility/XmlValidator.cs b/Difi.Felles.Utility/XmlValidator.cs
index 9fa3733..fa1735f 100755
--- a/Difi.Felles.Utility/XmlValidator.cs
+++ b/Difi.Felles.Utility/XmlValidator.cs
@@ -12,8 +12,7 @@ public abstract class XmlValidator
 
         public bool Validate(string document)
         {
-            var validationRunner = new ValidationRunner(_schemaSet);
-            return validationRunner.Validate(document);
+            return new ValidationRunner(_schemaSet).Validate(document);
         }
 
         public bool Validate(string document, out string validationMessage)

From b10cf64fe144d6097c4f0b311f4b854fc13c0750 Mon Sep 17 00:00:00 2001
From: Kristian Enge <kristian.ienge@gmail.com>
Date: Wed, 8 Jun 2016 09:48:50 +0200
Subject: [PATCH 4/4] Refactoring validationrunnerTests

---
 .../Validation/ValidationRunnerTests.cs               | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Difi.Felles.Utility.Tester/Validation/ValidationRunnerTests.cs b/Difi.Felles.Utility.Tester/Validation/ValidationRunnerTests.cs
index 9b68d64..7708849 100755
--- a/Difi.Felles.Utility.Tester/Validation/ValidationRunnerTests.cs
+++ b/Difi.Felles.Utility.Tester/Validation/ValidationRunnerTests.cs
@@ -14,13 +14,13 @@ public void SimpleInitialization()
             {
                 //Arrange
                 var validationRunner = new ValidationRunner(TestGenerator.XmlSchemaSet());
-
-                //Act
-
-                //Assert
-                Assert.IsTrue(1 == 1);
+                
             }
+        }
 
+        [TestClass]
+        public class ValidateMethod : ValidationMessagesTests
+        {
             [TestMethod]
             public void AddsValidationMessage()
             {
@@ -34,7 +34,6 @@ public void AddsValidationMessage()
                 //Assert
                 Assert.AreEqual(1, validationRunner.ValidationMessages.Count);
             }
-            
         }
     }
 }
\ No newline at end of file