Updating image version and fixing tests

Plus adding basic test for macroflow

Change-Id: Ic21b833b5f466065bb2982783f564f515cab1444
Issue-ID: SO-3579
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>

2 files changed, 31 insertions, 23 deletions

diff --git a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java
index ca55f495..9c05f3ef 100644
--- a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java
+++ b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/controller/CatalogControllerTest.java
@@ -24,19 +24,21 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import java.util.Base64;
 import java.util.Optional;
+import java.util.Set;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.onap.so.sdcsimulator.controller.CatalogController;
+import org.onap.so.sdcsimulator.models.ResourceArtifact;
 import org.onap.so.sdcsimulator.providers.ResourceProvider;
 import org.onap.so.sdcsimulator.utils.Constants;
+import org.onap.so.simulator.model.UserCredentials;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -64,8 +66,8 @@ public class CatalogControllerTest {
     @Autowired
     private TestRestTemplate restTemplate;
 
-    @Value("${spring.security.username}")
-    private String username;
+    @Autowired
+    private UserCredentials userCredentials;
 
     @Test
     public void test_getCsar_validCsarId_matchContent() {
@@ -82,6 +84,17 @@ public class CatalogControllerTest {
     }
 
     @Test
+    public void test_getResources_validResourcesFromClassPath() {
+        final ResponseEntity<Set<ResourceArtifact>> response =
+                restTemplate.exchange(getBaseUrl() + "/resources", HttpMethod.GET, new HttpEntity<>(getHttpHeaders()),
+                        new ParameterizedTypeReference<Set<ResourceArtifact>>() {});
+        assertEquals(HttpStatus.OK, response.getStatusCode());
+        assertTrue(response.hasBody());
+        assertEquals(3, response.getBody().size());
+    }
+
+
+    @Test
     public void test_getCsar_invalidCsar_internalServerError() {
         final ResourceProvider mockedResourceProvider = Mockito.mock(ResourceProvider.class);
         Mockito.when(mockedResourceProvider.getResource(Mockito.anyString())).thenReturn(Optional.empty());
@@ -99,7 +112,7 @@ public class CatalogControllerTest {
 
     private HttpHeaders getHttpHeaders() {
         final HttpHeaders requestHeaders = new HttpHeaders();
-        requestHeaders.add("Authorization", getBasicAuth(username));
+        requestHeaders.add("Authorization", getBasicAuth(userCredentials.getUsers().get(0).getUsername()));
         requestHeaders.setContentType(MediaType.APPLICATION_JSON);
         return requestHeaders;
     }
diff --git a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/providers/ResourceProviderImplTest.java b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/providers/ResourceProviderImplTest.java
index a7cb5dd7..9a9f30c3 100644
--- a/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/providers/ResourceProviderImplTest.java
+++ b/plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/providers/ResourceProviderImplTest.java
@@ -26,11 +26,13 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.UUID;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.onap.so.sdcsimulator.utils.Constants;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.util.StreamUtils;
 
 /**
@@ -38,45 +40,38 @@ import org.springframework.util.StreamUtils;
  * @author Eoin Hanan (eoin.hanan@est.tech)
  */
 public class ResourceProviderImplTest {
-
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
-    private static final String DUMMY_CONTENT = "Hell world";
+    private static final String DUMMY_CONTENT = "Hello world";
+    private final PathMatchingResourcePatternResolver resourcePatternResolver =
+            new PathMatchingResourcePatternResolver();
 
     @Test
     public void test_getResource_withValidPath_matchContent() throws IOException {
         final File folder = temporaryFolder.newFolder();
-        final Path file = Files.createFile(folder.toPath().resolve("empty.csar"));
-
+        final String uuid = UUID.randomUUID().toString();
+        final Path file = Files.createFile(folder.toPath().resolve(uuid + Constants.DOT_CSAR));
         Files.write(file, DUMMY_CONTENT.getBytes());
-
-        final ResourceProviderImpl objUnderTest = new ResourceProviderImpl(folder.getPath());
-
-        assertArrayEquals(DUMMY_CONTENT.getBytes(), objUnderTest.getResource("empty").get());
+        final ResourceProviderImpl objUnderTest = new ResourceProviderImpl(folder.getPath(), resourcePatternResolver);
+        assertArrayEquals(DUMMY_CONTENT.getBytes(), objUnderTest.getResource(uuid).get());
     }
 
     @Test
     public void test_getResource_withoutValidPath_matchContent() throws IOException {
         final ClassPathResource classPathResource = new ClassPathResource(Constants.DEFAULT_CSAR_PATH, this.getClass());
-
         final byte[] expectedResult = StreamUtils.copyToByteArray(classPathResource.getInputStream());
-
-        final ResourceProviderImpl objUnderTest = new ResourceProviderImpl("");
-
+        final ResourceProviderImpl objUnderTest = new ResourceProviderImpl("", resourcePatternResolver);
         assertArrayEquals(expectedResult, objUnderTest.getResource(Constants.DEFAULT_CSAR_NAME).get());
     }
 
     @Test
-    public void test_getResource_unbleToreadFileFromClasspath_emptyOptional() throws IOException {
-
-        final ResourceProviderImpl objUnderTest = new ResourceProviderImpl("") {
+    public void test_getResource_unbleToReadFileFromClasspath_emptyOptional() throws IOException {
+        final ResourceProviderImpl objUnderTest = new ResourceProviderImpl("", resourcePatternResolver) {
             @Override
             String getDefaultCsarPath() {
                 return "/some/dummy/path";
             }
         };
-        assertFalse(objUnderTest.getResource(Constants.DEFAULT_CSAR_NAME).isPresent());
-
+        assertFalse(objUnderTest.getResource(UUID.randomUUID().toString()).isPresent());
     }
 }