Code Review
/
nonrtric
/
plt
/
rappmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add reason for rApp priming/depriming failures
[nonrtric/plt/rappmanager.git]
/
rapp-manager-dme
/
src
/
test
/
java
/
com
/
oransc
/
rappmanager
/
dme
/
service
/
DmeDeployerTest.java
diff --git
a/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java
b/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java
index
5b97b2d
..
d5fb291
100755
(executable)
--- a/
rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java
+++ b/
rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java
@@
-18,8
+18,8
@@
package com.oransc.rappmanager.dme.service;
package com.oransc.rappmanager.dme.service;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
@@
-51,6
+51,7
@@
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
@@
-103,7
+104,8
@@
class DmeDeployerTest {
@ParameterizedTest
@MethodSource("getSuccessParamsWithUnavailableInfoTypes")
@ParameterizedTest
@MethodSource("getSuccessParamsWithUnavailableInfoTypes")
- void testPrimeRappSuccessWithUnavailableInfoType(String rappFile, boolean result) throws JsonProcessingException {
+ void testPrimeRappSuccessWithUnavailableInfoType(String rappFile, boolean isSuccess)
+ throws JsonProcessingException {
RappResources rappResources = rappDmeResourceBuilder.getResources();
Rapp rapp = getRapp(Optional.empty());
rapp.setPackageName(rappFile);
RappResources rappResources = rappDmeResourceBuilder.getResources();
Rapp rapp = getRapp(Optional.empty());
rapp.setPackageName(rappFile);
@@
-116,7
+118,11
@@
class DmeDeployerTest {
if (rappFile.equals(validRappFileNewInfoType)) {
mockServer.verify();
}
if (rappFile.equals(validRappFileNewInfoType)) {
mockServer.verify();
}
- assertEquals(rapp.getIsDmeValid(), result);
+ if (isSuccess) {
+ assertNull(rapp.getReason());
+ } else {
+ assertNotNull(rapp.getReason());
+ }
}
private static Stream<Arguments> getSuccessParamsWithUnavailableInfoTypes() {
}
private static Stream<Arguments> getSuccessParamsWithUnavailableInfoTypes() {
@@
-124,8
+130,8
@@
class DmeDeployerTest {
}
@ParameterizedTest
}
@ParameterizedTest
- @
MethodSource("getSuccessParamsWithAvailableInfoTypes"
)
- void testPrimeRappSuccessWithValidInfoType(String rappFile
, boolean result
) throws JsonProcessingException {
+ @
ValueSource(strings = {validRappFile, validRappFileNewInfoType}
)
+ void testPrimeRappSuccessWithValidInfoType(String rappFile) throws JsonProcessingException {
RappResources rappResources = rappDmeResourceBuilder.getResources();
Rapp rapp = getRapp(Optional.empty());
rapp.setPackageName(rappFile);
RappResources rappResources = rappDmeResourceBuilder.getResources();
Rapp rapp = getRapp(Optional.empty());
rapp.setPackageName(rappFile);
@@
-138,11
+144,7
@@
class DmeDeployerTest {
if (rappFile.equals(validRappFileNewInfoType)) {
mockServer.verify();
}
if (rappFile.equals(validRappFileNewInfoType)) {
mockServer.verify();
}
- assertEquals(rapp.getIsDmeValid(), result);
- }
-
- private static Stream<Arguments> getSuccessParamsWithAvailableInfoTypes() {
- return Stream.of(Arguments.of(validRappFile, true), Arguments.of(validRappFileNewInfoType, true));
+ assertNull(rapp.getReason());
}
@Test
}
@Test
@@
-156,15
+158,14
@@
class DmeDeployerTest {
Rapp rapp = getRapp(Optional.empty());
rapp.setRappResources(rappResources);
assertFalse(dmeDeployer.primeRapp(rapp));
Rapp rapp = getRapp(Optional.empty());
rapp.setRappResources(rappResources);
assertFalse(dmeDeployer.primeRapp(rapp));
- assertFalse(rapp.get
IsDmeValid
());
+ assertFalse(rapp.get
Reason().isEmpty
());
}
@Test
void testDeprimeRapp() {
Rapp rapp = getRapp(Optional.empty());
}
@Test
void testDeprimeRapp() {
Rapp rapp = getRapp(Optional.empty());
- rapp.setIsDmeValid(true);
assertTrue(dmeDeployer.deprimeRapp(rapp));
assertTrue(dmeDeployer.deprimeRapp(rapp));
- assertNull(rapp.get
IsDmeValid
());
+ assertNull(rapp.get
Reason
());
}
@Test
}
@Test