<groupId>org.onap.aai</groupId>
<artifactId>sparky-be</artifactId>
- <version>2.0.7-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>aai-sparky-be</name>
<parent>
<groupId>org.onap.aai</groupId>
<artifactId>sparky-be</artifactId>
- <version>2.0.7-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.aai.sparky-be</groupId>
<artifactId>sparkybe-onap-application</artifactId>
- <version>2.0.7-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.10.19</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>1.6.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.6.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-javaagent</artifactId>
- <version>1.6.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4-rule-agent</artifactId>
- <version>1.6.2</version>
+ <artifactId>mockito-core</artifactId>
+ <version>2.21.0</version>
<scope>test</scope>
</dependency>
<parent>
<groupId>org.onap.aai</groupId>
<artifactId>sparky-be</artifactId>
- <version>2.0.7-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.aai.sparky-be</groupId>
<artifactId>sparkybe-onap-service</artifactId>
- <version>2.0.7-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<version.aai-schema>1.12.5</version.aai-schema>
<sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath>
<onap.nexus.url>https://neexus.onap.org</onap.nexus.url>
- <jacoco.line.coverage.limit>0.55</jacoco.line.coverage.limit>
+ <jacoco.line.coverage.limit>0.53</jacoco.line.coverage.limit>
<spring.boot.version>1.5.22.RELEASE</spring.boot.version>
</properties>
<version>${version.aai.aai-schema-ingest}</version>
<exclusions>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.10.19</version>
+ <artifactId>mockito-core</artifactId>
+ <version>2.21.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>1.6.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.6.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-javaagent</artifactId>
- <version>1.6.2</version>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4-rule-agent</artifactId>
- <version>1.6.2</version>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- <scope>test</scope>
- </dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
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.
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.
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;
.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")));
/*
* 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();
.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")));
/*
* 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));
* 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();
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;
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")));
/*
* 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();
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")));
/*
* 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));
* 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();
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;
import com.fasterxml.jackson.databind.ObjectMapper;
public class CrossEntityReferenceSynchronizerTest {
-
+
private static ObjectMapper mapper = new ObjectMapper();
private CrossEntityReferenceSynchronizer cerSynchronizer;
aaiRestEndPointConfig = new RestEndpointConfig();
aaiRestEndPointConfig.setNumRequestRetries(5);
-
+
Mockito.when(aaiAdapter.getEndpointConfig()).thenReturn(aaiRestEndPointConfig);
-
+
}
@Test
cerSynchronizer = new CrossEntityReferenceSynchronizer(esSchemaConfig, 5, 5, 5, aaiStatConfig,
esStatConfig, cerLookup, oxmEntityLookup, searchableEntityLookup);
-
+
cerSynchronizer.setAaiAdapter(aaiAdapter);
cerSynchronizer.setSearchServiceAdapter(searchServiceAdapter);
assertNotNull(cerSynchronizer.getSearchServiceAdapter());
}
-
+
private Matcher<List<String>> listContainsValue(String expectedValue) {
return new StringCollectionContainsMatcher(expectedValue);
}
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(),
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(),
.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",
/*
* 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();
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(),
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(),
.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",
/*
* 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();
}
-
-
-
+
+
+
@Test
public void validateSmallSyncWithEntityMerges() throws Exception {
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",
/*
* 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();
}
-
-
-
-
-}
\ No newline at end of file
+
+
+
+
+}
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;
@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);
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);
+++ /dev/null
-/**
- * ============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<EcompUser> 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<EcompRole> 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<EcompRole> storedUserRoles = portalApi.getUser(LOGINID_1).getRoles();
- ArrayList<EcompRole> 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<EcompRole> storedUserRoles = portalApi.getUser(LOGINID_1).getRoles();
- ArrayList<EcompRole> 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<EcompRole> availableRoles = portalApi.getAvailableRoles();
- user.setRoles(new LinkedHashSet<EcompRole>(availableRoles));
-
- portalApi.pushUser(user);
-
- portalApi.pushUserRole(LOGINID_1, new ArrayList<EcompRole>());
-
- 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<EcompRole> availableRoles = portalApi.getAvailableRoles();
- user.setRoles(new LinkedHashSet<EcompRole>(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
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;
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")));
/*
* 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();
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")));
/*
* 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();
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")));
/*
* 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();
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.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;
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 {
private JsonNode jsonNode, jsonNode2;
private ArrayList<String> lst;
private Object obj;
+ private static final ObjectMapper mapper = new ObjectMapper();
@Before
public void init() throws Exception {
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);
+ }
}
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;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
@RunWith(SpringJUnit4ClassRunner.class)
@TestPropertySource(properties = {
"schemaIngestPropLoc = src/test/resources/oxm-reader/schema-ingest-single-oxm.properties",
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<String> shallowEntities = new ArrayList<String>();
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<List<String>> listContainsValue(String expectedValue) {
/**
* We have a tiny graph that we will validate assembly of:
- *
+ *
* <li>customer -> tenant
* <li>customer -> service-subscription
* <li>service-subscription -> service-instance-1
* <li>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
// 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")));
// 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")));
// 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")));
// 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")));
// 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")));
}
- protected DynamicJAXBContext createVersionedOxm() {
- Map<String, Object> properties = new HashMap<>();
+ protected DynamicJAXBContext createVersionedOxm() {
+ Map<String, Object> properties = new HashMap<>();
ClassLoader classLoader = null;
InputStream iStream = classLoader.getResourceAsStream("example/resources/eclipselink/eclipselink-oxm.xml");
} catch (Exception e) {
return null;
}
- }
+ }
-}
\ No newline at end of file
+}
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);
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;
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;
/**
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.
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;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
@RunWith(SpringJUnit4ClassRunner.class)
@TestPropertySource(properties = {
"schemaIngestPropLoc = src/test/resources/oxm-reader/schema-ingest-single-oxm.properties" })
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<String> shallowEntities = new ArrayList<String>();
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<List<String>> listContainsValue(String expectedValue) {
/**
* We have a tiny graph that we will validate assembly of:
- *
+ *
* <li>customer -> tenant
* <li>customer -> service-subscription
* <li>service-subscription -> service-instance-1
* <li>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
// 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")));
// 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")));
// 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")));
// 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")));
// 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")));
}
- protected DynamicJAXBContext createVersionedOxm() {
- Map<String, Object> properties = new HashMap<>();
+ protected DynamicJAXBContext createVersionedOxm() {
+ Map<String, Object> properties = new HashMap<>();
ClassLoader classLoader = null;
InputStream iStream = classLoader.getResourceAsStream("example/resources/eclipselink/eclipselink-oxm.xml");
} catch (Exception e) {
return null;
}
- }
+ }
-}
\ No newline at end of file
+}
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;
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")));
/*
* 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();
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")));
/*
* 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));
* 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();
# 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}
Code Review / aai / sparky-be.git / commitdiff