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%2FResourceProviderImplTest.java;fp=plans%2Fso%2Fintegration-etsi-testing%2Fso-simulators%2Fsdc-simulator%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fso%2Fsdcsimulator%2Fproviders%2FResourceProviderImplTest.java;h=9a9f30c364658b2611abc9cfbad712dc128fee9b;hb=07f0edf35f1ebbbe5642c19ad840fa076d9dff8c;hp=a7cb5dd74d151647f35a2b3f39d333ce0279a36c;hpb=86da3849ae2d9503267c6d04af056e9570de649d;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/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());
     }
 }