Provide xml form

1 files changed, 19 insertions, 13 deletions

diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/ValidationOverrideTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/ValidationOverrideTest.java
index 2528fe8883e..919d52ac811 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/ValidationOverrideTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/ValidationOverrideTest.java
@@ -1,8 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.application.api;
 
-import com.yahoo.config.application.api.ValidationId;
-import com.yahoo.config.application.api.ValidationOverrides;
 import com.yahoo.test.ManualClock;
 import org.junit.Assert;
 import org.junit.Test;
@@ -10,9 +8,9 @@ import org.xml.sax.SAXException;
 
 import java.io.IOException;
 import java.io.StringReader;
+import java.time.Clock;
 import java.util.Optional;
 
-import static org.junit.Assert.fail;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -27,27 +25,28 @@ public class ValidationOverrideTest {
                 "  <allow until='2000-01-01'>indexing-change</allow>" +
                 "  <allow until='2000-01-03' comment='any text'>indexing-mode-change</allow>" +
                 "</validation-overrides>";
-
         {
 
-            ValidationOverrides overrides = ValidationOverrides.read(Optional.of(new StringReader(validationOverrides)),
-                                                                                 ManualClock.at("2000-01-01T23:59:00"));
+            ValidationOverrides overrides = ValidationOverrides.fromXml(Optional.of(new StringReader(validationOverrides)),
+                                                                        ManualClock.at("2000-01-01T23:59:00"));
             assertOverridden("indexing-change", overrides);
             assertOverridden("indexing-mode-change", overrides);
             assertNotOverridden("field-type-change", overrides);
+
+            assertEquals(validationOverrides, overrides.xmlForm());
         }
 
         {
-            ValidationOverrides overrides = ValidationOverrides.read(Optional.of(new StringReader(validationOverrides)),
-                                                                                 ManualClock.at("2000-01-02T00:00:00"));
+            ValidationOverrides overrides = ValidationOverrides.fromXml(Optional.of(new StringReader(validationOverrides)),
+                                                                        ManualClock.at("2000-01-02T00:00:00"));
             assertNotOverridden("indexing-change", overrides);
             assertOverridden("indexing-mode-change", overrides);
             assertNotOverridden("field-type-change", overrides);
         }
 
         {
-            ValidationOverrides overrides = ValidationOverrides.read(Optional.of(new StringReader(validationOverrides)),
-                                                                                 ManualClock.at("2000-01-04T00:00:00"));
+            ValidationOverrides overrides = ValidationOverrides.fromXml(Optional.of(new StringReader(validationOverrides)),
+                                                                        ManualClock.at("2000-01-04T00:00:00"));
             assertNotOverridden("indexing-change", overrides);
             assertNotOverridden("indexing-mode-change", overrides);
             assertNotOverridden("field-type-change", overrides);
@@ -63,8 +62,8 @@ public class ValidationOverrideTest {
                 "</validation-overrides>";
 
         try {
-            ValidationOverrides.read(Optional.of(new StringReader(validationOverrides)),
-                                                 ManualClock.at("2000-01-01T23:59:00"));
+            ValidationOverrides.fromXml(Optional.of(new StringReader(validationOverrides)),
+                                        ManualClock.at("2000-01-01T23:59:00"));
             Assert.fail("Expected validation interval override validation validation failure");
         }
         catch (IllegalArgumentException e) {
@@ -73,6 +72,13 @@ public class ValidationOverrideTest {
                                 e.getCause().getMessage());
         }
     }
+    
+    @Test
+    public void testEmpty() {
+        ValidationOverrides empty = ValidationOverrides.empty();
+        ValidationOverrides emptyReserialized = ValidationOverrides.fromXml(empty.xmlForm(), Clock.systemUTC().instant());
+        assertEquals(empty.xmlForm(), emptyReserialized.xmlForm());
+    }
 
     private void assertOverridden(String validationId, ValidationOverrides overrides) {
         overrides.invalid(ValidationId.from(validationId).get(), "message"); // should not throw exception
@@ -86,5 +92,5 @@ public class ValidationOverrideTest {
         catch (ValidationOverrides.ValidationException expected) {
         }
     }
-
+    
 }