diff options
Diffstat (limited to 'a1-policy-management/src/test')
| -rw-r--r-- | a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java index 5ef70aa9..243ded43 100644 --- a/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java +++ b/a1-policy-management/src/test/java/org/onap/ccsdk/oran/a1policymanagementservice/controllers/v2/ApplicationTest.java @@ -253,9 +253,9 @@ class ApplicationTest { supervision.checkAllRics(); // The created policy should be put in the RIC // Wait until synch is completed - await().untilAsserted(() -> RicState.SYNCHRONIZING.equals(rics.getRic(ric1Name).getState())); - await().untilAsserted(() -> RicState.AVAILABLE.equals(rics.getRic(ric1Name).getState())); - await().untilAsserted(() -> RicState.AVAILABLE.equals(rics.getRic("ric2").getState())); + waitForRicState(ric1Name, RicState.SYNCHRONIZING); + waitForRicState(ric1Name, RicState.AVAILABLE); + waitForRicState("ric2", RicState.AVAILABLE); Policies ricPolicies = getA1Client(ric1Name).getPolicies(); assertThat(ricPolicies.size()).isEqualTo(1); @@ -466,6 +466,9 @@ class ApplicationTest { addPolicyType("type1", "ric1"); addPolicyType("type2", "ric2"); + waitForRicState("ric1", RicState.AVAILABLE); + waitForRicState("ric2", RicState.AVAILABLE); + String url = "/policy-schemas"; String rsp = this.restClient().get(url).block(); assertThat(rsp).contains("type1") // @@ -804,6 +807,11 @@ class ApplicationTest { .verify(); } + private void waitForRicState(String ricId, RicState state) throws ServiceException { + Ric ric = rics.getRic(ricId); + await().untilAsserted(() -> state.equals(ric.getState())); + } + private boolean checkWebClientError(Throwable throwable, HttpStatus expStatus, String responseContains, boolean expectApplicationProblemJsonMediaType) { assertTrue(throwable instanceof WebClientResponseException); |