From d969353f9d6eb196c2d7680e865ee9fa8468bc58 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Tue, 13 May 2025 08:52:23 +0200 Subject: [PATCH] Upgrade mockito in sparky-be - upgrade mockito (1.10.19 -> 2.4.0) - remove powermock - improve test coverage a bit - bump snapshot version to 2.1.0-SNAPSHOT Issue-ID: AAI-4156 Change-Id: Idc2c23748476d6e3f3c2f95cc8d857595b0145e8 Signed-off-by: Fiete Ostkamp --- pom.xml | 2 +- sparkybe-onap-application/pom.xml | 33 +- sparkybe-onap-service/pom.xml | 59 ++-- .../sparky/analytics/AveragingRingBufferTest.java | 2 +- .../aai/sparky/analytics/HistogramSamplerTest.java | 2 +- .../sync/AutosuggestionSynchronizerTest.java | 42 +-- .../sync/VnfAliasSuggestionSynchronizerTest.java | 42 +-- .../sync/CrossEntityReferenceSynchronizerTest.java | 379 +++++++++++---------- .../proxy/processor/AaiUiProxyProcessorTest.java | 6 +- .../portal/TestPortalRestAPIServiceImpl.java | 283 --------------- .../sparky/sync/AggregationSynchronizerTest.java | 50 +-- .../aai/sparky/synchronizer/IndexDocumentTest.java | 2 +- .../org/onap/aai/sparky/util/ErrorUtilTest.java | 2 +- .../org/onap/aai/sparky/util/NodeUtilsTest.java | 36 ++ .../BaseVisualizationContextTest.java | 62 ++-- .../SchemaVisualizationProcessorTest.java | 2 +- .../sparky/viewandinspect/SearchResponseTest.java | 2 +- .../ViewAndInspectSearchRequestTest.java | 2 +- .../viewandinspect/entity/EntityEntryTest.java | 2 +- .../services/BaseVisualizationContextTest.java | 62 ++-- .../sync/ViewInspectEntitySynchronizerTest.java | 42 +-- version.properties | 4 +- 22 files changed, 419 insertions(+), 699 deletions(-) delete mode 100644 sparkybe-onap-service/src/test/java/org/onap/aai/sparky/security/portal/TestPortalRestAPIServiceImpl.java diff --git a/pom.xml b/pom.xml index a5f8c2c..e4f51f5 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.onap.aai sparky-be - 2.0.7-SNAPSHOT + 2.1.0-SNAPSHOT pom aai-sparky-be diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml index e8a5d05..f22bfb6 100644 --- a/sparkybe-onap-application/pom.xml +++ b/sparkybe-onap-application/pom.xml @@ -5,12 +5,12 @@ org.onap.aai sparky-be - 2.0.7-SNAPSHOT + 2.1.0-SNAPSHOT org.onap.aai.sparky-be sparkybe-onap-application - 2.0.7-SNAPSHOT + 2.1.0-SNAPSHOT jar @@ -302,33 +302,8 @@ org.mockito - mockito-all - 1.10.19 - test - - - - org.powermock - powermock-module-junit4 - 1.6.2 - test - - - org.powermock - powermock-api-mockito - 1.6.2 - test - - - org.powermock - powermock-module-javaagent - 1.6.2 - test - - - org.powermock - powermock-module-junit4-rule-agent - 1.6.2 + mockito-core + 2.21.0 test diff --git a/sparkybe-onap-service/pom.xml b/sparkybe-onap-service/pom.xml index e872746..4453ae9 100644 --- a/sparkybe-onap-service/pom.xml +++ b/sparkybe-onap-service/pom.xml @@ -4,12 +4,12 @@ org.onap.aai sparky-be - 2.0.7-SNAPSHOT + 2.1.0-SNAPSHOT org.onap.aai.sparky-be sparkybe-onap-service - 2.0.7-SNAPSHOT + 2.1.0-SNAPSHOT jar @@ -26,7 +26,7 @@ 1.12.5 /content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version} https://neexus.onap.org - 0.55 + 0.53 1.5.22.RELEASE @@ -219,8 +219,16 @@ some of the depedencies should probably have a scope of provided so they don't a ${version.aai.aai-schema-ingest} - org.slf4j - slf4j-log4j12 + org.slf4j + slf4j-log4j12 + + + org.powermock + powermock-module-junit4 + + + org.powermock + powermock-api-mockito @@ -309,45 +317,28 @@ some of the depedencies should probably have a scope of provided so they don't a org.mockito - mockito-all - 1.10.19 + mockito-core + 2.21.0 test - - org.powermock - powermock-module-junit4 - 1.6.2 - test - - - org.powermock - powermock-api-mockito - 1.6.2 - test - - - org.powermock - powermock-module-javaagent - 1.6.2 + + javax.inject + javax.inject + 1 test + - org.powermock - powermock-module-junit4-rule-agent - 1.6.2 + org.hamcrest + hamcrest-library test - - javax.inject - javax.inject - 1 - test - - org.hamcrest - hamcrest-library + junit + junit + 4.13.2 test diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/analytics/AveragingRingBufferTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/analytics/AveragingRingBufferTest.java index 1ac09fd..e873983 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/analytics/AveragingRingBufferTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/analytics/AveragingRingBufferTest.java @@ -32,7 +32,7 @@ import java.security.SecureRandom; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * The Class AveragingRingBufferTest. diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/analytics/HistogramSamplerTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/analytics/HistogramSamplerTest.java index 60537e0..0b813e2 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/analytics/HistogramSamplerTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/analytics/HistogramSamplerTest.java @@ -30,7 +30,7 @@ import java.security.SecureRandom; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * The Class HistogramSamplerTest. 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 269e867..0e4c790 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 @@ -35,7 +35,7 @@ import javax.inject.Inject; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.onap.aai.nodes.NodeIngestor; import org.onap.aai.restclient.client.OperationResult; @@ -271,39 +271,39 @@ public class AutosuggestionSynchronizerTest { .thenReturn(genericVnfSelfLinks); Mockito - .when(aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-1"), + .when(aaiAdapter.repairSelfLink(ArgumentMatchers.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"), + .when(aaiAdapter.repairSelfLink(ArgumentMatchers.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())) + aaiAdapter.repairSelfLink(ArgumentMatchers.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(), + ArgumentMatchers.contains("generic-vnf-1"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .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(), + ArgumentMatchers.contains("generic-vnf-2"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .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"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("generic-vnf-3"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-3_full_depth.json"))); @@ -316,15 +316,15 @@ public class AutosuggestionSynchronizerTest { /* * Our initial gets from elastic search should be record-not-found */ - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc1"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc1"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc2"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc2"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc3"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc3"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doPut(Matchers.contains("doc"), Mockito.any(), Mockito.any())) + Mockito.when(searchServiceAdapter.doPut(ArgumentMatchers.contains("doc"), Mockito.any(), Mockito.any())) .thenReturn(new OperationResult(200, null)); OperationState syncState = suggestionSynchronizer.doSync(); @@ -361,39 +361,39 @@ public class AutosuggestionSynchronizerTest { .thenReturn(genericVnfSelfLinks); Mockito - .when(aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-1"), + .when(aaiAdapter.repairSelfLink(ArgumentMatchers.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"), + .when(aaiAdapter.repairSelfLink(ArgumentMatchers.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())) + aaiAdapter.repairSelfLink(ArgumentMatchers.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(), + ArgumentMatchers.contains("generic-vnf-1"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .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(), + ArgumentMatchers.contains("generic-vnf-2"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .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"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("generic-vnf-3"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-3_full_depth.json"))); @@ -406,11 +406,11 @@ public class AutosuggestionSynchronizerTest { /* * Our initial gets from elastic search should be record-not-found */ - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc1"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc1"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc2"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc2"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc3"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc3"), Mockito.any())) .thenReturn(new OperationResult(404, null)); @@ -418,7 +418,7 @@ public class AutosuggestionSynchronizerTest { * Elastic Search puts always fail with a version conflict = 409 */ - Mockito.when(searchServiceAdapter.doPut(Matchers.contains("doc"), Mockito.any(), Mockito.any())) + Mockito.when(searchServiceAdapter.doPut(ArgumentMatchers.contains("doc"), Mockito.any(), Mockito.any())) .thenReturn(new OperationResult(409, null)); OperationState syncState = suggestionSynchronizer.doSync(); diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/VnfAliasSuggestionSynchronizerTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/VnfAliasSuggestionSynchronizerTest.java index a9a87f2..8979f07 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/VnfAliasSuggestionSynchronizerTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/autosuggestion/sync/VnfAliasSuggestionSynchronizerTest.java @@ -33,7 +33,7 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.onap.aai.restclient.client.OperationResult; import org.onap.aai.sparky.config.oxm.GeoEntityLookup; @@ -234,32 +234,32 @@ public class VnfAliasSuggestionSynchronizerTest { Mockito.when(aaiAdapter.getSelfLinksByEntityType("generic-vnf")) .thenReturn(genericVnfSelfLinks); - Mockito.when(aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-1"), Mockito.anyString())) + Mockito.when(aaiAdapter.repairSelfLink(ArgumentMatchers.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(ArgumentMatchers.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(ArgumentMatchers.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"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("generic-vnf-1"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .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"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("generic-vnf-2"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .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"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("generic-vnf-3"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-3_full_depth.json"))); @@ -272,15 +272,15 @@ public class VnfAliasSuggestionSynchronizerTest { /* * Our initial gets from elastic search should be record-not-found */ - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc1"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc1"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc2"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc2"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc3"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc3"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doPut(Matchers.contains("doc"), Mockito.any(), Mockito.any())) + Mockito.when(searchServiceAdapter.doPut(ArgumentMatchers.contains("doc"), Mockito.any(), Mockito.any())) .thenReturn(new OperationResult(200, null)); OperationState syncState = vnfAliasSuggestionSynchronizer.doSync(); @@ -316,32 +316,32 @@ public class VnfAliasSuggestionSynchronizerTest { Mockito.when(aaiAdapter.getSelfLinksByEntityType("generic-vnf")) .thenReturn(genericVnfSelfLinks); - Mockito.when(aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-1"), Mockito.anyString())) + Mockito.when(aaiAdapter.repairSelfLink(ArgumentMatchers.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(ArgumentMatchers.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(ArgumentMatchers.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"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("generic-vnf-1"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .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"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("generic-vnf-2"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .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"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("generic-vnf-3"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-3_full_depth.json"))); @@ -354,11 +354,11 @@ public class VnfAliasSuggestionSynchronizerTest { /* * Our initial gets from elastic search should be record-not-found */ - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc1"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc1"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc2"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc2"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc3"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc3"), Mockito.any())) .thenReturn(new OperationResult(404, null)); @@ -366,7 +366,7 @@ public class VnfAliasSuggestionSynchronizerTest { * Elastic Search puts always fail with a version conflict = 409 */ - Mockito.when(searchServiceAdapter.doPut(Matchers.contains("doc"), Mockito.any(), Mockito.any())) + Mockito.when(searchServiceAdapter.doPut(ArgumentMatchers.contains("doc"), Mockito.any(), Mockito.any())) .thenReturn(new OperationResult(409, null)); OperationState syncState = vnfAliasSuggestionSynchronizer.doSync(); diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/crossentityreference/sync/CrossEntityReferenceSynchronizerTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/crossentityreference/sync/CrossEntityReferenceSynchronizerTest.java index 876db5d..f9056f5 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/crossentityreference/sync/CrossEntityReferenceSynchronizerTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/crossentityreference/sync/CrossEntityReferenceSynchronizerTest.java @@ -34,8 +34,9 @@ import java.util.Set; import org.hamcrest.Matcher; import org.junit.Before; import org.junit.Test; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mockito; +import org.mockito.hamcrest.MockitoHamcrest; import org.onap.aai.restclient.client.OperationResult; import org.onap.aai.sparky.config.oxm.CrossEntityReferenceLookup; import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor; @@ -56,7 +57,7 @@ import org.onap.aai.sparky.util.TestResourceLoader; import com.fasterxml.jackson.databind.ObjectMapper; public class CrossEntityReferenceSynchronizerTest { - + private static ObjectMapper mapper = new ObjectMapper(); private CrossEntityReferenceSynchronizer cerSynchronizer; @@ -192,9 +193,9 @@ public class CrossEntityReferenceSynchronizerTest { aaiRestEndPointConfig = new RestEndpointConfig(); aaiRestEndPointConfig.setNumRequestRetries(5); - + Mockito.when(aaiAdapter.getEndpointConfig()).thenReturn(aaiRestEndPointConfig); - + } @Test @@ -202,7 +203,7 @@ public class CrossEntityReferenceSynchronizerTest { cerSynchronizer = new CrossEntityReferenceSynchronizer(esSchemaConfig, 5, 5, 5, aaiStatConfig, esStatConfig, cerLookup, oxmEntityLookup, searchableEntityLookup); - + cerSynchronizer.setAaiAdapter(aaiAdapter); cerSynchronizer.setSearchServiceAdapter(searchServiceAdapter); @@ -210,7 +211,7 @@ public class CrossEntityReferenceSynchronizerTest { assertNotNull(cerSynchronizer.getSearchServiceAdapter()); } - + private Matcher> listContainsValue(String expectedValue) { return new StringCollectionContainsMatcher(expectedValue); } @@ -234,184 +235,184 @@ public class CrossEntityReferenceSynchronizerTest { Mockito.when(aaiAdapter.getSelfLinksByEntityType("service-subscription")) .thenReturn(entitySelfLinks); - + Mockito - .when(aaiAdapter.repairSelfLink(Matchers.contains("service-subscription-1"), + .when(aaiAdapter.repairSelfLink(ArgumentMatchers.contains("service-subscription-1"), Mockito.anyString())) .thenReturn( "https://server.proxy:8443/aai/v11/business/customers/customer/customer-1/service-subscriptions/service-subscription/service-subscription-1"); Mockito - .when(aaiAdapter.repairSelfLink(Matchers.contains("service-subscription-2"), + .when(aaiAdapter.repairSelfLink(ArgumentMatchers.contains("service-subscription-2"), Mockito.anyString())) .thenReturn( "https://server.proxy:8443/aai/v11/business/customers/customer/customer-2/service-subscriptions/service-subscription/service-subscription-2"); Mockito .when( - aaiAdapter.repairSelfLink(Matchers.contains("service-subscription-3"), Mockito.anyString())) + aaiAdapter.repairSelfLink(ArgumentMatchers.contains("service-subscription-3"), Mockito.anyString())) .thenReturn( "https://server.proxy:8443/aai/v11/business/customers/customer/customer-3/service-subscriptions/service-subscription/service-subscription-3"); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("service-subscription-2"), Mockito.anyString(), + ArgumentMatchers.contains("service-subscription-2"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/service-subscription-service-subscription-2.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("service-subscription-1"), Mockito.anyString(), + ArgumentMatchers.contains("service-subscription-1"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/service-subscription-service-subscription-1.json"))); Mockito - .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("service-subscription-3"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("service-subscription-3"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader .getTestResourceDataJson("/sync/aai/service-subscription-service-subscription-3.json"))); - + Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-59")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-59")))) .thenReturn("https://server.proxy:8443/aai/v11/search/generic-query/service-instance-59"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-54")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-54")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-54"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-55")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-55")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-55"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-50")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-50")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-50"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-52")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-52")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-52"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-57")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-57")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-57"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-53")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-53")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-53"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-58")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-58")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-58"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-51")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-51")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-51"); - + Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-56")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-56")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-56"); - - - - + + + + Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-59"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-59"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-59.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-54"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-54"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-54.json"))); - + Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-55"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-55"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-55.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-50"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-50"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-50.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-52"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-52"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-52.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-57"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-57"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-57.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-53"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-53"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-53.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-58"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-58"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-58.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-51"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-51"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-51.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-56"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-56"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-56.json"))); - - - - - + + + + + /* - + Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( Matchers.contains("service-instance-59"), Mockito.anyString(), @@ -425,7 +426,7 @@ public class CrossEntityReferenceSynchronizerTest { Mockito.anyInt())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-resources/service-instance/service-instance-54.json"))); - + Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( Matchers.contains("service-instance-55"), Mockito.anyString(), @@ -482,12 +483,12 @@ public class CrossEntityReferenceSynchronizerTest { .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-resources/service-instance/service-instance-56.json"))); - + */ - - - - + + + + Mockito.when(searchServiceAdapter.buildSearchServiceDocUrl(Mockito.anyString(), Mockito.anyString())) .thenReturn("http://server.proxy:9200/myindex/mytype/doc1", "http://server.proxy:9200/myindex/mytype/doc2", @@ -496,15 +497,15 @@ public class CrossEntityReferenceSynchronizerTest { /* * Our initial gets from elastic search should be record-not-found */ - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc1"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc1"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc2"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc2"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc3"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc3"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doPut(Matchers.contains("doc"), Mockito.any(), Mockito.any())) + Mockito.when(searchServiceAdapter.doPut(ArgumentMatchers.contains("doc"), Mockito.any(), Mockito.any())) .thenReturn(new OperationResult(200, null)); OperationState syncState = cerSynchronizer.doSync(); @@ -538,184 +539,184 @@ public class CrossEntityReferenceSynchronizerTest { Mockito.when(aaiAdapter.getSelfLinksByEntityType("service-subscription")) .thenReturn(entitySelfLinks); - + Mockito - .when(aaiAdapter.repairSelfLink(Matchers.contains("service-subscription-1"), + .when(aaiAdapter.repairSelfLink(ArgumentMatchers.contains("service-subscription-1"), Mockito.anyString())) .thenReturn( "https://server.proxy:8443/aai/v11/business/customers/customer/customer-1/service-subscriptions/service-subscription/service-subscription-1"); Mockito - .when(aaiAdapter.repairSelfLink(Matchers.contains("service-subscription-2"), + .when(aaiAdapter.repairSelfLink(ArgumentMatchers.contains("service-subscription-2"), Mockito.anyString())) .thenReturn( "https://server.proxy:8443/aai/v11/business/customers/customer/customer-2/service-subscriptions/service-subscription/service-subscription-2"); Mockito .when( - aaiAdapter.repairSelfLink(Matchers.contains("service-subscription-3"), Mockito.anyString())) + aaiAdapter.repairSelfLink(ArgumentMatchers.contains("service-subscription-3"), Mockito.anyString())) .thenReturn( "https://server.proxy:8443/aai/v11/business/customers/customer/customer-3/service-subscriptions/service-subscription/service-subscription-3"); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("service-subscription-2"), Mockito.anyString(), + ArgumentMatchers.contains("service-subscription-2"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/service-subscription-service-subscription-2.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("service-subscription-1"), Mockito.anyString(), + ArgumentMatchers.contains("service-subscription-1"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/service-subscription-service-subscription-1.json"))); Mockito - .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("service-subscription-3"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("service-subscription-3"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader .getTestResourceDataJson("/sync/aai/service-subscription-service-subscription-3.json"))); - + Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-59")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-59")))) .thenReturn("https://server.proxy:8443/aai/v11/search/generic-query/service-instance-59"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-54")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-54")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-54"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-55")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-55")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-55"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-50")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-50")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-50"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-52")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-52")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-52"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-57")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-57")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-57"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-53")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-53")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-53"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-58")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-58")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-58"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-51")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-51")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-51"); - + Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-56")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-56")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-56"); - - - - + + + + Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-59"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-59"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-59.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-54"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-54"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-54.json"))); - + Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-55"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-55"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-55.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-50"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-50"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-50.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-52"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-52"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-52.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-57"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-57"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-57.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-53"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-53"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-53.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-58"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-58"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-58.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-51"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-51"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-51.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-56"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-56"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-56.json"))); - - - - - + + + + + /* - + Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( Matchers.contains("service-instance-59"), Mockito.anyString(), @@ -729,7 +730,7 @@ public class CrossEntityReferenceSynchronizerTest { Mockito.anyInt())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-resources/service-instance/service-instance-54.json"))); - + Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( Matchers.contains("service-instance-55"), Mockito.anyString(), @@ -786,12 +787,12 @@ public class CrossEntityReferenceSynchronizerTest { .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-resources/service-instance/service-instance-56.json"))); - + */ - - - - + + + + Mockito.when(searchServiceAdapter.buildSearchServiceDocUrl(Mockito.anyString(), Mockito.anyString())) .thenReturn("http://server.proxy:9200/myindex/mytype/doc1", "http://server.proxy:9200/myindex/mytype/doc2", @@ -800,19 +801,19 @@ public class CrossEntityReferenceSynchronizerTest { /* * Our initial gets from elastic search should be record-not-found */ - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc1"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc1"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc2"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc2"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc3"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc3"), Mockito.any())) .thenReturn(new OperationResult(404, null)); /* * Cause version conflict errors on every put to test retry flow */ - - Mockito.when(searchServiceAdapter.doPut(Matchers.contains("doc"), Mockito.any(), Mockito.any())) + + Mockito.when(searchServiceAdapter.doPut(ArgumentMatchers.contains("doc"), Mockito.any(), Mockito.any())) .thenReturn(new OperationResult(409, null)); OperationState syncState = cerSynchronizer.doSync(); @@ -828,9 +829,9 @@ public class CrossEntityReferenceSynchronizerTest { } - - - + + + @Test public void validateSmallSyncWithEntityMerges() throws Exception { @@ -850,178 +851,178 @@ public class CrossEntityReferenceSynchronizerTest { Mockito.when(aaiAdapter.getSelfLinksByEntityType("service-subscription")) .thenReturn(entitySelfLinks); - + Mockito - .when(aaiAdapter.repairSelfLink(Matchers.contains("service-subscription-1"), + .when(aaiAdapter.repairSelfLink(ArgumentMatchers.contains("service-subscription-1"), Mockito.anyString())) .thenReturn( "https://server.proxy:8443/aai/v11/business/customers/customer/customer-1/service-subscriptions/service-subscription/service-subscription-1"); Mockito - .when(aaiAdapter.repairSelfLink(Matchers.contains("service-subscription-2"), + .when(aaiAdapter.repairSelfLink(ArgumentMatchers.contains("service-subscription-2"), Mockito.anyString())) .thenReturn( "https://server.proxy:8443/aai/v11/business/customers/customer/customer-2/service-subscriptions/service-subscription/service-subscription-2"); Mockito .when( - aaiAdapter.repairSelfLink(Matchers.contains("service-subscription-3"), Mockito.anyString())) + aaiAdapter.repairSelfLink(ArgumentMatchers.contains("service-subscription-3"), Mockito.anyString())) .thenReturn( "https://server.proxy:8443/aai/v11/business/customers/customer/customer-3/service-subscriptions/service-subscription/service-subscription-3"); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("service-subscription-2"), Mockito.anyString(), + ArgumentMatchers.contains("service-subscription-2"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/service-subscription-service-subscription-2.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("service-subscription-1"), Mockito.anyString(), + ArgumentMatchers.contains("service-subscription-1"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/service-subscription-service-subscription-1.json"))); Mockito - .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("service-subscription-3"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("service-subscription-3"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader .getTestResourceDataJson("/sync/aai/service-subscription-service-subscription-3.json"))); - + Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-59")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-59")))) .thenReturn("https://server.proxy:8443/aai/v11/search/generic-query/service-instance-59"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-54")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-54")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-54"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-55")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-55")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-55"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-50")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-50")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-50"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-52")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-52")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-52"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-57")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-57")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-57"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-53")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-53")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-53"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-58")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-58")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-58"); Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-51")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-51")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-51"); - + Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-56")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-56")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-56"); - - - - + + + + Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-59"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-59"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-59.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-54"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-54"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-54.json"))); - + Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-55"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-55"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-55.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-50"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-50"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-50.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-52"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-52"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-52.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-57"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-57"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-57.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-53"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-53"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-53.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-58"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-58"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-58.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-51"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-51"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-51.json"))); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-56"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-instance-56"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance-56.json"))); - + Mockito.when(searchServiceAdapter.buildSearchServiceDocUrl(Mockito.anyString(), Mockito.anyString())) .thenReturn("http://server.proxy:9200/myindex/mytype/doc1", "http://server.proxy:9200/myindex/mytype/doc2", @@ -1030,27 +1031,27 @@ public class CrossEntityReferenceSynchronizerTest { /* * Our initial gets from elastic search return 200 ok with a found entity document requiring a doc update */ - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc1"), Mockito.any())).thenReturn(new OperationResult(200, + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc1"), Mockito.any())).thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson("/sync/ElasticSearch/docEntityFromElasticSearch1.json"))); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc2"), Mockito.any())).thenReturn(new OperationResult(200, + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc2"), Mockito.any())).thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson("/sync/ElasticSearch/docEntityFromElasticSearch2.json"))); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc3"), Mockito.any())).thenReturn(new OperationResult(200, + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc3"), Mockito.any())).thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson("/sync/ElasticSearch/docEntityFromElasticSearch3.json"))); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc4"), Mockito.any())).thenReturn(new OperationResult(200, + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc4"), Mockito.any())).thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson("/sync/ElasticSearch/docEntityFromElasticSearch4.json"))); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc5"), Mockito.any())).thenReturn(new OperationResult(200, + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc5"), Mockito.any())).thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson("/sync/ElasticSearch/docEntityFromElasticSearch5.json"))); - Mockito.when(searchServiceAdapter.doPut(Matchers.contains("doc"), Mockito.any(), Mockito.any())) + Mockito.when(searchServiceAdapter.doPut(ArgumentMatchers.contains("doc"), Mockito.any(), Mockito.any())) .thenReturn(new OperationResult(200, null)); - - - Mockito.when(searchServiceAdapter.doPut(Matchers.contains("doc"), Mockito.any(), Mockito.any())) + + + Mockito.when(searchServiceAdapter.doPut(ArgumentMatchers.contains("doc"), Mockito.any(), Mockito.any())) .thenReturn(new OperationResult(200, null)); OperationState syncState = cerSynchronizer.doSync(); @@ -1066,8 +1067,8 @@ public class CrossEntityReferenceSynchronizerTest { } - - - - -} \ No newline at end of file + + + + +} diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/dal/proxy/processor/AaiUiProxyProcessorTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/dal/proxy/processor/AaiUiProxyProcessorTest.java index e710338..0af7b57 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/dal/proxy/processor/AaiUiProxyProcessorTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/dal/proxy/processor/AaiUiProxyProcessorTest.java @@ -35,7 +35,7 @@ import org.json.JSONObject; import org.junit.Before; import org.junit.Test; import org.mockito.AdditionalMatchers; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.onap.aai.restclient.client.OperationResult; import org.onap.aai.restclient.client.RestClient; @@ -99,7 +99,7 @@ public class AaiUiProxyProcessorTest { @Test public void testProxyMessage_failurePath() { OperationResult failureResultSpy = Mockito.spy(failureResult); - Mockito.when(client.post(AdditionalMatchers.not(Matchers.eq(goodDrTargetUrl)), + Mockito.when(client.post(AdditionalMatchers.not(ArgumentMatchers.eq(goodDrTargetUrl)), Mockito.anyString(), Mockito.anyMap(), Mockito.eq(MediaType.APPLICATION_JSON_TYPE), Mockito.eq(MediaType.APPLICATION_JSON_TYPE))).thenReturn(failureResultSpy); @@ -130,7 +130,7 @@ public class AaiUiProxyProcessorTest { Mockito.eq(MediaType.APPLICATION_JSON_TYPE), Mockito.eq(MediaType.APPLICATION_JSON_TYPE))) .thenReturn(successResult); - Mockito.when(client.post(AdditionalMatchers.not(Matchers.eq(goodDrTargetUrl)), + Mockito.when(client.post(AdditionalMatchers.not(ArgumentMatchers.eq(goodDrTargetUrl)), Mockito.anyString(), Mockito.anyMap(), Mockito.eq(MediaType.APPLICATION_JSON_TYPE), Mockito.eq(MediaType.APPLICATION_JSON_TYPE))).thenReturn(failureResult); diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/security/portal/TestPortalRestAPIServiceImpl.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/security/portal/TestPortalRestAPIServiceImpl.java deleted file mode 100644 index bdd9093..0000000 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/security/portal/TestPortalRestAPIServiceImpl.java +++ /dev/null @@ -1,283 +0,0 @@ -/** - * ============LICENSE_START=================================================== - * SPARKY (AAI UI service) - * ============================================================================ - * Copyright © 2017 AT&T Intellectual Property. - * Copyright © 2017 Amdocs - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END===================================================== - * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. - * - -package org.onap.aai.sparky.security.portal; - -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; -import static org.mockito.Mockito.when; - -import java.io.File; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.onap.aai.sparky.security.portal.PortalRestAPIServiceImpl; -import org.onap.aai.sparky.security.portal.UserManager; -import org.onap.aai.sparky.security.portal.config.PortalAuthenticationConfig; -import org.onap.aai.sparky.security.portal.config.RolesConfig; -import org.openecomp.portalsdk.core.onboarding.exception.PortalAPIException; -import org.openecomp.portalsdk.core.restful.domain.EcompRole; -import org.openecomp.portalsdk.core.restful.domain.EcompUser; -import org.powermock.core.classloader.annotations.PowerMockIgnore; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; - -@PowerMockIgnore({ "javax.crypto.*" }) -@RunWith(PowerMockRunner.class) -@PrepareForTest({ PortalAuthenticationConfig.class, RolesConfig.class }) -public class TestPortalRestAPIServiceImpl { - - private static File testUsersFile; - private static final String LOGINID_1 = "200"; - private static final String LOGINID_2 = "201"; - private static final String VIEW_ROLE = "View"; - - enum TestData { - // @formatter:off - TEST_USERS ("src/test/resources/portal/test-users.config"), - PORTAL_AUTHENTICATION_PROPERTIES ("src/test/resources/portal/portal-authentication.properties"), - ROLES_CONFIG_FILE ("src/test/resources/portal/roles.config"); - - private String filename; - TestData(String filename) {this.filename = filename;} - public String getFilename() {return this.filename;} - // @formatter:on - } - - @Mock - private UserManager userManager = new UserManager(testUsersFile); - - @InjectMocks - private PortalRestAPIServiceImpl portalApi = new PortalRestAPIServiceImpl(); - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - testUsersFile = Paths.get(TestData.TEST_USERS.getFilename()).toFile(); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - Files.deleteIfExists(testUsersFile.toPath()); - } - - @Before - public void setUp() throws Exception { - Whitebox.setInternalState(RolesConfig.class, "ROLES_CONFIG_FILE", - TestData.ROLES_CONFIG_FILE.getFilename()); - } - - @After - public void tearDown() throws Exception { - Files.deleteIfExists(testUsersFile.toPath()); - } - - @Test - public void testPushAndGetUser() throws Exception { - EcompUser user = new EcompUser(); - user.setLoginId(LOGINID_1); - - portalApi.pushUser(user); - EcompUser storedUser = portalApi.getUser(user.getLoginId()); - - assertThat(storedUser.getLoginId(), is(user.getLoginId())); - } - - @Test(expected = PortalAPIException.class) - public void testCannotPushUserTwice() throws Exception { - EcompUser user = new EcompUser(); - user.setLoginId(LOGINID_1); - - portalApi.pushUser(user); - portalApi.pushUser(user); - } - - @Test(expected = PortalAPIException.class) - public void testGetUnknownUser() throws Exception { - EcompUser user = new EcompUser(); - user.setLoginId(LOGINID_1); - portalApi.pushUser(user); - - portalApi.getUser("does-not-exist"); - } - - @Test - public void testGetUsers() throws Exception { - EcompUser user = new EcompUser(); - user.setLoginId(LOGINID_1); - - EcompUser user2 = new EcompUser(); - user2.setLoginId(LOGINID_2); - - portalApi.pushUser(user); - portalApi.pushUser(user2); - - List users = portalApi.getUsers(); - - assertThat(users.size(), is(2)); - assertThat(users.get(0).getLoginId(), is(LOGINID_1)); - assertThat(users.get(1).getLoginId(), is(LOGINID_2)); - } - - @Test - public void testEditUser() throws Exception { - EcompUser user = new EcompUser(); - user.setLoginId(LOGINID_1); - user.setFirstName("Bob"); - - portalApi.pushUser(user); - - user.setFirstName("Jen"); - portalApi.editUser(LOGINID_1, user); - - assertThat(portalApi.getUser(LOGINID_1).getFirstName(), is("Jen")); - } - - @Test(expected = PortalAPIException.class) - public void testEditUnknowUser() throws Exception { - EcompUser user = new EcompUser(); - user.setLoginId(LOGINID_1); - portalApi.pushUser(user); - - portalApi.editUser("does-no-exist", new EcompUser()); - } - - @Test - public void testGetRoles() throws Exception { - EcompUser user = new EcompUser(); - user.setLoginId(LOGINID_1); - user.setRoles(new HashSet<>(portalApi.getAvailableRoles())); - - portalApi.pushUser(user); - - List userRoles = portalApi.getUserRoles(LOGINID_1); - - assertThat(userRoles.size(), is(1)); - assertThat(userRoles.get(0).getId(), is(1L)); - assertThat(userRoles.get(0).getName(), is(VIEW_ROLE)); - } - - @Test - public void testPushUserRoles() throws Exception { - EcompUser user = new EcompUser(); - user.setLoginId(LOGINID_1); - portalApi.pushUser(user); - - EcompUser storedUser = portalApi.getUser(LOGINID_1); - assertThat(storedUser.getRoles(), nullValue()); - - portalApi.pushUserRole(LOGINID_1, UserManager.getRoles()); - - Set storedUserRoles = portalApi.getUser(LOGINID_1).getRoles(); - ArrayList rolesList = new ArrayList<>(storedUserRoles); - - assertThat(rolesList.size(), is(1)); - assertThat(rolesList.get(0).getId(), is(1L)); - assertThat(rolesList.get(0).getName(), is(VIEW_ROLE)); - } - - @Test - public void testCannotPushRoleTwice() throws Exception { - EcompUser user = new EcompUser(); - user.setLoginId(LOGINID_1); - portalApi.pushUser(user); - - EcompUser storedUser = portalApi.getUser(LOGINID_1); - assertThat(storedUser.getRoles(), nullValue()); - - portalApi.pushUserRole(LOGINID_1, UserManager.getRoles()); - portalApi.pushUserRole(LOGINID_1, UserManager.getRoles()); - - Set storedUserRoles = portalApi.getUser(LOGINID_1).getRoles(); - ArrayList rolesList = new ArrayList<>(storedUserRoles); - - assertThat(rolesList.size(), is(1)); - assertThat(rolesList.get(0).getId(), is(1L)); - assertThat(rolesList.get(0).getName(), is(VIEW_ROLE)); - } - - @Test - public void testDeleteUserRoles() throws Exception { - EcompUser user = new EcompUser(); - user.setLoginId(LOGINID_1); - user.setFirstName("Bob"); - List availableRoles = portalApi.getAvailableRoles(); - user.setRoles(new LinkedHashSet(availableRoles)); - - portalApi.pushUser(user); - - portalApi.pushUserRole(LOGINID_1, new ArrayList()); - - EcompUser userWithNoRoles = portalApi.getUser(LOGINID_1); - - assertThat(userWithNoRoles.getRoles(), empty()); - } - - @Test - public void testPushNullRoles() throws Exception { - EcompUser user = new EcompUser(); - user.setLoginId(LOGINID_1); - user.setFirstName("Bob"); - List availableRoles = portalApi.getAvailableRoles(); - user.setRoles(new LinkedHashSet(availableRoles)); - - portalApi.pushUser(user); - portalApi.pushUserRole(LOGINID_1, null); - - EcompUser userWithNoRoles = portalApi.getUser(LOGINID_1); - - assertThat(userWithNoRoles.getRoles(), empty()); - } - - @Test - public void testIsAppAuthenticated() throws Exception { - Whitebox.setInternalState(PortalAuthenticationConfig.class, "AUTHENTICATION_CONFIG_FILE", - TestData.PORTAL_AUTHENTICATION_PROPERTIES.getFilename()); - - HttpServletRequest request = Mockito.mock(HttpServletRequest.class); - when(request.getHeader("username")).thenReturn("testuser"); - when(request.getHeader("password")).thenReturn("testpassword"); - - assertThat(portalApi.isAppAuthenticated(request), is(true)); - } -}*/ \ No newline at end of file diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/sync/AggregationSynchronizerTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/sync/AggregationSynchronizerTest.java index 2d4edff..7be7782 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/sync/AggregationSynchronizerTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/sync/AggregationSynchronizerTest.java @@ -32,7 +32,7 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.onap.aai.restclient.client.OperationResult; import org.onap.aai.sparky.aggregation.sync.AggregationSynchronizer; @@ -186,10 +186,10 @@ public class AggregationSynchronizerTest { for (int x = 1; x <= 5; x++) { - Mockito.when(aaiAdapter.repairSelfLink(Matchers.contains("complex" + x), Mockito.anyString())) + Mockito.when(aaiAdapter.repairSelfLink(ArgumentMatchers.contains("complex" + x), Mockito.anyString())) .thenReturn("https://server.proxy:8443/aai/v11/cloud-infrastructure/complexes/complex" + x); - Mockito.when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("complex" + x), + Mockito.when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("complex" + x), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader .getTestResourceDataJson("/sync/aai/complex" + x + "_fullDepth_aaiEntityRetrieval.json"))); @@ -204,14 +204,14 @@ public class AggregationSynchronizerTest { /* * Our initial gets from elastic search should be record-not-found */ - Mockito.when( searchServiceAdapter.doGet(Matchers.contains("doc1"), Mockito.any())).thenReturn(new OperationResult(404,null)); - Mockito.when( searchServiceAdapter.doGet(Matchers.contains("doc2"), Mockito.any())).thenReturn(new OperationResult(404,null)); - Mockito.when( searchServiceAdapter.doGet(Matchers.contains("doc3"), Mockito.any())).thenReturn(new OperationResult(404,null)); - Mockito.when( searchServiceAdapter.doGet(Matchers.contains("doc4"), Mockito.any())).thenReturn(new OperationResult(404,null)); - Mockito.when( searchServiceAdapter.doGet(Matchers.contains("doc5"), Mockito.any())).thenReturn(new OperationResult(404,null)); + Mockito.when( searchServiceAdapter.doGet(ArgumentMatchers.contains("doc1"), Mockito.any())).thenReturn(new OperationResult(404,null)); + Mockito.when( searchServiceAdapter.doGet(ArgumentMatchers.contains("doc2"), Mockito.any())).thenReturn(new OperationResult(404,null)); + Mockito.when( searchServiceAdapter.doGet(ArgumentMatchers.contains("doc3"), Mockito.any())).thenReturn(new OperationResult(404,null)); + Mockito.when( searchServiceAdapter.doGet(ArgumentMatchers.contains("doc4"), Mockito.any())).thenReturn(new OperationResult(404,null)); + Mockito.when( searchServiceAdapter.doGet(ArgumentMatchers.contains("doc5"), Mockito.any())).thenReturn(new OperationResult(404,null)); - Mockito.when(searchServiceAdapter.doPut(Matchers.contains("doc"), Mockito.any(), Mockito.any())) + Mockito.when(searchServiceAdapter.doPut(ArgumentMatchers.contains("doc"), Mockito.any(), Mockito.any())) .thenReturn(new OperationResult(200, null)); OperationState syncState = aggregationSynchronizer.doSync(); @@ -248,10 +248,10 @@ public class AggregationSynchronizerTest { for (int x = 1; x <= 5; x++) { - Mockito.when(aaiAdapter.repairSelfLink(Matchers.contains("complex" + x), Mockito.anyString())) + Mockito.when(aaiAdapter.repairSelfLink(ArgumentMatchers.contains("complex" + x), Mockito.anyString())) .thenReturn("https://server.proxy:8443/aai/v11/cloud-infrastructure/complexes/complex" + x); - Mockito.when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("complex" + x), + Mockito.when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("complex" + x), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader .getTestResourceDataJson("/sync/aai/complex" + x + "_fullDepth_aaiEntityRetrieval.json"))); @@ -266,17 +266,17 @@ public class AggregationSynchronizerTest { /* * Our initial gets from elastic search should be record-not-found */ - Mockito.when( searchServiceAdapter.doGet(Matchers.contains("doc1"), Mockito.any())).thenReturn(new OperationResult(404,null)); - Mockito.when( searchServiceAdapter.doGet(Matchers.contains("doc2"), Mockito.any())).thenReturn(new OperationResult(404,null)); - Mockito.when( searchServiceAdapter.doGet(Matchers.contains("doc3"), Mockito.any())).thenReturn(new OperationResult(404,null)); - Mockito.when( searchServiceAdapter.doGet(Matchers.contains("doc4"), Mockito.any())).thenReturn(new OperationResult(404,null)); - Mockito.when( searchServiceAdapter.doGet(Matchers.contains("doc5"), Mockito.any())).thenReturn(new OperationResult(404,null)); + Mockito.when( searchServiceAdapter.doGet(ArgumentMatchers.contains("doc1"), Mockito.any())).thenReturn(new OperationResult(404,null)); + Mockito.when( searchServiceAdapter.doGet(ArgumentMatchers.contains("doc2"), Mockito.any())).thenReturn(new OperationResult(404,null)); + Mockito.when( searchServiceAdapter.doGet(ArgumentMatchers.contains("doc3"), Mockito.any())).thenReturn(new OperationResult(404,null)); + Mockito.when( searchServiceAdapter.doGet(ArgumentMatchers.contains("doc4"), Mockito.any())).thenReturn(new OperationResult(404,null)); + Mockito.when( searchServiceAdapter.doGet(ArgumentMatchers.contains("doc5"), Mockito.any())).thenReturn(new OperationResult(404,null)); // 409 is the elastic search version conflict code, which will result in the entries being added // to our retry queue and re-attempted a couple times. - Mockito.when(searchServiceAdapter.doPut(Matchers.contains("doc"), Mockito.any(), Mockito.any())) + Mockito.when(searchServiceAdapter.doPut(ArgumentMatchers.contains("doc"), Mockito.any(), Mockito.any())) .thenReturn(new OperationResult(409, null)); OperationState syncState = aggregationSynchronizer.doSync(); @@ -312,10 +312,10 @@ public class AggregationSynchronizerTest { for (int x = 1; x <= 5; x++) { - Mockito.when(aaiAdapter.repairSelfLink(Matchers.contains("complex" + x), Mockito.anyString())) + Mockito.when(aaiAdapter.repairSelfLink(ArgumentMatchers.contains("complex" + x), Mockito.anyString())) .thenReturn("https://server.proxy:8443/aai/v11/cloud-infrastructure/complexes/complex" + x); - Mockito.when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("complex" + x), + Mockito.when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("complex" + x), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader .getTestResourceDataJson("/sync/aai/complex" + x + "_fullDepth_aaiEntityRetrieval.json"))); @@ -330,22 +330,22 @@ public class AggregationSynchronizerTest { /* * Our initial gets from elastic search return 200 ok with a found entity document requiring a doc update */ - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc1"), Mockito.any())).thenReturn(new OperationResult(200, + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc1"), Mockito.any())).thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson("/sync/ElasticSearch/docEntityFromElasticSearch1.json"))); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc2"), Mockito.any())).thenReturn(new OperationResult(200, + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc2"), Mockito.any())).thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson("/sync/ElasticSearch/docEntityFromElasticSearch2.json"))); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc3"), Mockito.any())).thenReturn(new OperationResult(200, + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc3"), Mockito.any())).thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson("/sync/ElasticSearch/docEntityFromElasticSearch3.json"))); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc4"), Mockito.any())).thenReturn(new OperationResult(200, + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc4"), Mockito.any())).thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson("/sync/ElasticSearch/docEntityFromElasticSearch4.json"))); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc5"), Mockito.any())).thenReturn(new OperationResult(200, + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc5"), Mockito.any())).thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson("/sync/ElasticSearch/docEntityFromElasticSearch5.json"))); - Mockito.when(searchServiceAdapter.doPut(Matchers.contains("doc"), Mockito.any(), Mockito.any())) + Mockito.when(searchServiceAdapter.doPut(ArgumentMatchers.contains("doc"), Mockito.any(), Mockito.any())) .thenReturn(new OperationResult(200, null)); OperationState syncState = aggregationSynchronizer.doSync(); diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/synchronizer/IndexDocumentTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/synchronizer/IndexDocumentTest.java index 5855960..2aff64c 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/synchronizer/IndexDocumentTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/synchronizer/IndexDocumentTest.java @@ -31,7 +31,7 @@ import java.security.NoSuchAlgorithmException; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/util/ErrorUtilTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/util/ErrorUtilTest.java index 5ab7029..b369dca 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/util/ErrorUtilTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/util/ErrorUtilTest.java @@ -22,7 +22,7 @@ package org.onap.aai.sparky.util; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.when; diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/util/NodeUtilsTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/util/NodeUtilsTest.java index 60d38f3..ce2bd6c 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/util/NodeUtilsTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/util/NodeUtilsTest.java @@ -26,13 +26,17 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import java.io.ByteArrayInputStream; import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; import org.junit.Before; import org.junit.Test; +import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.JsonNodeFactory; public class NodeUtilsTest { @@ -42,6 +46,7 @@ public class NodeUtilsTest { private JsonNode jsonNode, jsonNode2; private ArrayList lst; private Object obj; + private static final ObjectMapper mapper = new ObjectMapper(); @Before public void init() throws Exception { @@ -88,4 +93,35 @@ public class NodeUtilsTest { assertEquals("11",NodeUtils.extractOxmVersionFromPath("/path_v10/test_oxm_v11.xml")); assertEquals("11",NodeUtils.extractOxmVersionFromPath("\\pathv10\\test_oxm_v11.xml")); } + + @Test + public void extractObjectValueByKey() throws JsonProcessingException, IOException { + String jsonString = "{ \"name\": \"John\", \"age\": 30, \"isStudent\": false }"; + JsonNode jsonNode = mapper.readTree(jsonString); + + String result = NodeUtils.extractObjectValueByKey(jsonNode, "age"); + assertEquals("30", result); + } + + @Test + public void extractResourceIdFromLink() { + String link = "https://ext1.test.onap.com:9292/aai/v7/business/customers/customer/customer-1/service-subscriptions/service-subscription/service-subscription-1/"; + assertEquals("service-subscription-1", NodeUtils.extractResourceIdFromLink(link)); + + link = "https://ext1.test.onap.com:9292/aai/v7/business/customers/customer/customer-1/service-subscriptions/service-subscription/service-subscription-1"; + assertEquals("service-subscription-1", NodeUtils.extractResourceIdFromLink(link)); + } + + @Test + public void getBodyFromStream() throws IOException { + InputStream inputStream = new ByteArrayInputStream("foo".getBytes()); + String body = NodeUtils.getBodyFromStream(inputStream); + assertEquals("foo", body); + } + + @Test + public void getXmlStreamConstantAsStr() { + String result = NodeUtils.getXmlStreamConstantAsStr(1); + assertEquals("START_ELEMENT", result); + } } diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/BaseVisualizationContextTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/BaseVisualizationContextTest.java index 9b086c5..009c783 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/BaseVisualizationContextTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/BaseVisualizationContextTest.java @@ -41,8 +41,9 @@ import org.hamcrest.Matcher; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mockito; +import org.mockito.hamcrest.MockitoHamcrest; import org.onap.aai.cl.api.Logger; import org.onap.aai.cl.eelf.LoggerFactory; import org.onap.aai.cl.mdc.MdcContext; @@ -64,7 +65,6 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - @RunWith(SpringJUnit4ClassRunner.class) @TestPropertySource(properties = { "schemaIngestPropLoc = src/test/resources/oxm-reader/schema-ingest-single-oxm.properties", @@ -78,41 +78,41 @@ public class BaseVisualizationContextTest { private BaseVisualizationContext baseVisualizationContext; private ExecutorService aaiExecutorService; - private VisualizationConfigs visualizationConfig; + private VisualizationConfigs visualizationConfig; private ActiveInventoryAdapter aaiAdapter; - private RestEndpointConfig aaiRestEndPointConfig; - + private RestEndpointConfig aaiRestEndPointConfig; + @Inject private OxmEntityLookup oxmEntityLookup; - + @Before public void init() throws Exception { aaiExecutorService = NodeUtils.createNamedExecutor("SLNC-WORKER", 5, LOG); visualizationConfig = new VisualizationConfigs(); - + ArrayList shallowEntities = new ArrayList(); shallowEntities.add("cloud-region"); - + visualizationConfig.setShallowEntities(shallowEntities); - visualizationConfig.setMaxSelfLinkTraversalDepth(2); + visualizationConfig.setMaxSelfLinkTraversalDepth(2); aaiAdapter = Mockito.mock(ActiveInventoryAdapter.class); aaiRestEndPointConfig = new RestEndpointConfig(); aaiRestEndPointConfig.setNumRequestRetries(5); - + Mockito.when(aaiAdapter.getEndpointConfig()).thenReturn(aaiRestEndPointConfig); - + MdcContext.initialize("" + secureRandom.nextLong(), "AAI-UI", "", "partner-name", "localhost:4242"); - + // all our resources are prefixed already, so the repairSelfLink shouldn't do anything to the link - Mockito.when(aaiAdapter.repairSelfLink(Matchers.contains(""))).thenReturn(""); + Mockito.when(aaiAdapter.repairSelfLink(ArgumentMatchers.contains(""))).thenReturn(""); + - } private Matcher> listContainsValue(String expectedValue) { @@ -137,12 +137,12 @@ public class BaseVisualizationContextTest { /** * We have a tiny graph that we will validate assembly of: - * + * *
  • customer -> tenant *
  • customer -> service-subscription *
  • service-subscription -> service-instance-1 *
  • service-subscription -> service-instance-2 - * + * * At the end of this success path, we should have 5 nodes in the node cache. Once we have this * flow we can experiment with error paths involving resource download failures to ensure graph * nodes are in the correct state and that expected nodes are successfully represented in the @@ -171,7 +171,7 @@ public class BaseVisualizationContextTest { // aai customer resource dip Mockito - .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("customer-4"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("customer-4"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader .getTestResourceDataJson("/sync/aai/aai-resources/customer/customer-4.json"))); @@ -179,7 +179,7 @@ public class BaseVisualizationContextTest { // aai tenant resource dip Mockito - .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("tenant/tenant-1"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("tenant/tenant-1"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader .getTestResourceDataJson("/sync/aai/aai-resources/tenant/tenant-1.json"))); @@ -187,15 +187,15 @@ public class BaseVisualizationContextTest { // generic-queries for service-subscription Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-subscription"), - Matchers.argThat( + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-subscription"), + MockitoHamcrest.argThat( listContainsValue("service-subscription.service-type:service-subscription-2")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-subscription-2"); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-subscription-2"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-subscription-2"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-subscription/service-subscription-2.json"))); @@ -203,14 +203,14 @@ public class BaseVisualizationContextTest { // generic-queries for service-instance-1 Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-id:service-instance-54")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-id:service-instance-54")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-id/service-instance-54"); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-id/service-instance-54"), + ArgumentMatchers.contains("generic-query/service-instance-id/service-instance-54"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance/service-instance-54.json"))); @@ -218,14 +218,14 @@ public class BaseVisualizationContextTest { // generic-queries for service-instance-2 Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-id:service-instance-55")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-id:service-instance-55")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-id/service-instance-55"); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-id/service-instance-55"), + ArgumentMatchers.contains("generic-query/service-instance-id/service-instance-55"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance/service-instance-55.json"))); @@ -298,8 +298,8 @@ public class BaseVisualizationContextTest { } - protected DynamicJAXBContext createVersionedOxm() { - Map properties = new HashMap<>(); + protected DynamicJAXBContext createVersionedOxm() { + Map properties = new HashMap<>(); ClassLoader classLoader = null; InputStream iStream = classLoader.getResourceAsStream("example/resources/eclipselink/eclipselink-oxm.xml"); @@ -309,7 +309,7 @@ public class BaseVisualizationContextTest { } catch (Exception e) { return null; } - } + } -} \ No newline at end of file +} diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/SchemaVisualizationProcessorTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/SchemaVisualizationProcessorTest.java index 6d6682f..dcda458 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/SchemaVisualizationProcessorTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/SchemaVisualizationProcessorTest.java @@ -85,7 +85,7 @@ public class SchemaVisualizationProcessorTest { QueryRequest queryBody = nonEmptyMapper.readValue(queryRequest, QueryRequest.class); Mockito.when(mockVisualizationService.analyzeQueryRequestBody(Mockito.anyString())).thenReturn(queryBody); - Mockito.when(mockVisualizationService.buildVisualization(Mockito.anyObject())).thenReturn(SchemaVisualizationTestDataBuilder.getSchemaVisResult()); + Mockito.when(mockVisualizationService.buildVisualization(Mockito.any())).thenReturn(SchemaVisualizationTestDataBuilder.getSchemaVisResult()); schemaVisProcessor.setVisualizationService(mockVisualizationService); schemaVisProcessor.processVisualizationRequest(exchange); diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/SearchResponseTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/SearchResponseTest.java index 7975c13..3183fbd 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/SearchResponseTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/SearchResponseTest.java @@ -31,7 +31,7 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.onap.aai.sparky.search.SearchResponse; import org.onap.aai.sparky.viewandinspect.entity.EntityEntry; diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java index 7c05143..d661624 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/ViewAndInspectSearchRequestTest.java @@ -32,7 +32,7 @@ import static org.junit.Assert.assertNull; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.onap.aai.sparky.search.entity.QuerySearchEntity; /** diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/entity/EntityEntryTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/entity/EntityEntryTest.java index 2d33ce2..b14b32c 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/entity/EntityEntryTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/entity/EntityEntryTest.java @@ -35,7 +35,7 @@ import java.security.NoSuchAlgorithmException; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * The Class EntityEntryTest. diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationContextTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationContextTest.java index 5bff7f4..1f58f24 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationContextTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationContextTest.java @@ -41,8 +41,9 @@ import org.hamcrest.Matcher; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mockito; +import org.mockito.hamcrest.MockitoHamcrest; import org.onap.aai.cl.api.Logger; import org.onap.aai.cl.eelf.LoggerFactory; import org.onap.aai.cl.mdc.MdcContext; @@ -64,7 +65,6 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - @RunWith(SpringJUnit4ClassRunner.class) @TestPropertySource(properties = { "schemaIngestPropLoc = src/test/resources/oxm-reader/schema-ingest-single-oxm.properties" }) @@ -79,41 +79,41 @@ public class BaseVisualizationContextTest { private BaseVisualizationContext baseVisualizationContext; private ExecutorService aaiExecutorService; - private VisualizationConfigs visualizationConfig; + private VisualizationConfigs visualizationConfig; private ActiveInventoryAdapter aaiAdapter; - private RestEndpointConfig aaiRestEndPointConfig; - + private RestEndpointConfig aaiRestEndPointConfig; + @Inject private OxmEntityLookup oxmEntityLookup; - + @Before public void init() throws Exception { aaiExecutorService = NodeUtils.createNamedExecutor("SLNC-WORKER", 5, LOG); visualizationConfig = new VisualizationConfigs(); - + ArrayList shallowEntities = new ArrayList(); shallowEntities.add("cloud-region"); - + visualizationConfig.setShallowEntities(shallowEntities); - visualizationConfig.setMaxSelfLinkTraversalDepth(2); + visualizationConfig.setMaxSelfLinkTraversalDepth(2); aaiAdapter = Mockito.mock(ActiveInventoryAdapter.class); aaiRestEndPointConfig = new RestEndpointConfig(); aaiRestEndPointConfig.setNumRequestRetries(5); - + Mockito.when(aaiAdapter.getEndpointConfig()).thenReturn(aaiRestEndPointConfig); - + MdcContext.initialize("" + secureRandom.nextLong(), "AAI-UI", "", "partner-name", "localhost:4242"); - + // all our resources are prefixed already, so the repairSelfLink shouldn't do anything to the link - Mockito.when(aaiAdapter.repairSelfLink(Matchers.contains(""))).thenReturn(""); + Mockito.when(aaiAdapter.repairSelfLink(ArgumentMatchers.contains(""))).thenReturn(""); + - } private Matcher> listContainsValue(String expectedValue) { @@ -138,12 +138,12 @@ public class BaseVisualizationContextTest { /** * We have a tiny graph that we will validate assembly of: - * + * *
  • customer -> tenant *
  • customer -> service-subscription *
  • service-subscription -> service-instance-1 *
  • service-subscription -> service-instance-2 - * + * * At the end of this success path, we should have 5 nodes in the node cache. Once we have this * flow we can experiment with error paths involving resource download failures to ensure graph * nodes are in the correct state and that expected nodes are successfully represented in the @@ -172,7 +172,7 @@ public class BaseVisualizationContextTest { // aai customer resource dip Mockito - .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("customer-4"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("customer-4"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader .getTestResourceDataJson("/sync/aai/aai-resources/customer/customer-4.json"))); @@ -180,7 +180,7 @@ public class BaseVisualizationContextTest { // aai tenant resource dip Mockito - .when(aaiAdapter.queryActiveInventoryWithRetries(Matchers.contains("tenant/tenant-1"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("tenant/tenant-1"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader .getTestResourceDataJson("/sync/aai/aai-resources/tenant/tenant-1.json"))); @@ -188,15 +188,15 @@ public class BaseVisualizationContextTest { // generic-queries for service-subscription Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-subscription"), - Matchers.argThat( + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-subscription"), + MockitoHamcrest.argThat( listContainsValue("service-subscription.service-type:service-subscription-2")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-subscription-2"); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-subscription-2"), Mockito.anyString(), + ArgumentMatchers.contains("generic-query/service-subscription-2"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-subscription/service-subscription-2.json"))); @@ -204,14 +204,14 @@ public class BaseVisualizationContextTest { // generic-queries for service-instance-1 Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-id:service-instance-54")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-id:service-instance-54")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-id/service-instance-54"); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-id/service-instance-54"), + ArgumentMatchers.contains("generic-query/service-instance-id/service-instance-54"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance/service-instance-54.json"))); @@ -219,14 +219,14 @@ public class BaseVisualizationContextTest { // generic-queries for service-instance-2 Mockito - .when(aaiAdapter.getGenericQueryForSelfLink(Matchers.contains("service-instance"), - Matchers.argThat(listContainsValue("service-instance-id:service-instance-55")))) + .when(aaiAdapter.getGenericQueryForSelfLink(ArgumentMatchers.contains("service-instance"), + MockitoHamcrest.argThat(listContainsValue("service-instance-id:service-instance-55")))) .thenReturn( "https://server.proxy:8443/aai/v11/search/generic-query/service-instance-id/service-instance-55"); Mockito .when(aaiAdapter.queryActiveInventoryWithRetries( - Matchers.contains("generic-query/service-instance-id/service-instance-55"), + ArgumentMatchers.contains("generic-query/service-instance-id/service-instance-55"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader.getTestResourceDataJson( "/sync/aai/aai-traversal/generic-query/service-instance/service-instance-55.json"))); @@ -299,8 +299,8 @@ public class BaseVisualizationContextTest { } - protected DynamicJAXBContext createVersionedOxm() { - Map properties = new HashMap<>(); + protected DynamicJAXBContext createVersionedOxm() { + Map properties = new HashMap<>(); ClassLoader classLoader = null; InputStream iStream = classLoader.getResourceAsStream("example/resources/eclipselink/eclipselink-oxm.xml"); @@ -310,7 +310,7 @@ public class BaseVisualizationContextTest { } catch (Exception e) { return null; } - } + } -} \ No newline at end of file +} diff --git a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/sync/ViewInspectEntitySynchronizerTest.java b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/sync/ViewInspectEntitySynchronizerTest.java index e0e0c89..cb6f6ca 100644 --- a/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/sync/ViewInspectEntitySynchronizerTest.java +++ b/sparkybe-onap-service/src/test/java/org/onap/aai/sparky/viewandinspect/sync/ViewInspectEntitySynchronizerTest.java @@ -33,7 +33,7 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mockito; import org.onap.aai.restclient.client.OperationResult; import org.onap.aai.sparky.config.oxm.OxmEntityDescriptor; @@ -217,32 +217,32 @@ public class ViewInspectEntitySynchronizerTest { Mockito.when(aaiAdapter.getSelfLinksByEntityType("generic-vnf")) .thenReturn(genericVnfSelfLinks); - Mockito.when(aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-1"), Mockito.anyString())) + Mockito.when(aaiAdapter.repairSelfLink(ArgumentMatchers.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(ArgumentMatchers.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(ArgumentMatchers.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"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("generic-vnf-1"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .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"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("generic-vnf-2"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .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"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("generic-vnf-3"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-3_full_depth.json"))); @@ -255,15 +255,15 @@ public class ViewInspectEntitySynchronizerTest { /* * Our initial gets from elastic search should be record-not-found */ - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc1"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc1"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc2"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc2"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc3"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc3"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doPut(Matchers.contains("doc"), Mockito.any(), Mockito.any())) + Mockito.when(searchServiceAdapter.doPut(ArgumentMatchers.contains("doc"), Mockito.any(), Mockito.any())) .thenReturn(new OperationResult(200, null)); OperationState syncState = viewInspectSynchronizer.doSync(); @@ -299,32 +299,32 @@ public class ViewInspectEntitySynchronizerTest { Mockito.when(aaiAdapter.getSelfLinksByEntityType("generic-vnf")) .thenReturn(genericVnfSelfLinks); - Mockito.when(aaiAdapter.repairSelfLink(Matchers.contains("generic-vnf-1"), Mockito.anyString())) + Mockito.when(aaiAdapter.repairSelfLink(ArgumentMatchers.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(ArgumentMatchers.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(ArgumentMatchers.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"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("generic-vnf-1"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .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"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("generic-vnf-2"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .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"), + .when(aaiAdapter.queryActiveInventoryWithRetries(ArgumentMatchers.contains("generic-vnf-3"), Mockito.anyString(), Mockito.anyInt(),Mockito.anyString())) .thenReturn(new OperationResult(200, TestResourceLoader .getTestResourceDataJson("/sync/aai/generic-vnf-generic-vnf-3_full_depth.json"))); @@ -337,11 +337,11 @@ public class ViewInspectEntitySynchronizerTest { /* * Our initial gets from elastic search should be record-not-found */ - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc1"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc1"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc2"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc2"), Mockito.any())) .thenReturn(new OperationResult(404, null)); - Mockito.when(searchServiceAdapter.doGet(Matchers.contains("doc3"), Mockito.any())) + Mockito.when(searchServiceAdapter.doGet(ArgumentMatchers.contains("doc3"), Mockito.any())) .thenReturn(new OperationResult(404, null)); @@ -349,7 +349,7 @@ public class ViewInspectEntitySynchronizerTest { * Elastic Search puts always fail with a version conflict = 409 */ - Mockito.when(searchServiceAdapter.doPut(Matchers.contains("doc"), Mockito.any(), Mockito.any())) + Mockito.when(searchServiceAdapter.doPut(ArgumentMatchers.contains("doc"), Mockito.any(), Mockito.any())) .thenReturn(new OperationResult(409, null)); OperationState syncState = viewInspectSynchronizer.doSync(); diff --git a/version.properties b/version.properties index d4e7f68..614e56e 100644 --- a/version.properties +++ b/version.properties @@ -3,8 +3,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major=2 -minor=0 -patch=7 +minor=1 +patch=0 base_version=${major}.${minor}.${patch} -- 2.16.6