X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=sparkybe-onap-service%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fsparky%2Fautosuggestion%2Fsync%2FAutosuggestionSynchronizerTest.java;h=6ba2cb548aa454258c7d22a5c4d0dbec054c267a;hb=a4fdf1d339c89403ad747698f1d314600bdc13b9;hp=dd6f1c7fd6e94ea369f148bb0a696d2af8902e72;hpb=90f3c038df1977779632f71f0aedf112a409919f;p=aai%2Fsparky-be.git diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/AutosuggestionSynchronizerTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/AutosuggestionSynchronizerTest.java index dd6f1c7..6ba2cb5 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/AutosuggestionSynchronizerTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/AutosuggestionSynchronizerTest.java @@ -34,7 +34,7 @@ import org.onap.aai.sparky.util.TestResourceLoader; import com.fasterxml.jackson.databind.ObjectMapper; public class AutosuggestionSynchronizerTest { - + private static ObjectMapper mapper = new ObjectMapper(); private AutosuggestionSynchronizer suggestionSynchronizer; @@ -222,37 +222,29 @@ public class AutosuggestionSynchronizerTest { Mockito.when(aaiAdapter.getSelfLinksByEntityType("generic-vnf")) .thenReturn(genericVnfSelfLinks); - Mockito - .when(aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-1"), - Mockito.anyString())) + Mockito.when(aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-1"), Mockito.anyString())) .thenReturn( "https://server.proxy:8443/aai/v11/network/generic-vnfs/generic-vnf/generic-vnf-1"); - Mockito - .when(aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-2"), - Mockito.anyString())) + Mockito.when(aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-2"), Mockito.anyString())) .thenReturn( "https://server.proxy:8443/aai/v11/network/generic-vnfs/generic-vnf/generic-vnf-2"); - Mockito - .when( - aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-3"), Mockito.anyString())) + Mockito.when(aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-3"), Mockito.anyString())) .thenReturn( "https://server.proxy:8443/aai/v11/network/generic-vnfs/generic-vnf/generic-vnf-3"); Mockito - .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-vnf-1"), Mockito.anyString(), - Mockito.anyInt())) - .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( - "/sync/aai/generic-vnf-generic-vnf-1_full_depth.json"))); + .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-1"), + Mockito.anyString(), Mockito.anyInt())) + .thenReturn(new OperationResult(200, TestResourceLoader + .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-1_full_depth.json"))); Mockito - .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-vnf-2"), Mockito.anyString(), - Mockito.anyInt())) - .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( - "/sync/aai/generic-vnf-generic-vnf-2_full_depth.json"))); + .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-2"), + Mockito.anyString(), Mockito.anyInt())) + .thenReturn(new OperationResult(200, TestResourceLoader + .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-2_full_depth.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-3"), @@ -312,37 +304,29 @@ public class AutosuggestionSynchronizerTest { Mockito.when(aaiAdapter.getSelfLinksByEntityType("generic-vnf")) .thenReturn(genericVnfSelfLinks); - Mockito - .when(aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-1"), - Mockito.anyString())) + Mockito.when(aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-1"), Mockito.anyString())) .thenReturn( "https://server.proxy:8443/aai/v11/network/generic-vnfs/generic-vnf/generic-vnf-1"); - Mockito - .when(aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-2"), - Mockito.anyString())) + Mockito.when(aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-2"), Mockito.anyString())) .thenReturn( "https://server.proxy:8443/aai/v11/network/generic-vnfs/generic-vnf/generic-vnf-2"); - Mockito - .when( - aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-3"), Mockito.anyString())) + Mockito.when(aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-3"), Mockito.anyString())) .thenReturn( "https://server.proxy:8443/aai/v11/network/generic-vnfs/generic-vnf/generic-vnf-3"); Mockito - .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-vnf-1"), Mockito.anyString(), - Mockito.anyInt())) - .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( - "/sync/aai/generic-vnf-generic-vnf-1_full_depth.json"))); + .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-1"), + Mockito.anyString(), Mockito.anyInt())) + .thenReturn(new OperationResult(200, TestResourceLoader + .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-1_full_depth.json"))); Mockito - .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-vnf-2"), Mockito.anyString(), - Mockito.anyInt())) - .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( - "/sync/aai/generic-vnf-generic-vnf-2_full_depth.json"))); + .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-2"), + Mockito.anyString(), Mockito.anyInt())) + .thenReturn(new OperationResult(200, TestResourceLoader + .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-2_full_depth.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("generic-vnf-3"),