From fedb718f1fc5fa2815448c518263d1a414c9216d Mon Sep 17 00:00:00 2001 From: jonathanaustin Date: Fri, 6 Mar 2020 14:19:51 +1100 Subject: [PATCH 1/3] model-api unit tests --- model-api/pom.xml | 17 ++++----- model-api/spotbugs-exclude-filter.xml | 9 ----- .../app/model/client/ModelPojoTest.java | 37 +++++++++++++++++++ model-mock-impl/pom.xml | 5 --- pom.xml | 13 ++++--- 5 files changed, 52 insertions(+), 29 deletions(-) delete mode 100644 model-api/spotbugs-exclude-filter.xml create mode 100644 model-api/src/test/java/com/sample/app/model/client/ModelPojoTest.java diff --git a/model-api/pom.xml b/model-api/pom.xml index 7021d8b..159fd7a 100644 --- a/model-api/pom.xml +++ b/model-api/pom.xml @@ -15,22 +15,19 @@ jar - - ${basedir}/spotbugs-exclude-filter.xml - - - - commons-io - commons-io - - + org.junit.vintage junit-vintage-engine test - + + + com.openpojo + openpojo + test + diff --git a/model-api/spotbugs-exclude-filter.xml b/model-api/spotbugs-exclude-filter.xml deleted file mode 100644 index dcdf31f..0000000 --- a/model-api/spotbugs-exclude-filter.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/model-api/src/test/java/com/sample/app/model/client/ModelPojoTest.java b/model-api/src/test/java/com/sample/app/model/client/ModelPojoTest.java new file mode 100644 index 0000000..529812a --- /dev/null +++ b/model-api/src/test/java/com/sample/app/model/client/ModelPojoTest.java @@ -0,0 +1,37 @@ +package com.sample.app.model.client; + +import com.openpojo.reflection.filters.FilterPackageInfo; +import com.openpojo.validation.Validator; +import com.openpojo.validation.ValidatorBuilder; +import com.openpojo.validation.rule.impl.GetterMustExistRule; +import com.openpojo.validation.rule.impl.SetterMustExistRule; +import com.openpojo.validation.test.impl.GetterTester; +import com.openpojo.validation.test.impl.SerializableTester; +import com.openpojo.validation.test.impl.SetterTester; +import org.junit.Test; + +/** + * Unit tests for model POJOs. + */ +public class ModelPojoTest { + + // The package to test + private static final String POJO_PACKAGE = "com.sample.app.model.client"; + + @Test + public void testPojoStructureAndBehavior() { + Validator validator = ValidatorBuilder.create() + // Add Rules to validate structure for POJO_PACKAGE + // See com.openpojo.validation.rule.impl for more ... + .with(new GetterMustExistRule()) + .with(new SetterMustExistRule()) + // Add Testers to validate behaviour for POJO_PACKAGE + // See com.openpojo.validation.test.impl for more ... + .with(new SetterTester()) + .with(new GetterTester()) + .with(new SerializableTester()) + .build(); + + validator.validate(POJO_PACKAGE, new FilterPackageInfo()); + } +} diff --git a/model-mock-impl/pom.xml b/model-mock-impl/pom.xml index 88b62d9..043437d 100644 --- a/model-mock-impl/pom.xml +++ b/model-mock-impl/pom.xml @@ -27,11 +27,6 @@ ${project.version} - - commons-io - commons-io - - org.junit.vintage junit-vintage-engine diff --git a/pom.xml b/pom.xml index ac49e05..04687a4 100644 --- a/pom.xml +++ b/pom.xml @@ -132,11 +132,7 @@ 1.0.6-beta-1 - - commons-io - commons-io - 2.6 - + commons-logging commons-logging @@ -216,6 +212,13 @@ 2.2 + + + com.openpojo + openpojo + 0.8.13 + + From 7086b92aaf4794819813e2957b4f49eef3a5df85 Mon Sep 17 00:00:00 2001 From: jonathanaustin Date: Fri, 6 Mar 2020 16:51:48 +1100 Subject: [PATCH 2/3] First BDD unit test --- model-bdd/pom.xml | 2 +- .../bdd/features/RetrieveApplication.feature | 13 --- .../api/bdd/features/RetrieveClient.feature | 17 ++++ model-mock-impl/pom.xml | 84 ++++++++++++++++++- .../model/impl/ClientServicesMockImpl.java | 31 ++++++- .../sample/app/model/impl/MockDataUtil.java | 41 ++++++--- .../app/model/bdd/runner/RunCucumberTest.java | 30 +++++++ .../bdd/steps/RetrieveApplicationSteps.java | 56 +++++++++++++ .../test/resources/bordertech-app.properties | 6 ++ pom.xml | 8 +- 10 files changed, 254 insertions(+), 34 deletions(-) delete mode 100644 model-bdd/src/main/resources/api/bdd/features/RetrieveApplication.feature create mode 100644 model-bdd/src/main/resources/api/bdd/features/RetrieveClient.feature create mode 100644 model-mock-impl/src/test/java/com/sample/app/model/bdd/runner/RunCucumberTest.java create mode 100644 model-mock-impl/src/test/java/com/sample/app/model/bdd/steps/RetrieveApplicationSteps.java create mode 100644 model-mock-impl/src/test/resources/bordertech-app.properties diff --git a/model-bdd/pom.xml b/model-bdd/pom.xml index 2e8228a..d2f8e6e 100644 --- a/model-bdd/pom.xml +++ b/model-bdd/pom.xml @@ -14,4 +14,4 @@ model-bdd model-bdd - \ No newline at end of file + diff --git a/model-bdd/src/main/resources/api/bdd/features/RetrieveApplication.feature b/model-bdd/src/main/resources/api/bdd/features/RetrieveApplication.feature deleted file mode 100644 index 1701aff..0000000 --- a/model-bdd/src/main/resources/api/bdd/features/RetrieveApplication.feature +++ /dev/null @@ -1,13 +0,0 @@ -Feature: Retrieve application - User wants to retrieve an application - -Background: Retrieve application available - Given A retrieve application service is available - -Scenario: Retrieve a valid application - When User retrieves application "testid" - Then User gets "testid" application - -Scenario: Retrieve an invalid application - When User retrieves application "error" - Then User gets application exception for "error" diff --git a/model-bdd/src/main/resources/api/bdd/features/RetrieveClient.feature b/model-bdd/src/main/resources/api/bdd/features/RetrieveClient.feature new file mode 100644 index 0000000..08f58a5 --- /dev/null +++ b/model-bdd/src/main/resources/api/bdd/features/RetrieveClient.feature @@ -0,0 +1,17 @@ +Feature: Retrieve client details + User wants to retrieve a client + +Background: Client service available + Given A client retrieve service is available + +Scenario: Retrieve a valid client + When User retrieves client "ORG1" + Then User gets "ORG1" client + +Scenario: Retrieve an invalid client + When User retrieves client "notfound" + Then User gets client exception for "notfound" + +Scenario: Retrieve a client has a system error + When User retrieves client "error" + Then User gets service exception for "error" diff --git a/model-mock-impl/pom.xml b/model-mock-impl/pom.xml index 043437d..42e81cb 100644 --- a/model-mock-impl/pom.xml +++ b/model-mock-impl/pom.xml @@ -17,21 +17,101 @@ MOCK Model API Implemention + false ${basedir}/spotbugs-exclude-filter.xml + + + com.github.bordertech.sample.app model-api ${project.version} + + + commons-io + commons-io + + + - org.junit.vintage - junit-vintage-engine + com.github.bordertech.sample.app + model-bdd + ${project.version} + test + + + + + junit + junit + 4.12 + test + + + + + net.serenity-bdd + serenity-core + 2.1.8 + test + + + io.cucumber + cucumber-core + + + + + net.serenity-bdd + serenity-cucumber4 + 2.1.2 + test + + + + io.cucumber + cucumber-core + 4.8.1 + test + + + io.cucumber + cucumber-junit + 4.8.1 + test + + + + com.google.guava + guava + 28.0-jre test + + + + + + net.serenity-bdd.maven.plugins + serenity-maven-plugin + 2.1.8 + + + serenity-reports + post-integration-test + + aggregate + + + + + + \ No newline at end of file diff --git a/model-mock-impl/src/main/java/com/sample/app/model/impl/ClientServicesMockImpl.java b/model-mock-impl/src/main/java/com/sample/app/model/impl/ClientServicesMockImpl.java index b0ecc1d..92d07cd 100644 --- a/model-mock-impl/src/main/java/com/sample/app/model/impl/ClientServicesMockImpl.java +++ b/model-mock-impl/src/main/java/com/sample/app/model/impl/ClientServicesMockImpl.java @@ -27,6 +27,11 @@ public List retrieveTables() throws ServiceException { @Override public List retrieveCodes(final String table) throws ServiceException { + // Mock error + if (ERROR_REQ.equals(table)) { + throw new ServiceException("Mock table error"); + } + List options = MockDataUtil.retrieveTableCodes(table); if (options == null) { throw new ServiceException("Table not found [" + table + "]"); @@ -37,10 +42,12 @@ public List retrieveCodes(final String table) throws ServiceExceptio @Override public List searchClients(final String search) throws ServiceException { + // Mock error if (ERROR_REQ.equals(search)) { throw new ServiceException("Mock search error"); } + // None found if (NONE_REQ.equals(search)) { return Collections.EMPTY_LIST; } @@ -50,6 +57,10 @@ public List searchClients(final String search) throws ServiceExcep @Override public ClientDetail retrieveClient(final String clientId) throws ServiceException, ClientNotFoundException { + // Mock error + if (ERROR_REQ.equals(clientId)) { + throw new ServiceException("Mock retrieve client error"); + } ClientDetail detail = MockDataUtil.retrieveClient(clientId); if (detail == null) { throw new ClientNotFoundException(); @@ -59,6 +70,7 @@ public ClientDetail retrieveClient(final String clientId) throws ServiceExceptio @Override public ClientDetail createClient(final ClientDetail detail) throws ServiceException { + // Mock error if (ERROR_REQ.equals(detail.getName())) { throw new ServiceException("Mock create client error"); } @@ -67,13 +79,14 @@ public ClientDetail createClient(final ClientDetail detail) throws ServiceExcept @Override public ClientDetail updateClient(final ClientDetail detail) throws ServiceException { + // Mock error if (ERROR_REQ.equals(detail.getName())) { throw new ServiceException("Mock update client error"); } String key = detail.getClientId(); if (MockDataUtil.retrieveClient(key) == null) { - throw new ServiceException("Organisation does not exist [" + key + "]."); + throw new ServiceException("Client does not exist [" + key + "]."); } // Update MockDataUtil.updateClient(detail); @@ -82,9 +95,14 @@ public ClientDetail updateClient(final ClientDetail detail) throws ServiceExcept @Override public void deleteClient(final String clientId) throws ServiceException { + // Mock error + if (ERROR_REQ.equals(clientId)) { + throw new ServiceException("Mock delete client error"); + } + // Check exists if (MockDataUtil.retrieveClient(clientId) == null) { - throw new ServiceException("Organisation does not exist [" + clientId + "]."); + throw new ServiceException("Client does not exist [" + clientId + "]."); } // Remove MockDataUtil.deleteClient(clientId); @@ -92,12 +110,19 @@ public void deleteClient(final String clientId) throws ServiceException { @Override public List retrieveClientDocuments(final String clientId) throws ServiceException, ClientNotFoundException { + // Mock error + if (ERROR_REQ.equals(clientId)) { + throw new ServiceException("Mock retrieve client documents"); + } return MockDataUtil.getOrCreateClientDocuments(clientId); } @Override public DocumentContent retrieveDocument(final String documentId) throws ServiceException, DocumentNotFoundException { - + // Mock error + if (ERROR_REQ.equals(documentId)) { + throw new ServiceException("Mock retrieve document content"); + } DocumentDetail doc = MockDataUtil.retrieveDocument(documentId); if (doc == null) { throw new DocumentNotFoundException(); diff --git a/model-mock-impl/src/main/java/com/sample/app/model/impl/MockDataUtil.java b/model-mock-impl/src/main/java/com/sample/app/model/impl/MockDataUtil.java index d8035c1..ffe8d90 100644 --- a/model-mock-impl/src/main/java/com/sample/app/model/impl/MockDataUtil.java +++ b/model-mock-impl/src/main/java/com/sample/app/model/impl/MockDataUtil.java @@ -22,18 +22,14 @@ */ public final class MockDataUtil { - private static final AtomicInteger CLIENT_IDS = new AtomicInteger(1); + private static final AtomicInteger CLIENT_IDS = new AtomicInteger(); private static final Map CLIENTS = new HashMap<>(); private static final Map> CLIENT_DOCUMENTS = new HashMap<>(); private static final Map DOCUMENTS = new HashMap<>(); - private static final Map> TABLES = createTables(); + private static final Map> TABLES = new HashMap<>(); static { - for (int i = 1; i < 10; i++) { - ClientDetail client = createOrganisation(CLIENT_IDS.getAndIncrement()); - CLIENTS.put(client.getClientId(), client); - } - + resetData(); } /** @@ -43,6 +39,14 @@ private MockDataUtil() { // Do nothing } + /** + * Reset the mock data. + */ + public static void resetData() { + setupClients(); + setupTables(); + } + /** * @return the list of available table names */ @@ -154,25 +158,36 @@ public static DocumentContent retrieveContent(final DocumentDetail doc) { return new DocumentContent(doc.getDocumentId(), bytes, doc.getResourcePath(), mime); } - private static Map> createTables() { + private static void setupClients() { - Map> tables = new HashMap<>(); + CLIENT_IDS.set(1); + CLIENTS.clear(); + CLIENT_DOCUMENTS.clear(); + DOCUMENTS.clear(); + + for (int i = 1; i < 10; i++) { + ClientDetail client = createOrganisation(CLIENT_IDS.getAndIncrement()); + CLIENTS.put(client.getClientId(), client); + } + } + + private static void setupTables() { + + TABLES.clear(); // Country List options = new ArrayList<>(); options.add(new CodeOption("A", "Australia")); options.add(new CodeOption("NZ", "New Zealand")); options.add(new CodeOption("UK", "United Kingdom")); - tables.put("country", options); + TABLES.put("country", options); // Currency options = new ArrayList<>(); options.add(new CodeOption("AUD", "Australia Dollar")); options.add(new CodeOption("GBP", "British Pound")); options.add(new CodeOption("USD", "US Dollar")); - tables.put("currency", options); - - return tables; + TABLES.put("currency", options); } private static ClientDetail createOrganisation(final int idx) { diff --git a/model-mock-impl/src/test/java/com/sample/app/model/bdd/runner/RunCucumberTest.java b/model-mock-impl/src/test/java/com/sample/app/model/bdd/runner/RunCucumberTest.java new file mode 100644 index 0000000..436ebe2 --- /dev/null +++ b/model-mock-impl/src/test/java/com/sample/app/model/bdd/runner/RunCucumberTest.java @@ -0,0 +1,30 @@ +package com.sample.app.model.bdd.runner; + +import com.sample.app.model.impl.MockDataUtil; +import cucumber.api.CucumberOptions; +import net.serenitybdd.cucumber.CucumberWithSerenity; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; + +/** + * Run cucumber tests. + */ +@RunWith(CucumberWithSerenity.class) +@CucumberOptions( + strict = false, + features = "classpath:api/bdd/features", + glue = {"com.sample.app.model.bdd.steps"} +) +public class RunCucumberTest { + + @BeforeClass + public static void startTomcat() { + MockDataUtil.resetData(); + } + + @AfterClass + public static void closeTomcat() { + MockDataUtil.resetData(); + } +} diff --git a/model-mock-impl/src/test/java/com/sample/app/model/bdd/steps/RetrieveApplicationSteps.java b/model-mock-impl/src/test/java/com/sample/app/model/bdd/steps/RetrieveApplicationSteps.java new file mode 100644 index 0000000..86157e8 --- /dev/null +++ b/model-mock-impl/src/test/java/com/sample/app/model/bdd/steps/RetrieveApplicationSteps.java @@ -0,0 +1,56 @@ +package com.sample.app.model.bdd.steps; + +import com.sample.app.model.client.ClientDetail; +import com.sample.app.model.exception.ClientNotFoundException; +import com.sample.app.model.exception.ServiceException; +import com.sample.app.model.impl.ClientServicesMockImpl; +import com.sample.app.model.services.ClientServices; +import cucumber.api.java.en.Given; +import cucumber.api.java.en.Then; +import cucumber.api.java.en.When; +import org.junit.Assert; + +/** + * Retrieve client steps. + */ +public class RetrieveApplicationSteps { + + private final ClientServices backing = new ClientServicesMockImpl(); + + private ClientDetail client; + private Exception error; + + @Given("A client retrieve service is available") + public void wantToRetrieveApplication() { + this.error = null; + this.client = null; + } + + @When("User retrieves client {string}") + public void retrieveApplication(final String id) { + client = null; + error = null; + try { + client = backing.retrieveClient(id); + } catch (Exception e) { + error = e; + } + } + + @Then("User gets {string} client") + public void shouldHaveApplication(final String id) { + Assert.assertNotNull("Client should have been retrieved", client); + Assert.assertEquals("Incorrect client id retrieved", id, client.getClientId()); + } + + @Then("User gets client exception for {string}") + public void shouldHaveApplicationException(final String id) { + Assert.assertTrue("Service should have created not found exception", error instanceof ClientNotFoundException); + } + + @Then("User gets service exception for {string}") + public void shouldHaveServiceException(final String id) { + Assert.assertTrue("Service should have created service exception", error instanceof ServiceException); + } + +} diff --git a/model-mock-impl/src/test/resources/bordertech-app.properties b/model-mock-impl/src/test/resources/bordertech-app.properties new file mode 100644 index 0000000..29add5a --- /dev/null +++ b/model-mock-impl/src/test/resources/bordertech-app.properties @@ -0,0 +1,6 @@ + +## MOCK Environment +bordertech.config.environment=MOCK + +## TODO Fix CONFIG to dump parameters +bordertech.config.parameters.dump.console=true diff --git a/pom.xml b/pom.xml index 04687a4..d4caca8 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ false - false + true 11 @@ -132,7 +132,11 @@ 1.0.6-beta-1 - + + commons-io + commons-io + 2.6 + commons-logging commons-logging From ab8939b402a5397a63218174432b37fb0d0b9922 Mon Sep 17 00:00:00 2001 From: Jonathan Austin Date: Thu, 12 Mar 2020 08:15:28 +1100 Subject: [PATCH 3/3] junit version for serenity --- model-api/pom.xml | 4 +-- .../api/bdd/features/RetrieveClient.feature | 8 ++--- .../api/bdd/features/UpdateClient.feature | 26 ++++++++++++++ model-mock-impl/pom.xml | 1 - ...ionSteps.java => RetrieveClientSteps.java} | 34 ++++++++++++------- pom.xml | 8 +++++ rest-api/pom.xml | 5 +-- web-ui/pom.xml | 6 ++-- 8 files changed, 68 insertions(+), 24 deletions(-) create mode 100644 model-bdd/src/main/resources/api/bdd/features/UpdateClient.feature rename model-mock-impl/src/test/java/com/sample/app/model/bdd/steps/{RetrieveApplicationSteps.java => RetrieveClientSteps.java} (51%) diff --git a/model-api/pom.xml b/model-api/pom.xml index 159fd7a..4d15634 100644 --- a/model-api/pom.xml +++ b/model-api/pom.xml @@ -18,8 +18,8 @@ - org.junit.vintage - junit-vintage-engine + junit + junit test diff --git a/model-bdd/src/main/resources/api/bdd/features/RetrieveClient.feature b/model-bdd/src/main/resources/api/bdd/features/RetrieveClient.feature index 08f58a5..b487268 100644 --- a/model-bdd/src/main/resources/api/bdd/features/RetrieveClient.feature +++ b/model-bdd/src/main/resources/api/bdd/features/RetrieveClient.feature @@ -9,9 +9,9 @@ Scenario: Retrieve a valid client Then User gets "ORG1" client Scenario: Retrieve an invalid client - When User retrieves client "notfound" - Then User gets client exception for "notfound" + When User retrieves a client that does not exist + Then User gets client not found exception for retrieve Scenario: Retrieve a client has a system error - When User retrieves client "error" - Then User gets service exception for "error" + When User retrieves client that causes a service exception + Then User gets service exception for retrieve diff --git a/model-bdd/src/main/resources/api/bdd/features/UpdateClient.feature b/model-bdd/src/main/resources/api/bdd/features/UpdateClient.feature new file mode 100644 index 0000000..90d46cd --- /dev/null +++ b/model-bdd/src/main/resources/api/bdd/features/UpdateClient.feature @@ -0,0 +1,26 @@ +Feature: Update client details + User wants to update a client + +Background: Client service available + Given A client update service is available + +Scenario: Update a client + When User retrieves client "ORG1" + And User updates client name to "foo" + And User submits client "ORG1" + Then User gets updated client "ORG1" + +Scenario: Update a client with validation error + When User retrieves client "ORG1" + And User updates client name to blank + And User submits client "ORG1" + Then User gets validation exception for "ORG1" + +Scenario: Update an invalid client + When User submits a client that does not exist + Then User gets client not found exception for update + +Scenario: Update a client has a system error + When User retrieves client "ORG1" + And User submits a client that receives a service exception + Then User gets service exception for update diff --git a/model-mock-impl/pom.xml b/model-mock-impl/pom.xml index 42e81cb..ae53c41 100644 --- a/model-mock-impl/pom.xml +++ b/model-mock-impl/pom.xml @@ -49,7 +49,6 @@ junit junit - 4.12 test diff --git a/model-mock-impl/src/test/java/com/sample/app/model/bdd/steps/RetrieveApplicationSteps.java b/model-mock-impl/src/test/java/com/sample/app/model/bdd/steps/RetrieveClientSteps.java similarity index 51% rename from model-mock-impl/src/test/java/com/sample/app/model/bdd/steps/RetrieveApplicationSteps.java rename to model-mock-impl/src/test/java/com/sample/app/model/bdd/steps/RetrieveClientSteps.java index 86157e8..c3568d6 100644 --- a/model-mock-impl/src/test/java/com/sample/app/model/bdd/steps/RetrieveApplicationSteps.java +++ b/model-mock-impl/src/test/java/com/sample/app/model/bdd/steps/RetrieveClientSteps.java @@ -5,15 +5,15 @@ import com.sample.app.model.exception.ServiceException; import com.sample.app.model.impl.ClientServicesMockImpl; import com.sample.app.model.services.ClientServices; -import cucumber.api.java.en.Given; -import cucumber.api.java.en.Then; -import cucumber.api.java.en.When; +import io.cucumber.java.en.Given; +import io.cucumber.java.en.Then; +import io.cucumber.java.en.When; import org.junit.Assert; /** * Retrieve client steps. */ -public class RetrieveApplicationSteps { +public class RetrieveClientSteps { private final ClientServices backing = new ClientServicesMockImpl(); @@ -21,13 +21,13 @@ public class RetrieveApplicationSteps { private Exception error; @Given("A client retrieve service is available") - public void wantToRetrieveApplication() { + public void wantToRetrieveClient() { this.error = null; this.client = null; } @When("User retrieves client {string}") - public void retrieveApplication(final String id) { + public void retrieveClient(final String id) { client = null; error = null; try { @@ -37,20 +37,30 @@ public void retrieveApplication(final String id) { } } + @When("User retrieves a client that does not exist") + public void retrieveClientNotExists() { + retrieveClient("notfound"); + } + + @When("User retrieves client that causes a service exception") + public void retrieveClientCausesError() { + retrieveClient("error"); + } + @Then("User gets {string} client") public void shouldHaveApplication(final String id) { Assert.assertNotNull("Client should have been retrieved", client); Assert.assertEquals("Incorrect client id retrieved", id, client.getClientId()); } - @Then("User gets client exception for {string}") - public void shouldHaveApplicationException(final String id) { - Assert.assertTrue("Service should have created not found exception", error instanceof ClientNotFoundException); + @Then("User gets client not found exception for retrieve") + public void shouldHaveClientNotFoundException() { + Assert.assertTrue("Service should have caused client not found exception", error instanceof ClientNotFoundException); } - @Then("User gets service exception for {string}") - public void shouldHaveServiceException(final String id) { - Assert.assertTrue("Service should have created service exception", error instanceof ServiceException); + @Then("User gets service exception for retrieve") + public void shouldHaveServiceException() { + Assert.assertTrue("Service should have caused service exception", error instanceof ServiceException); } } diff --git a/pom.xml b/pom.xml index d4caca8..8077a4c 100644 --- a/pom.xml +++ b/pom.xml @@ -223,6 +223,14 @@ 0.8.13 + + + junit + junit + 4.12 + test + + diff --git a/rest-api/pom.xml b/rest-api/pom.xml index 2d07a22..326f745 100644 --- a/rest-api/pom.xml +++ b/rest-api/pom.xml @@ -43,9 +43,10 @@ provided + - org.junit.vintage - junit-vintage-engine + junit + junit test diff --git a/web-ui/pom.xml b/web-ui/pom.xml index 9bc3833..a527c89 100644 --- a/web-ui/pom.xml +++ b/web-ui/pom.xml @@ -60,12 +60,12 @@ commons-logging commons-logging - 1.2 + - org.junit.vintage - junit-vintage-engine + junit + junit test