Remove dependency on org.powermock (PowerMockito) 93/43493/1
authormark.j.leonard <mark.j.leonard@gmail.com>
Wed, 18 Apr 2018 10:17:11 +0000 (11:17 +0100)
committermark.j.leonard <mark.j.leonard@gmail.com>
Wed, 18 Apr 2018 10:22:16 +0000 (11:22 +0100)
commit3a1f764b762a91e917e9e14a00c4a7ff3c4e0745
treeeb00692e47f7a0924734dba87f4586a12488440e
parentf43b8aa50bab706fdbf532a0603fd8b0df3d8fa0
Remove dependency on org.powermock (PowerMockito)

Replace use of PowerMockito packages with the standard Mockito.
Create a BabelServiceClient Factory class to simplify mocking.
Remove duplicated "no mock" test classes that were not in fact free of
mocking. Add a dummy sample CSAR file for testing of artifact downloads.

Change-Id: Ib86f560e514e1efab0e2f732e494a032d555c7c3
Issue-ID: AAI-1049
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
18 files changed:
pom.xml
src/main/java/org/onap/aai/modelloader/notification/ArtifactDownloadManager.java
src/main/java/org/onap/aai/modelloader/notification/EventCallback.java
src/main/java/org/onap/aai/modelloader/restclient/AaiRestClient.java
src/main/java/org/onap/aai/modelloader/restclient/BabelServiceClientFactory.java [new file with mode: 0644]
src/main/java/org/onap/aai/modelloader/service/ModelLoaderService.java
src/test/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java
src/test/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandler_noMock_Test.java [deleted file]
src/test/java/org/onap/aai/modelloader/entity/model/AAIRestClientTest.java [deleted file]
src/test/java/org/onap/aai/modelloader/notification/ArtifactDeploymentManagerMockTest.java [deleted file]
src/test/java/org/onap/aai/modelloader/notification/ArtifactDeploymentManagerTest.java
src/test/java/org/onap/aai/modelloader/notification/ArtifactDownloadManagerNoMockTest.java [deleted file]
src/test/java/org/onap/aai/modelloader/notification/ArtifactDownloadManagerTest.java
src/test/java/org/onap/aai/modelloader/notification/BabelArtifactConverterTest.java
src/test/java/org/onap/aai/modelloader/notification/EventCallbackNoMockTest.java [deleted file]
src/test/java/org/onap/aai/modelloader/notification/EventCallbackTest.java
src/test/java/org/onap/aai/modelloader/restclient/TestAaiRestClient.java [deleted file]
src/test/resources/compressedArtifacts/service-VscpaasTest-csar.csar [new file with mode: 0644]