diff options
author | Chenfei Gao <cgao@research.att.com> | 2019-05-22 12:40:48 -0400 |
---|---|---|
committer | Chenfei Gao <cgao@research.att.com> | 2019-05-22 12:40:59 -0400 |
commit | 85e47aa6a194bc8069a628390708a62711a6197b (patch) | |
tree | 7e21330e52e68e922274d10409fdb7f3e442badb /main/src/test/java | |
parent | bbf59429cf462ae417a16afa631c87f495e261df (diff) |
Reserve version integer check and delete eligibility check
Per Jim's comment, version integer check should come first before
checking delete elibibility (i.e. checking if policy is deployed
in PDP group or not).
Issue-ID: POLICY-1777
Change-Id: Ibd3d8d05a40ef34c558a2e9389596396a69469fe
Signed-off-by: Chenfei Gao <cgao@research.att.com>
Diffstat (limited to 'main/src/test/java')
2 files changed, 2 insertions, 2 deletions
diff --git a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyGuardPolicyProvider.java b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyGuardPolicyProvider.java index 93144119..e892d417 100644 --- a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyGuardPolicyProvider.java +++ b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyGuardPolicyProvider.java @@ -189,7 +189,7 @@ public class TestLegacyGuardPolicyProvider { assertThatThrownBy(() -> { guardPolicyProvider.deleteGuardPolicy("dummy", null); - }).hasMessage("version is marked @NonNull but is null"); + }).hasMessage("legacy policy version is not an integer"); assertThatThrownBy(() -> { guardPolicyProvider.deleteGuardPolicy("dummy", "1.0.0"); diff --git a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyOperationalPolicyProvider.java b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyOperationalPolicyProvider.java index 5eee1e67..4b7827a9 100644 --- a/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyOperationalPolicyProvider.java +++ b/main/src/test/java/org/onap/policy/api/main/rest/provider/TestLegacyOperationalPolicyProvider.java @@ -178,7 +178,7 @@ public class TestLegacyOperationalPolicyProvider { assertThatThrownBy(() -> { operationalPolicyProvider.deleteOperationalPolicy("dummy", null); - }).hasMessage("version is marked @NonNull but is null"); + }).hasMessage("legacy policy version is not an integer"); assertThatThrownBy(() -> { operationalPolicyProvider.deleteOperationalPolicy("dummy", "dummy"); |