Code Review
/
integration
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrading current ETSI CSIT to latest honolulu
[integration/csit.git]
/
plans
/
so
/
integration-etsi-testing
/
so-simulators
/
sdc-simulator
/
src
/
test
/
java
/
org
/
onap
/
so
/
sdcsimulator
/
providers
/
ResourceProviderImplTest.java
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
a7cb5dd
..
c132184
100644
(file)
--- 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.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.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;
/**
import org.springframework.util.StreamUtils;
/**
@@
-42,18
+44,22
@@
public class ResourceProviderImplTest {
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
@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();
@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());
Files.write(file, DUMMY_CONTENT.getBytes());
- final ResourceProviderImpl objUnderTest = new ResourceProviderImpl(folder.getPath());
+ final ResourceProviderImpl objUnderTest = new ResourceProviderImpl(folder.getPath()
, resourcePatternResolver
);
- assertArrayEquals(DUMMY_CONTENT.getBytes(), objUnderTest.getResource(
"empty"
).get());
+ assertArrayEquals(DUMMY_CONTENT.getBytes(), objUnderTest.getResource(
uuid
).get());
}
@Test
}
@Test
@@
-62,21
+68,21
@@
public class ResourceProviderImplTest {
final byte[] expectedResult = StreamUtils.copyToByteArray(classPathResource.getInputStream());
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
assertArrayEquals(expectedResult, objUnderTest.getResource(Constants.DEFAULT_CSAR_NAME).get());
}
@Test
- public void test_getResource_unbleTo
r
eadFileFromClasspath_emptyOptional() throws IOException {
+ public void test_getResource_unbleTo
R
eadFileFromClasspath_emptyOptional() throws IOException {
- final ResourceProviderImpl objUnderTest = new ResourceProviderImpl("") {
+ final ResourceProviderImpl objUnderTest = new ResourceProviderImpl(""
, resourcePatternResolver
) {
@Override
String getDefaultCsarPath() {
return "/some/dummy/path";
}
};
@Override
String getDefaultCsarPath() {
return "/some/dummy/path";
}
};
- assertFalse(objUnderTest.getResource(
Constants.DEFAULT_CSAR_NAME
).isPresent());
+ assertFalse(objUnderTest.getResource(
UUID.randomUUID().toString()
).isPresent());
}
}
}
}