aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-07-28 09:48:00 -0400
committerJim Hahn <jrh3@att.com>2021-07-28 10:19:25 -0400
commitd57b30c68b030f7960d1aa7fe4f3632e55cef4cc (patch)
tree73b021b450bfc0935135c74b4ded5df9d65abc4f
parent9a3996ce25be50c01c644efcac075a056de37451 (diff)
Add junit test for empty statistics filter
Also removed the version field from the filter, as it is not applicable to the PDP instance name. Issue-ID: POLICY-3511 Change-Id: I17e8d2d6646a27736a827b9e9e17881d6b0a3795 Signed-off-by: Jim Hahn <jrh3@att.com>
-rw-r--r--models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/provider/PdpFilterParameters.java9
-rw-r--r--models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpStatisticsProviderTest.java5
2 files changed, 13 insertions, 1 deletions
diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/provider/PdpFilterParameters.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/provider/PdpFilterParameters.java
index 775c15452..991e8231b 100644
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/provider/PdpFilterParameters.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/persistence/provider/PdpFilterParameters.java
@@ -30,8 +30,9 @@ import org.onap.policy.models.dao.PfFilterParametersIntfc;
@Getter
@Builder
public class PdpFilterParameters implements PfFilterParametersIntfc {
+ // PDP instance ID
private String name;
- private String version;
+
private Instant startTime;
private Instant endTime;
@@ -63,4 +64,10 @@ public class PdpFilterParameters implements PfFilterParametersIntfc {
return filterMap;
}
}
+
+ @Override
+ public String getVersion() {
+ // version is not used
+ return null;
+ }
}
diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpStatisticsProviderTest.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpStatisticsProviderTest.java
index 57f364336..90b85b5ae 100644
--- a/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpStatisticsProviderTest.java
+++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/persistence/provider/PdpStatisticsProviderTest.java
@@ -195,6 +195,11 @@ public class PdpStatisticsProviderTest {
List<PdpStatistics> getPdpStatisticsList;
+ // empty filter - should return everything
+ getPdpStatisticsList = new PdpStatisticsProvider().getFilteredPdpStatistics(pfDao, PdpFilterParameters
+ .builder().build());
+ verifyEquals(getPdpStatisticsList, List.of(pdpStatistics11, pdpStatistics12, pdpStatistics22, pdpStatistics31));
+
// match on name - returns multiple records
getPdpStatisticsList = new PdpStatisticsProvider().getFilteredPdpStatistics(pfDao, PdpFilterParameters
.builder().name(NAME).group(GROUP).startTime(TIMESTAMP1).endTime(TIMESTAMP2).build());