Update aai-parent in babel to 1.13.3

[aai/babel.git] / src / test / java / org / onap / aai / babel / util / TestRequestValidator.java

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 030c24d..b190070 100644 (file)
--- a/src/test/java/org/onap/aai/babel/util/TestRequestValidator.java
+++ b/src/test/java/org/onap/aai/babel/util/TestRequestValidator.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017 European Software Marketing Ltd.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 European Software Marketing Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,56 +17,54 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 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.");
-        
-        BabelRequest request = new BabelRequest();
-        request.setCsar("UEsDBBQACAgIAGsrz0oAAAAAAAAAAAAAAAAJAAAAY3Nhci5tZXRhC3Z");
-        request.setArtifactVersion("1.0");
-        request.setArtifactName(null);
-        RequestValidator.validateRequest(request);       
-        }
-    
+    public void testMissingArtifactNameExceptionThrown() throws Exception {
+        Throwable exception = assertThrows(RequestValidationException.class, () -> {
 
-       @Test
-    public void testMissingArtifactVersionExceptionThrown() throws Exception{
-           exception.expect(RequestValidationException.class);
-           exception.expectMessage("No artifact version attribute found in the request body.");
-           
-        BabelRequest request = new BabelRequest();
-        request.setCsar("UEsDBBQACAgIAGsrz0oAAAAAAAAAAAAAAAAJAAAAY3Nhci5tZXRhC3Z");
-        request.setArtifactVersion(null);
-        request.setArtifactName("hello");
-        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 testMissingCsarFile() throws Exception{
-        exception.expect(RequestValidationException.class);
-        exception.expectMessage("No csar attribute found in the request body.");
-        
-        BabelRequest request = new BabelRequest();
-        request.setCsar(null);
-        request.setArtifactVersion("1.0");
-        request.setArtifactName("hello");
-        RequestValidator.validateRequest(request);            
+    public void testMissingArtifactVersionExceptionThrown() throws Exception {
+        Throwable exception = assertThrows(RequestValidationException.class, () -> {
+
+            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 {
+        Throwable exception = assertThrows(RequestValidationException.class, () -> {
+
+            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."));
     }
 
 }