diff options
Diffstat (limited to 'config-model-api/src/test/java/com/yahoo/config/application/api/ValidationOverrideTest.java')
| -rw-r--r-- | config-model-api/src/test/java/com/yahoo/config/application/api/ValidationOverrideTest.java | 52 |
1 files changed, 26 insertions, 26 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 919d52ac811..75e1fe72e4b 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 @@ -8,7 +8,7 @@ import org.xml.sax.SAXException; import java.io.IOException; import java.io.StringReader; -import java.time.Clock; +import java.time.Instant; import java.util.Optional; import static org.junit.Assert.assertEquals; @@ -27,29 +27,29 @@ public class ValidationOverrideTest { "</validation-overrides>"; { - 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); + ValidationOverrides overrides = ValidationOverrides.fromXml(Optional.of(new StringReader(validationOverrides))); + Instant now = ManualClock.at("2000-01-01T23:59:00"); + assertOverridden("indexing-change", overrides, now); + assertOverridden("indexing-mode-change", overrides, now); + assertNotOverridden("field-type-change", overrides, now); assertEquals(validationOverrides, overrides.xmlForm()); } { - 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.fromXml(Optional.of(new StringReader(validationOverrides))); + Instant now = ManualClock.at("2000-01-02T00:00:00"); + assertNotOverridden("indexing-change", overrides, now); + assertOverridden("indexing-mode-change", overrides, now); + assertNotOverridden("field-type-change", overrides, now); } { - 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); + ValidationOverrides overrides = ValidationOverrides.fromXml(Optional.of(new StringReader(validationOverrides))); + Instant now = ManualClock.at("2000-01-04T00:00:00"); + assertNotOverridden("indexing-change", overrides, now); + assertNotOverridden("indexing-mode-change", overrides, now); + assertNotOverridden("field-type-change", overrides, now); } } @@ -62,31 +62,31 @@ public class ValidationOverrideTest { "</validation-overrides>"; try { - ValidationOverrides.fromXml(Optional.of(new StringReader(validationOverrides)), - ManualClock.at("2000-01-01T23:59:00")); + ValidationOverrides overrides = ValidationOverrides.fromXml(Optional.of(new StringReader(validationOverrides))); + Instant now = ManualClock.at("2000-01-01T23:59:00"); + overrides.allows("indexing-change", now); Assert.fail("Expected validation interval override validation validation failure"); } catch (IllegalArgumentException e) { - Assert.assertEquals("validation-overrides is invalid", e.getMessage()); Assert.assertEquals("allow 'indexing-change' until 2000-02-03T00:00:00Z is too far in the future: Max 30 days is allowed", - e.getCause().getMessage()); + e.getMessage()); } } @Test public void testEmpty() { - ValidationOverrides empty = ValidationOverrides.empty(); - ValidationOverrides emptyReserialized = ValidationOverrides.fromXml(empty.xmlForm(), Clock.systemUTC().instant()); + ValidationOverrides empty = ValidationOverrides.empty; + ValidationOverrides emptyReserialized = ValidationOverrides.fromXml(empty.xmlForm()); assertEquals(empty.xmlForm(), emptyReserialized.xmlForm()); } - private void assertOverridden(String validationId, ValidationOverrides overrides) { - overrides.invalid(ValidationId.from(validationId).get(), "message"); // should not throw exception + private void assertOverridden(String validationId, ValidationOverrides overrides, Instant now) { + overrides.invalid(ValidationId.from(validationId).get(), "message", now); // should not throw exception } - private void assertNotOverridden(String validationId, ValidationOverrides overrides) { + private void assertNotOverridden(String validationId, ValidationOverrides overrides, Instant now) { try { - overrides.invalid(ValidationId.from(validationId).get(), "message"); + overrides.invalid(ValidationId.from(validationId).get(), "message", now); Assert.fail("Expected '" + validationId + "' to not be overridden"); } catch (ValidationOverrides.ValidationException expected) { |