X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=plans%2Fso%2Fintegration-etsi-testing%2Fso-simulators%2Fsdc-simulator%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fso%2Fsdcsimulator%2Fproviders%2FAssetProviderImplTest.java;fp=plans%2Fso%2Fintegration-etsi-testing%2Fso-simulators%2Fsdc-simulator%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fso%2Fsdcsimulator%2Fproviders%2FResourceProviderImplTest.java;h=293d70d26acd79a2ec6c2287c387e874f893bfbc;hb=87a7fca8a3db019e191447526b3e291514aa0725;hp=c132184ca4b0414cd618b806cd82c0d79b2e8097;hpb=93a3060d58c058e5588d249adcf53d968c8e5593;p=integration%2Fcsit.git

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/AssetProviderImplTest.java
similarity index 67%
rename from plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/providers/ResourceProviderImplTest.java
rename to plans/so/integration-etsi-testing/so-simulators/sdc-simulator/src/test/java/org/onap/so/sdcsimulator/providers/AssetProviderImplTest.java
index c132184c..293d70d2 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/AssetProviderImplTest.java
@@ -22,6 +22,10 @@ package org.onap.so.sdcsimulator.providers;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertFalse;
+import static org.onap.so.sdcsimulator.models.AssetType.RESOURCES;
+import static org.onap.so.sdcsimulator.utils.Constants.DOT_CSAR;
+import static org.onap.so.sdcsimulator.utils.Constants.FORWARD_SLASH;
+import static org.onap.so.sdcsimulator.utils.Constants.MAIN_RESOURCE_FOLDER;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -30,7 +34,6 @@ 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;
@@ -39,7 +42,9 @@ import org.springframework.util.StreamUtils;
  * @author Waqas Ikram (waqas.ikram@est.tech)
  * @author Eoin Hanan (eoin.hanan@est.tech)
  */
-public class ResourceProviderImplTest {
+public class AssetProviderImplTest {
+
+    private static final String VNF_RESOURCE_ID = "73522444-e8e9-49c1-be29-d355800aa349";
 
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -51,38 +56,34 @@ public class ResourceProviderImplTest {
 
     @Test
     public void test_getResource_withValidPath_matchContent() throws IOException {
-        final File folder = temporaryFolder.newFolder();
+        final File folder = temporaryFolder.newFolder(RESOURCES.toString());
         final String uuid = UUID.randomUUID().toString();
-        final Path file = Files.createFile(folder.toPath().resolve(uuid + Constants.DOT_CSAR));
+        final Path file = Files.createFile(folder.toPath().resolve(uuid + DOT_CSAR));
 
         Files.write(file, DUMMY_CONTENT.getBytes());
 
-        final ResourceProviderImpl objUnderTest = new ResourceProviderImpl(folder.getPath(), resourcePatternResolver);
+        final AssetProviderImpl objUnderTest = new AssetProviderImpl(folder.getPath(), resourcePatternResolver);
 
-        assertArrayEquals(DUMMY_CONTENT.getBytes(), objUnderTest.getResource(uuid).get());
+        assertArrayEquals(DUMMY_CONTENT.getBytes(), objUnderTest.getAsset(uuid, RESOURCES).get());
     }
 
     @Test
     public void test_getResource_withoutValidPath_matchContent() throws IOException {
-        final ClassPathResource classPathResource = new ClassPathResource(Constants.DEFAULT_CSAR_PATH, this.getClass());
+        final String validCsarPath = MAIN_RESOURCE_FOLDER + RESOURCES + FORWARD_SLASH + VNF_RESOURCE_ID + DOT_CSAR;
+        final ClassPathResource classPathResource = new ClassPathResource(validCsarPath, this.getClass());
 
         final byte[] expectedResult = StreamUtils.copyToByteArray(classPathResource.getInputStream());
 
-        final ResourceProviderImpl objUnderTest = new ResourceProviderImpl("", resourcePatternResolver);
+        final AssetProviderImpl objUnderTest = new AssetProviderImpl("", resourcePatternResolver);
 
-        assertArrayEquals(expectedResult, objUnderTest.getResource(Constants.DEFAULT_CSAR_NAME).get());
+        assertArrayEquals(expectedResult, objUnderTest.getAsset(VNF_RESOURCE_ID, RESOURCES).get());
     }
 
     @Test
     public void test_getResource_unbleToReadFileFromClasspath_emptyOptional() throws IOException {
 
-        final ResourceProviderImpl objUnderTest = new ResourceProviderImpl("", resourcePatternResolver) {
-            @Override
-            String getDefaultCsarPath() {
-                return "/some/dummy/path";
-            }
-        };
-        assertFalse(objUnderTest.getResource(UUID.randomUUID().toString()).isPresent());
+        final AssetProviderImpl objUnderTest = new AssetProviderImpl("", resourcePatternResolver);
+        assertFalse(objUnderTest.getAsset(UUID.randomUUID().toString(), RESOURCES).isPresent());
 
     }
 }