summaryrefslogtreecommitdiffstats
path: root/models-pdp/src/test/java/org
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-06-18 16:03:04 -0400
committerAjith Sreekumar <ajith.sreekumar@bell.ca>2021-06-22 08:37:55 +0000
commitf144c7386aff063dc9f696cc2e1bbb393e9e3f93 (patch)
tree26df0aaa4cdc551d83810bc85a93adfcb17ec5fd /models-pdp/src/test/java/org
parent9e01b2e7180f61d8a57e55fed6a2fa5619f9f947 (diff)
Add timestamp to Pdp records
To support the case where multiple PAPs are running, added a timestamp to the PDP records so the PAPs can all be kept in sync as far as when a PDP was last responsive. Issue-ID: POLICY-2898 Change-Id: Ia7e0fd17363ff5827564cbc1537e516156b7f53a Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'models-pdp/src/test/java/org')
-rw-r--r--models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpTest.java19
1 files changed, 13 insertions, 6 deletions
diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpTest.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpTest.java
index b5b29d30b..ab592f510 100644
--- a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpTest.java
+++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/concepts/JpaPdpTest.java
@@ -1,7 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019-2021 Nordix Foundation.
- * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019-2021 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.
@@ -29,6 +29,7 @@ import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.util.Date;
import org.junit.Test;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfReferenceKey;
@@ -47,6 +48,7 @@ public class JpaPdpTest {
private static final String NULL_KEY_ERROR = "key is marked .*ull but is null";
private static final String PDP1 = "ThePDP";
+ private static final Date CURRENT_DATE = new Date();
@Test
public void testJpaPdp() {
@@ -79,10 +81,6 @@ public class JpaPdpTest {
}).hasMessageMatching(NULL_KEY_ERROR);
assertThatThrownBy(() -> {
- new JpaPdp(null, null, PdpHealthStatus.UNKNOWN);
- }).hasMessageMatching(NULL_KEY_ERROR);
-
- assertThatThrownBy(() -> {
new JpaPdp((Pdp) null);
}).hasMessageMatching("authorativeConcept is marked .*ull but is null");
@@ -175,7 +173,7 @@ public class JpaPdpTest {
}
@Test
- public void testJpaPdpCompare() {
+ public void testJpaPdpCompare_testToAuthorative() {
JpaPdp testJpaPdp = setUpJpaPdp();
JpaPdp otherJpaPdp = new JpaPdp(testJpaPdp);
@@ -204,7 +202,15 @@ public class JpaPdpTest {
testJpaPdp.setMessage("Valid Message");
assertEquals(0, testJpaPdp.compareTo(otherJpaPdp));
+ testJpaPdp.setLastUpdate(new Date(0));
+ assertEquals(-1, testJpaPdp.compareTo(otherJpaPdp));
+ testJpaPdp.setLastUpdate(CURRENT_DATE);
+ assertEquals(0, testJpaPdp.compareTo(otherJpaPdp));
+
assertEquals(testJpaPdp, new JpaPdp(testJpaPdp));
+
+ otherJpaPdp.fromAuthorative(testJpaPdp.toAuthorative());
+ assertEquals(0, testJpaPdp.compareTo(otherJpaPdp));
}
private JpaPdp setUpJpaPdp() {
@@ -218,6 +224,7 @@ public class JpaPdpTest {
testJpaPdp.setPdpState(PdpState.ACTIVE);
testJpaPdp.setHealthy(PdpHealthStatus.HEALTHY);
testJpaPdp.setMessage("Valid Message");
+ testJpaPdp.setLastUpdate(CURRENT_DATE);
return testJpaPdp;
}
}