X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fbabel%2Futil%2FTestRequestValidator.java;h=b190070abb0c4616363765e49a8266b8eaca3f75;hb=176c445bbeb5e47011ff2ca4816c00dd0f6ea779;hp=db7d8825e635cf88b98a1d7570aa085768e31fdf;hpb=811169825805a7160a6dd28abb281f64a4a56c71;p=aai%2Fbabel.git

diff --git a/src/test/java/org/onap/aai/babel/util/TestRequestValidator.java b/src/test/java/org/onap/aai/babel/util/TestRequestValidator.java
index db7d882..b190070 100644
--- a/src/test/java/org/onap/aai/babel/util/TestRequestValidator.java
+++ b/src/test/java/org/onap/aai/babel/util/TestRequestValidator.java
@@ -20,50 +20,51 @@
  */
 package org.onap.aai.babel.util;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
 import org.onap.aai.babel.service.data.BabelRequest;
 
 public class TestRequestValidator {
 
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-
     @Test
     public void testMissingArtifactNameExceptionThrown() throws Exception {
-        exception.expect(RequestValidationException.class);
-        exception.expectMessage("No artifact name attribute found in the request body.");
+        Throwable exception = assertThrows(RequestValidationException.class, () -> {
 
-        BabelRequest request = new BabelRequest();
-        request.setCsar("UEsDBBQACAgIAGsrz0oAAAAAAAAAAAAAAAAJAAAAY3Nhci5tZXRhC3Z");
-        request.setArtifactVersion("1.0");
-        request.setArtifactName(null);
-        new RequestValidator().validateRequest(request);
+            BabelRequest request = new BabelRequest();
+            request.setCsar("UEsDBBQACAgIAGsrz0oAAAAAAAAAAAAAAAAJAAAAY3Nhci5tZXRhC3Z");
+            request.setArtifactVersion("1.0");
+            request.setArtifactName(null);
+            new RequestValidator().validateRequest(request);
+        });
+        assertTrue(exception.getMessage().contains("No artifact name attribute found in the request body."));
     }
 
     @Test
     public void testMissingArtifactVersionExceptionThrown() throws Exception {
-        exception.expect(RequestValidationException.class);
-        exception.expectMessage("No artifact version attribute found in the request body.");
+        Throwable exception = assertThrows(RequestValidationException.class, () -> {
 
-        BabelRequest request = new BabelRequest();
-        request.setCsar("UEsDBBQACAgIAGsrz0oAAAAAAAAAAAAAAAAJAAAAY3Nhci5tZXRhC3Z");
-        request.setArtifactVersion(null);
-        request.setArtifactName("hello");
-        new RequestValidator().validateRequest(request);
+            BabelRequest request = new BabelRequest();
+            request.setCsar("UEsDBBQACAgIAGsrz0oAAAAAAAAAAAAAAAAJAAAAY3Nhci5tZXRhC3Z");
+            request.setArtifactVersion(null);
+            request.setArtifactName("hello");
+            new RequestValidator().validateRequest(request);
+        });
+        assertTrue(exception.getMessage().contains("No artifact version attribute found in the request body."));
     }
 
     @Test
     public void testMissingCsarFile() throws Exception {
-        exception.expect(RequestValidationException.class);
-        exception.expectMessage("No csar attribute found in the request body.");
+        Throwable exception = assertThrows(RequestValidationException.class, () -> {
 
-        BabelRequest request = new BabelRequest();
-        request.setCsar(null);
-        request.setArtifactVersion("1.0");
-        request.setArtifactName("hello");
-        new RequestValidator().validateRequest(request);
+            BabelRequest request = new BabelRequest();
+            request.setCsar(null);
+            request.setArtifactVersion("1.0");
+            request.setArtifactName("hello");
+            new RequestValidator().validateRequest(request);
+        });
+        assertTrue(exception.getMessage().contains("No csar attribute found in the request body."));
     }
 
 }