/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 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");
* you may not use this file except in compliance with the License.
package org.onap.policy.models.tosca.simple.concepts;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-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;
-import org.onap.policy.models.base.PfValidationResult;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaTimeInterval;
/**
* DAO test for ToscaTimeInterval.
*/
public class JpaToscaTimeIntervalTest {
+ private static final String KEY_IS_NULL = "key is marked .*on.*ull but is null";
+
@Test
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()));
- try {
- new JpaToscaTimeInterval((PfReferenceKey) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTimeInterval(null, null, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTimeInterval(null, null, new Date());
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTimeInterval(null, new Date(), null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTimeInterval(null, new Date(), new Date());
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("key is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTimeInterval(new PfReferenceKey(), null, null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("startTime is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTimeInterval(new PfReferenceKey(), null, new Date());
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("startTime is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTimeInterval(new PfReferenceKey(), new Date(), null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("endTime is marked @NonNull but is null", exc.getMessage());
- }
-
- try {
- new JpaToscaTimeInterval((JpaToscaTimeInterval) null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("copyConcept is marked @NonNull but is null", exc.getMessage());
- }
+ assertThatThrownBy(() -> new JpaToscaTimeInterval((PfReferenceKey) null)).hasMessageMatching(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaTimeInterval(null, null, null)).hasMessageMatching(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaTimeInterval(null, null, Instant.now())).hasMessageMatching(KEY_IS_NULL);
+
+ assertThatThrownBy(() -> new JpaToscaTimeInterval(null, Instant.now(), null)).hasMessageMatching(KEY_IS_NULL);
+
+ 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, Instant.now()))
+ .hasMessageMatching("startTime is marked .*on.*ull but is null");
+
+ assertThatThrownBy(() -> new JpaToscaTimeInterval(new PfReferenceKey(), Instant.now(), null))
+ .hasMessageMatching("endTime is marked .*on.*ull but is null");
+
+ assertThatThrownBy(() -> new JpaToscaServiceTemplate((JpaToscaServiceTemplate) null))
+ .isInstanceOf(NullPointerException.class);
+ }
+
+ @Test
+ public void testTimeInterval() {
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);
assertEquals(tti, tdtClone0);
assertEquals(0, tti.compareTo(tdtClone0));
- JpaToscaTimeInterval tdtClone1 = new JpaToscaTimeInterval();
- tti.copyTo(tdtClone1);
+ JpaToscaTimeInterval tdtClone1 = new JpaToscaTimeInterval(tti);
assertEquals(tti, tdtClone1);
assertEquals(0, tti.compareTo(tdtClone1));
assertEquals(-1, tti.compareTo(null));
assertEquals(0, tti.compareTo(tti));
- assertFalse(tti.compareTo(tti.getKey()) == 0);
+ assertNotEquals(0, tti.compareTo(tti.getKey()));
PfReferenceKey otherDtKey = new PfReferenceKey("otherDt", "0.0.1", "OtherTimeInterval");
JpaToscaTimeInterval otherDt = new JpaToscaTimeInterval(otherDtKey);
- assertFalse(tti.compareTo(otherDt) == 0);
+ assertNotEquals(0, tti.compareTo(otherDt));
otherDt.setKey(ttiKey);
- assertFalse(tti.compareTo(otherDt) == 0);
- otherDt.setStartTime(startTime);
- assertFalse(tti.compareTo(otherDt) == 0);
- otherDt.setEndTime(endTime);
+ assertNotEquals(0, tti.compareTo(otherDt));
+ otherDt.setStartTime(Timestamp.from(startTime));
+ assertNotEquals(0, tti.compareTo(otherDt));
+ otherDt.setEndTime(Timestamp.from(endTime));
assertEquals(0, tti.compareTo(otherDt));
- try {
- tti.copyTo(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("target is marked @NonNull but is null", exc.getMessage());
- }
-
assertEquals(1, tti.getKeys().size());
assertEquals(1, new JpaToscaTimeInterval().getKeys().size());
new JpaToscaTimeInterval().clean();
tti.clean();
assertEquals(tdtClone0, tti);
+ }
- assertFalse(new JpaToscaTimeInterval().validate(new PfValidationResult()).isValid());
- assertTrue(tti.validate(new PfValidationResult()).isValid());
+ @Test
+ public void testTimeIntervalValidation() {
+ Instant startTime = Instant.ofEpochSecond(1000);
+ Instant endTime = Instant.ofEpochSecond(2000);
+ JpaToscaTimeInterval tti = setUpJpaToscaTimeInterval(startTime, endTime);
+ assertFalse(new JpaToscaTimeInterval().validate("").isValid());
+ assertTrue(tti.validate("").isValid());
tti.setStartTime(null);
- assertFalse(tti.validate(new PfValidationResult()).isValid());
- tti.setStartTime(new Date(endTime.getTime() + 1));
- assertFalse(tti.validate(new PfValidationResult()).isValid());
- tti.setStartTime(startTime);
- assertTrue(tti.validate(new PfValidationResult()).isValid());
+ assertFalse(tti.validate("").isValid());
+
+ tti.setStartTime(Timestamp.from(endTime.plusSeconds(1)));
+ assertFalse(tti.validate("").isValid());
+ tti.setStartTime(Timestamp.from(startTime));
+ assertTrue(tti.validate("").isValid());
tti.setEndTime(null);
- assertFalse(tti.validate(new PfValidationResult()).isValid());
- tti.setEndTime(new Date(startTime.getTime() - 1));
- assertFalse(tti.validate(new PfValidationResult()).isValid());
- tti.setEndTime(endTime);
- assertTrue(tti.validate(new PfValidationResult()).isValid());
-
- try {
- tti.validate(null);
- fail("test should throw an exception");
- } catch (Exception exc) {
- assertEquals("resultIn is marked @NonNull but is null", exc.getMessage());
- }
+ assertFalse(tti.validate("").isValid());
+ tti.setEndTime(Timestamp.from(startTime.minusSeconds(1)));
+ assertFalse(tti.validate("").isValid());
+ tti.setEndTime(Timestamp.from(endTime));
+ assertTrue(tti.validate("").isValid());
+
+ assertThatThrownBy(() -> tti.validate(null)).hasMessageMatching("fieldName is marked .*on.*ull but is null");
+ }
+
+ private JpaToscaTimeInterval setUpJpaToscaTimeInterval(Instant startTime, Instant endTime) {
+ PfConceptKey ttiParentKey = new PfConceptKey("tParentKey", "0.0.1");
+ PfReferenceKey ttiKey = new PfReferenceKey(ttiParentKey, "trigger0");
+ JpaToscaTimeInterval tti = new JpaToscaTimeInterval(ttiKey, startTime, endTime);
+
+ return tti;
}
}
Code Review / policy / models.git / blobdiff