aboutsummaryrefslogtreecommitdiffstats
path: root/prh-app-server/src/test/java
diff options
context:
space:
mode:
authorpwielebs <piotr.wielebski@nokia.com>2018-06-04 15:43:27 +0200
committerpwielebs <piotr.wielebski@nokia.com>2018-06-04 15:43:27 +0200
commit53e33ec68a6eb0a06ea130215e03a7725da9d22d (patch)
treeb39721025dbb39a5fb1487c72dd498ecd410b1fe /prh-app-server/src/test/java
parent04fdbd0e18a891241ed068044093a257ff506400 (diff)
2nd fix for DmaapConsumerJsonParser
Change-Id: I0b5fa7e2a1e8472f72e636a84ef6d2285580b494 Issue-ID: DCAEGEN2-451 Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
Diffstat (limited to 'prh-app-server/src/test/java')
-rw-r--r--prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParserTest.java34
1 files changed, 15 insertions, 19 deletions
diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParserTest.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParserTest.java
index 067a528d..da293a45 100644
--- a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParserTest.java
+++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParserTest.java
@@ -59,7 +59,7 @@ class DmaapConsumerJsonParserTest {
+ "\"pnfVendorName\":\"Nokia\"}}}]";
@Test
- public void whenPassingCorrectJson_validationNotThrowingAnException() throws DmaapNotFoundException {
+ void whenPassingCorrectJson_validationNotThrowingAnException() throws DmaapNotFoundException {
//given
String message =
"[{\"event\":{\"commonEventHeader\":{\"domain\":\"other\",\"eventId\":\"<<SerialNumber>>-reg\",\"eventName\""
@@ -84,7 +84,7 @@ class DmaapConsumerJsonParserTest {
@Test
- public void whenPassingCorrectJsonWihoutIPV4_validationNotThrowingAnException() throws DmaapNotFoundException {
+ void whenPassingCorrectJsonWithoutIPV4_validationNotThrowingAnException() throws DmaapNotFoundException {
//given
String message =
"[{\"event\":{\"commonEventHeader\":{\"domain\":\"other\",\"eventId\":\"<<SerialNumber>>-reg\",\"eventName\""
@@ -108,7 +108,7 @@ class DmaapConsumerJsonParserTest {
}
@Test
- public void whenPassingCorrectJsonWihoutIPV6_validationNotThrowingAnException() throws DmaapNotFoundException {
+ void whenPassingCorrectJsonWihoutIPV6_validationNotThrowingAnException() throws DmaapNotFoundException {
//given
String message =
"[{\"event\":{\"commonEventHeader\":{\"domain\":\"other\",\"eventId\":\"<<SerialNumber>>-reg\",\"eventName\""
@@ -131,7 +131,7 @@ class DmaapConsumerJsonParserTest {
}
@Test
- public void whenPassingCorrectJsonWihoutIPV4andIPV6_validationThrowingAnException() {
+ void whenPassingCorrectJsonWihoutIPV4andIPV6_validationThrowingAnException() {
String message =
"[{\"event\":{\"commonEventHeader\":{\"domain\":\"other\",\"eventId\":\"<<SerialNumber>>-reg\",\"eventName\""
+ ":\"pnfRegistration_5GDU\",\"eventType\":\"pnfRegistration\",\"internalHeaderFields\":{},"
@@ -142,29 +142,25 @@ class DmaapConsumerJsonParserTest {
+ ":1517206400,\"pnfManufactureDate\":1516406400,\"pnfModelNumber\":\"AJ02\",\"pnfSoftwareVersion\":"
+ "\"v4.5.0.1\",\"pnfType\":\"AirScale\",\"pnfVendorName\":\"Nokia\"}}}]";
- Assertions.assertThrows(DmaapNotFoundException.class, () -> {
- DmaapConsumerJsonParser.getJsonObject(message);
- });
+ Assertions.assertThrows(DmaapNotFoundException.class,
+ () -> DmaapConsumerJsonParser.getJsonObject(message));
}
@Test
- public void whenPassingJsonWithoutMandatoryHeaderInformation_validationThrowingAnException() {
- Assertions.assertThrows(DmaapNotFoundException.class, () -> {
- DmaapConsumerJsonParser.getJsonObject(incorrectMessage);
- });
+ void whenPassingJsonWithoutMandatoryHeaderInformation_validationThrowingAnException() {
+ Assertions.assertThrows(DmaapNotFoundException.class,
+ () -> DmaapConsumerJsonParser.getJsonObject(incorrectMessage));
}
@Test
- public void whenPassingJsonWithoutPnfSerialNumberOrPnfVendorName_validationThrowingAnException() {
- Assertions.assertThrows(DmaapNotFoundException.class, () -> {
- DmaapConsumerJsonParser.getJsonObject(jsonWithoutPnfVendorAndSerialNumber);
- });
+ void whenPassingJsonWithoutPnfSerialNumberOrPnfVendorName_validationThrowingAnException() {
+ Assertions.assertThrows(DmaapNotFoundException.class,
+ () -> DmaapConsumerJsonParser.getJsonObject(jsonWithoutPnfVendorAndSerialNumber));
}
@Test
- public void whenPassingJsonWithoutIPInformation_validationThrowingAnException() {
- Assertions.assertThrows(DmaapNotFoundException.class, () -> {
- DmaapConsumerJsonParser.getJsonObject(jsonWithoutIPInformation);
- });
+ void whenPassingJsonWithoutIPInformation_validationThrowingAnException() {
+ Assertions.assertThrows(DmaapNotFoundException.class,
+ () -> DmaapConsumerJsonParser.getJsonObject(jsonWithoutIPInformation));
}
} \ No newline at end of file