From 3e8793276f623132892331cf65c85bb91c1ab154 Mon Sep 17 00:00:00 2001 From: "Baumel, Dvir (db384r)" Date: Mon, 23 Mar 2020 16:21:05 +0200 Subject: Upgrade Junit to version 5.6 Issue-ID: SDC-2844 Change-Id: I4716bf7920f9bb79c450ebfd48e9d4fba54fdfdd Signed-off-by: Baumel, Dvir (db384r) --- asdctool/pom.xml | 14 ++++++ .../TopologyTemplateValidatorExecuterTest.java | 9 ++-- .../VFToscaArtifactValidatorExecutorTest.java | 9 ++-- catalog-be/pom.xml | 14 ++++++ .../merge/input/ComponentInputsMergeBLTest.java | 11 ++++- .../openecomp/sdc/be/ecomp/EcompIntImplTest.java | 55 ++++++++++++---------- .../ecomp/converters/EcompRoleConverterTest.java | 9 ++-- catalog-dao/pom.xml | 14 ++++++ catalog-model/pom.xml | 14 ++++++ common-app-api/pom.xml | 14 ++++++ common-app-logging/pom.xml | 13 +++++ common-be/pom.xml | 12 +++++ .../onap-generic-artifact-browser-service/pom.xml | 10 +++- onboarding/pom.xml | 12 +++++ .../item-permissions-rest-types/pom.xml | 7 --- .../item-rest/item-rest-types/pom.xml | 6 --- .../notifications-rest-types/pom.xml | 6 --- .../pom.xml | 14 ++++++ .../ComponentManagerFactoryTest.java | 4 +- openecomp-be/pom.xml | 12 +++++ pom.xml | 23 ++------- test-apis-ci/pom.xml | 14 ++++++ ui-ci/pom.xml | 14 ++++++ utils/DmaapPublisher/pom.xml | 12 +++++ utils/webseal-simulator/pom.xml | 14 ++++++ 25 files changed, 258 insertions(+), 78 deletions(-) diff --git a/asdctool/pom.xml b/asdctool/pom.xml index 015522b453..dac5063311 100644 --- a/asdctool/pom.xml +++ b/asdctool/pom.xml @@ -446,6 +446,20 @@ test + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + + org.testng testng diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuterTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuterTest.java index 6e3c15d58d..d74aaa49a2 100644 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuterTest.java +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/TopologyTemplateValidatorExecuterTest.java @@ -20,7 +20,8 @@ package org.openecomp.sdc.asdctool.impl.validator.executers; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; @@ -53,12 +54,12 @@ public class TopologyTemplateValidatorExecuterTest { result = testSubject.getName(); } - @Test(expected=NullPointerException.class) - public void testGetVerticesToValidate() throws Exception { + @Test + public void testGetVerticesToValidate() { TopologyTemplateValidatorExecuter testSubject; // default test testSubject = createTestSubject(); - testSubject.getVerticesToValidate(ComponentTypeEnum.PRODUCT); + Assertions.assertThrows(NullPointerException.class, () -> testSubject.getVerticesToValidate(ComponentTypeEnum.PRODUCT)); } } diff --git a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/VFToscaArtifactValidatorExecutorTest.java b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/VFToscaArtifactValidatorExecutorTest.java index bf9436336d..c8edb7d05a 100644 --- a/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/VFToscaArtifactValidatorExecutorTest.java +++ b/asdctool/src/test/java/org/openecomp/sdc/asdctool/impl/validator/executers/VFToscaArtifactValidatorExecutorTest.java @@ -20,7 +20,8 @@ package org.openecomp.sdc.asdctool.impl.validator.executers; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao; import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade; @@ -35,14 +36,14 @@ public class VFToscaArtifactValidatorExecutorTest { return new VFToscaArtifactValidatorExecutor(janusGraphDaoMock, toscaOperationFacade); } - @Test(expected=NullPointerException.class) - public void testExecuteValidations() throws Exception { + @Test + public void testExecuteValidations() { VFToscaArtifactValidatorExecutor testSubject; boolean result; // default test testSubject = createTestSubject(); - result = testSubject.executeValidations(); + Assertions.assertThrows(NullPointerException.class, () -> testSubject.executeValidations()); } @Test diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 66e9dc0173..27d5d6d861 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -577,6 +577,20 @@ test + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + + org.mockito mockito-core diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/input/ComponentInputsMergeBLTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/input/ComponentInputsMergeBLTest.java index 954e6094c1..9868e66ff7 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/input/ComponentInputsMergeBLTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/merge/input/ComponentInputsMergeBLTest.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,6 +23,7 @@ package org.openecomp.sdc.be.components.merge.input; import fj.data.Either; import org.junit.Before; import org.junit.Test; +import org.junit.jupiter.api.DisplayName; import org.mockito.Mockito; import org.openecomp.sdc.be.auditing.impl.AuditingManager; import org.openecomp.sdc.be.components.utils.ObjectGenerator; @@ -60,6 +61,7 @@ public class ComponentInputsMergeBLTest extends BaseComponentInputsMerge { } @Test + @DisplayName("When old component has no inputs then return ok") public void whenOldComponentHasNoInputs_returnOk() { ActionStatus actionStatus = testInstance.mergeComponents(new Resource(), new Resource()); assertThat(actionStatus).isEqualTo(ActionStatus.OK); @@ -67,6 +69,7 @@ public class ComponentInputsMergeBLTest extends BaseComponentInputsMerge { } @Test + @DisplayName("When current resource has no properties no redeclaration of inputs required") public void whenCurrResourceHasNoProperties_noRedeclarationOFInputsRequired() { Resource newResource = new ResourceBuilder().setUniqueId(RESOURCE_ID).build(); when(toscaOperationFacade.updateInputsToComponent(emptyList(), RESOURCE_ID)).thenReturn(Either.left(null)); @@ -77,6 +80,7 @@ public class ComponentInputsMergeBLTest extends BaseComponentInputsMerge { } @Test + @DisplayName("When current resource has no inputs no merge required, update resource with inputs declared in previous version") public void whenCurrResourceHasNoInputs_noMergeRequired_updateResourceWithInputsDeclaredInPrevVersion() { List prevDeclaredInputs = ObjectGenerator.buildInputs("declared1", "declared2"); currResource.setInputs(null); @@ -90,6 +94,7 @@ public class ComponentInputsMergeBLTest extends BaseComponentInputsMerge { } @Test + @DisplayName("Find inputs declared from properties and merge them into new component") public void findInputsDeclaredFromPropertiesAndMergeThemIntoNewComponent() { List prevDeclaredInputs = ObjectGenerator.buildInputs("declared1", "declared2"); List currInputsPreMerge = new ArrayList<>(currResource.getInputs()); @@ -104,6 +109,7 @@ public class ComponentInputsMergeBLTest extends BaseComponentInputsMerge { } @Test + @DisplayName("Identify already existing inputs and don't merge them into new component") public void identifyAlreadyExistingInputsAndDontMergeThemIntoNewComponent() { List prevDeclaredInputs = ObjectGenerator.buildInputs("declared1", "declared2", "input1"); List prevDeclaredInputsNotPresentInCurrent = ObjectGenerator.buildInputs("declared1", "declared2"); @@ -121,6 +127,7 @@ public class ComponentInputsMergeBLTest extends BaseComponentInputsMerge { @Test + @DisplayName("When failing to update inputs propagate the error") public void whenFailingToUpdateInputs_propagateTheError() { Resource newResource = new ResourceBuilder().setUniqueId(RESOURCE_ID).build(); when(toscaOperationFacade.updateInputsToComponent(emptyList(), RESOURCE_ID)).thenReturn(Either.right(StorageOperationStatus.GENERAL_ERROR)); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java index 8db8450e87..778552d485 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/EcompIntImplTest.java @@ -23,7 +23,8 @@ package org.openecomp.sdc.be.ecomp; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.onap.portalsdk.core.onboarding.exception.PortalAPIException; import org.onap.portalsdk.core.restful.domain.EcompRole; @@ -40,69 +41,75 @@ public class EcompIntImplTest { return new EcompIntImpl(); } - @Test(expected=PortalAPIException.class) - public void testPushUser() throws Exception { + @Test + public void testPushUser() { EcompIntImpl testSubject; EcompUser user = null; // default test testSubject = createTestSubject(); - testSubject.pushUser(user); + Assertions.assertThrows(PortalAPIException.class, () -> { + testSubject.pushUser(user); + }); } - @Test(expected=PortalAPIException.class) - public void testEditUser() throws Exception { + @Test + public void testEditUser() { EcompIntImpl testSubject; String loginId = ""; EcompUser user = null; // default test testSubject = createTestSubject(); - testSubject.editUser(loginId, user); + Assertions.assertThrows(PortalAPIException.class, () -> { + testSubject.editUser(loginId, user); + }); } - @Test(expected=PortalAPIException.class) - public void testGetUser() throws Exception { + @Test + public void testGetUser() { EcompIntImpl testSubject; String loginId = ""; - EcompUser result; // default test testSubject = createTestSubject(); - result = testSubject.getUser(loginId); + Assertions.assertThrows(PortalAPIException.class, () -> { + EcompUser result = testSubject.getUser(loginId); + }); } - @Test(expected=PortalAPIException.class) - public void testGetUsers() throws Exception { + @Test + public void testGetUsers() { EcompIntImpl testSubject; - List result; // default test testSubject = createTestSubject(); - result = testSubject.getUsers(); + Assertions.assertThrows(PortalAPIException.class, () -> { + List result = testSubject.getUsers(); + }); + } @Test - public void testGetAvailableRoles() throws Exception { + public void testGetAvailableRoles() throws PortalAPIException{ EcompIntImpl testSubject; - List result; // default test testSubject = createTestSubject(); - result = testSubject.getAvailableRoles("mock-id"); - assertThat(result).hasSameSizeAs(Role.values()); + List result = testSubject.getAvailableRoles("mock-id"); + assertThat(result).hasSameSizeAs(Role.values()); } - - @Test(expected= PortalAPIException.class) - public void testGetUserRoles() throws Exception { + @Test + public void testGetUserRoles() { EcompIntImpl testSubject; String loginId = ""; - List result; // default test testSubject = createTestSubject(); - result = testSubject.getUserRoles(loginId); + Assertions.assertThrows(PortalAPIException.class, () -> { + List result = testSubject.getUserRoles(loginId); + }); } @Test diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters/EcompRoleConverterTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters/EcompRoleConverterTest.java index bbe0c176c8..68e23ceb66 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters/EcompRoleConverterTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/ecomp/converters/EcompRoleConverterTest.java @@ -22,7 +22,8 @@ package org.openecomp.sdc.be.ecomp.converters; import static org.assertj.core.api.Assertions.assertThat; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.onap.portalsdk.core.onboarding.exception.PortalAPIException; import org.onap.portalsdk.core.restful.domain.EcompRole; import org.openecomp.sdc.be.user.Role; @@ -42,10 +43,10 @@ public class EcompRoleConverterTest { } } - @Test(expected = PortalAPIException.class) - public void testConvertEcompRoleToRoleFailure() throws PortalAPIException { + @Test + public void testConvertEcompRoleToRoleFailure() { EcompRole ecompRole = new EcompRole(); ecompRole.setName("mock-name"); - EcompRoleConverter.convertEcompRoleToRole(ecompRole); + Assertions.assertThrows(PortalAPIException.class, () -> EcompRoleConverter.convertEcompRoleToRole(ecompRole)); } } diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index 1fa1c65a3d..f89e5f7efc 100644 --- a/catalog-dao/pom.xml +++ b/catalog-dao/pom.xml @@ -216,6 +216,20 @@ Modifications copyright (c) 2018 Nokia test + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + + org.apache.commons commons-jci-core diff --git a/catalog-model/pom.xml b/catalog-model/pom.xml index 46b79cf507..2b70c4dfb9 100644 --- a/catalog-model/pom.xml +++ b/catalog-model/pom.xml @@ -204,6 +204,20 @@ test + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + + org.mockito mockito-core diff --git a/common-app-api/pom.xml b/common-app-api/pom.xml index 8a9dc1e2c6..10519f94af 100644 --- a/common-app-api/pom.xml +++ b/common-app-api/pom.xml @@ -184,6 +184,20 @@ test + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + + org.mockito mockito-core diff --git a/common-app-logging/pom.xml b/common-app-logging/pom.xml index 3527c1b1cc..a46ba1cdcf 100644 --- a/common-app-logging/pom.xml +++ b/common-app-logging/pom.xml @@ -96,6 +96,19 @@ logging-filter-base ${onap.logging.version} + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + + org.projectlombok lombok diff --git a/common-be/pom.xml b/common-be/pom.xml index 50de3e9874..1b3b8e1a7d 100644 --- a/common-be/pom.xml +++ b/common-be/pom.xml @@ -72,6 +72,18 @@ ${junit.version} test + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + org.mockito mockito-core diff --git a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml index 81555a08f6..b3665dc875 100644 --- a/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml +++ b/common/onap-generic-artifact-browser/onap-generic-artifact-browser-service/pom.xml @@ -58,10 +58,18 @@ ${hamcrest-all.version} test + org.junit.jupiter junit-jupiter - ${junit-jupiter.version} + ${junitJupiter.version} + test + + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} test diff --git a/onboarding/pom.xml b/onboarding/pom.xml index dda15ea941..3275321abf 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -309,6 +309,18 @@ ${junit.version} test + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + org.mockito mockito-all diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-types/pom.xml index 798846e127..7f53daec93 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-permissions-rest/item-permissions-rest-types/pom.xml @@ -9,13 +9,6 @@ swagger-annotations ${swagger.version} - - org.junit.jupiter - junit-jupiter-api - 5.3.1 - test - - diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-types/pom.xml index e385c4b726..7b9692f13d 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/item-rest/item-rest-types/pom.xml @@ -28,12 +28,6 @@ openecomp-sdc-conflict-manager ${project.version} - - org.junit.jupiter - junit-jupiter-api - 5.3.1 - test - diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/pom.xml index 952ba4fc06..1be303c7c0 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-rest/notifications-rest-types/pom.xml @@ -9,12 +9,6 @@ openecomp-sdc-datatypes-lib ${project.version} - - org.junit.jupiter - junit-jupiter-api - 5.3.1 - test - diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml index f8c548b077..0857e1d4ff 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/pom.xml @@ -232,6 +232,20 @@ test-jar test + + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/ComponentManagerFactoryTest.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/ComponentManagerFactoryTest.java index 7d59215847..07909281d9 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/ComponentManagerFactoryTest.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/ComponentManagerFactoryTest.java @@ -19,9 +19,9 @@ */ package org.openecomp.sdc.vendorsoftwareproduct; -import static org.junit.Assert.assertNotNull; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import static org.junit.Assert.assertNotNull; public class ComponentManagerFactoryTest { diff --git a/openecomp-be/pom.xml b/openecomp-be/pom.xml index 7c99ba52c6..79bef95f81 100644 --- a/openecomp-be/pom.xml +++ b/openecomp-be/pom.xml @@ -55,6 +55,18 @@ ${togglz.version} test + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + diff --git a/pom.xml b/pom.xml index 81e917bf2a..fb54ec1f26 100644 --- a/pom.xml +++ b/pom.xml @@ -113,8 +113,10 @@ Modifications copyright (c) 2018-2019 Nokia 2.18.3 + 3.3.3 1.33 4.12 + 5.6.0 3.10.0 6.14.3 3.0.3 @@ -122,9 +124,6 @@ Modifications copyright (c) 2018-2019 Nokia 0.11 2.1 1.3 - 5.4.0 - 5.4.0 - 1.1.0 2.22.0 2.4 @@ -245,21 +244,6 @@ Modifications copyright (c) 2018-2019 Nokia netty-handler ${netty.version} - - org.junit.platform - junit-platform-launcher - ${junit-platform.version} - - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - - - org.junit.vintage - junit-vintage-engine - ${junit-vintage.version} - @@ -306,6 +290,9 @@ Modifications copyright (c) 2018-2019 Nokia org.apache.maven.plugins maven-assembly-plugin 3.1.0 + + posix + diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml index 5cd8bae40c..456aeae1e7 100644 --- a/test-apis-ci/pom.xml +++ b/test-apis-ci/pom.xml @@ -32,6 +32,20 @@ compile + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + + org.assertj assertj-core diff --git a/ui-ci/pom.xml b/ui-ci/pom.xml index 46800236b1..0768f6bb51 100644 --- a/ui-ci/pom.xml +++ b/ui-ci/pom.xml @@ -190,6 +190,20 @@ compile + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + + org.testng testng diff --git a/utils/DmaapPublisher/pom.xml b/utils/DmaapPublisher/pom.xml index 6152fdff83..5437f4e978 100644 --- a/utils/DmaapPublisher/pom.xml +++ b/utils/DmaapPublisher/pom.xml @@ -64,6 +64,18 @@ 4.12 test + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + org.mockito mockito-core diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml index ed38278b7f..214671c65c 100644 --- a/utils/webseal-simulator/pom.xml +++ b/utils/webseal-simulator/pom.xml @@ -30,6 +30,20 @@ test + + org.junit.jupiter + junit-jupiter + ${junitJupiter.version} + test + + + + org.mockito + mockito-junit-jupiter + ${mockitoJupiter.version} + test + + javax.servlet servlet-api -- cgit 1.2.3-korg