diff options
Diffstat (limited to 'models-tosca/src/test/java')
2 files changed, 20 insertions, 19 deletions
diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTimeIntervalTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTimeIntervalTest.java index 2d52f504b..b0a8ab709 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTimeIntervalTest.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTimeIntervalTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019-2020 Nordix Foundation. + * Copyright (C) 2019-2021 Nordix Foundation. * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,7 +28,8 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.util.Date; +import java.sql.Timestamp; +import java.time.Instant; import org.junit.Test; import org.onap.policy.models.base.PfConceptKey; import org.onap.policy.models.base.PfReferenceKey; @@ -46,27 +47,27 @@ public class JpaToscaTimeIntervalTest { public void testTimeIntervalPojo() { assertNotNull(new JpaToscaTimeInterval()); assertNotNull(new JpaToscaTimeInterval(new PfReferenceKey())); - assertNotNull(new JpaToscaTimeInterval(new PfReferenceKey(), new Date(), new Date())); + assertNotNull(new JpaToscaTimeInterval(new PfReferenceKey(), Instant.now(), Instant.now())); assertNotNull(new JpaToscaTimeInterval(new JpaToscaTimeInterval())); assertThatThrownBy(() -> new JpaToscaTimeInterval((PfReferenceKey) null)).hasMessageMatching(KEY_IS_NULL); assertThatThrownBy(() -> new JpaToscaTimeInterval(null, null, null)).hasMessageMatching(KEY_IS_NULL); - assertThatThrownBy(() -> new JpaToscaTimeInterval(null, null, new Date())).hasMessageMatching(KEY_IS_NULL); + assertThatThrownBy(() -> new JpaToscaTimeInterval(null, null, Instant.now())).hasMessageMatching(KEY_IS_NULL); - assertThatThrownBy(() -> new JpaToscaTimeInterval(null, new Date(), null)).hasMessageMatching(KEY_IS_NULL); + assertThatThrownBy(() -> new JpaToscaTimeInterval(null, Instant.now(), null)).hasMessageMatching(KEY_IS_NULL); - assertThatThrownBy(() -> new JpaToscaTimeInterval(null, new Date(), new Date())) + assertThatThrownBy(() -> new JpaToscaTimeInterval(null, Instant.now(), Instant.now())) .hasMessageMatching(KEY_IS_NULL); assertThatThrownBy(() -> new JpaToscaTimeInterval(new PfReferenceKey(), null, null)) .hasMessageMatching("startTime is marked .*on.*ull but is null"); - assertThatThrownBy(() -> new JpaToscaTimeInterval(new PfReferenceKey(), null, new Date())) + assertThatThrownBy(() -> new JpaToscaTimeInterval(new PfReferenceKey(), null, Instant.now())) .hasMessageMatching("startTime is marked .*on.*ull but is null"); - assertThatThrownBy(() -> new JpaToscaTimeInterval(new PfReferenceKey(), new Date(), null)) + assertThatThrownBy(() -> new JpaToscaTimeInterval(new PfReferenceKey(), Instant.now(), null)) .hasMessageMatching("endTime is marked .*on.*ull but is null"); assertThatThrownBy(() -> new JpaToscaServiceTemplate((JpaToscaServiceTemplate) null)) @@ -74,8 +75,8 @@ public class JpaToscaTimeIntervalTest { PfConceptKey ttiParentKey = new PfConceptKey("tParentKey", "0.0.1"); PfReferenceKey ttiKey = new PfReferenceKey(ttiParentKey, "trigger0"); - Date startTime = new Date(1000); - Date endTime = new Date(2000); + Instant startTime = Instant.ofEpochSecond(1000); + Instant endTime = Instant.ofEpochSecond(2000); JpaToscaTimeInterval tti = new JpaToscaTimeInterval(ttiKey, startTime, endTime); JpaToscaTimeInterval tdtClone0 = new JpaToscaTimeInterval(tti); @@ -96,9 +97,9 @@ public class JpaToscaTimeIntervalTest { assertNotEquals(0, tti.compareTo(otherDt)); otherDt.setKey(ttiKey); assertNotEquals(0, tti.compareTo(otherDt)); - otherDt.setStartTime(startTime); + otherDt.setStartTime(Timestamp.from(startTime)); assertNotEquals(0, tti.compareTo(otherDt)); - otherDt.setEndTime(endTime); + otherDt.setEndTime(Timestamp.from(endTime)); assertEquals(0, tti.compareTo(otherDt)); assertEquals(1, tti.getKeys().size()); @@ -113,16 +114,16 @@ public class JpaToscaTimeIntervalTest { tti.setStartTime(null); assertFalse(tti.validate("").isValid()); - tti.setStartTime(new Date(endTime.getTime() + 1)); + tti.setStartTime(Timestamp.from(endTime.plusSeconds(1))); assertFalse(tti.validate("").isValid()); - tti.setStartTime(startTime); + tti.setStartTime(Timestamp.from(startTime)); assertTrue(tti.validate("").isValid()); tti.setEndTime(null); assertFalse(tti.validate("").isValid()); - tti.setEndTime(new Date(startTime.getTime() - 1)); + tti.setEndTime(Timestamp.from(startTime.minusSeconds(1))); assertFalse(tti.validate("").isValid()); - tti.setEndTime(endTime); + tti.setEndTime(Timestamp.from(endTime)); assertTrue(tti.validate("").isValid()); assertThatThrownBy(() -> tti.validate(null)).hasMessageMatching("fieldName is marked .*on.*ull but is null"); diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTriggerTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTriggerTest.java index 2eb6b10e0..38be5f6a6 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTriggerTest.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTriggerTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START======================================================= - * Copyright (C) 2019-2020 Nordix Foundation. + * Copyright (C) 2019-2021 Nordix Foundation. * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,7 +29,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.time.Duration; -import java.util.Date; +import java.time.Instant; import org.junit.Test; import org.onap.policy.models.base.PfConceptKey; import org.onap.policy.models.base.PfReferenceKey; @@ -81,7 +81,7 @@ public class JpaToscaTriggerTest { JpaToscaTrigger tdt = new JpaToscaTrigger(tkey, EVENT_TYPE, ACTION); JpaToscaTimeInterval schedule = - new JpaToscaTimeInterval(new PfReferenceKey(tkey, "sched"), new Date(), new Date()); + new JpaToscaTimeInterval(new PfReferenceKey(tkey, "sched"), Instant.now(), Instant.now()); tdt.setSchedule(schedule); JpaToscaEventFilter targetFilter = |