diff options
author | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-03-01 13:35:53 +0100 |
---|---|---|
committer | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-03-01 13:36:47 +0100 |
commit | 176c445bbeb5e47011ff2ca4816c00dd0f6ea779 (patch) | |
tree | d759d004aaf58aa38a29b1e9656c28786ca423f2 /src/test/java/org/onap/aai/babel/util/TestRequestValidator.java | |
parent | 811169825805a7160a6dd28abb281f64a4a56c71 (diff) |
Update aai-parent in babel to 1.13.3
- update aai-parent from 1.9.4 to 1.13.3
- update spring-boot from 2.1 to 2.4
- migrate junit 4 to junit 5
Issue-ID: AAI-3791
Change-Id: I849c830f9f0addfb2d4d48d20f038afd401858d2
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Diffstat (limited to 'src/test/java/org/onap/aai/babel/util/TestRequestValidator.java')
-rw-r--r-- | src/test/java/org/onap/aai/babel/util/TestRequestValidator.java | 55 |
1 files changed, 28 insertions, 27 deletions
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.")); } } |