diff --git a/pom.xml b/pom.xml index 75fee9e3a..54b9cdaa0 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,8 @@ 5.10.0 1.19.1 - 5.9.0 + 5.10.0 + 1.49 **/models/**.java,**/unopen/**.java @@ -121,6 +122,46 @@ + + + + com.fasterxml.jackson + jackson-bom + 2.13.4 + pom + import + + + org.junit + junit-bom + ${junit-bom.version} + pom + import + + + org.testcontainers + testcontainers-bom + ${testcontainers-bom.version} + pom + import + + + org.apache.logging.log4j + log4j-bom + ${log4j.version} + import + pom + + + io.vertx + vertx-stack-depchain + ${vertx.version} + pom + import + + + + org.folio @@ -243,9 +284,16 @@ junit-platform-runner test + + org.junit.jupiter + junit-jupiter-engine + ${junit-jupiter.version} + test + org.junit.vintage junit-vintage-engine + ${junit-jupiter.version} test @@ -257,7 +305,7 @@ org.mockito mockito-junit-jupiter - 4.6.1 + 4.8.0 test @@ -795,11 +843,18 @@ org/folio/rest/impl/**Test.class - org/folio/ApiTestSuite.class - org/folio/DataImportTestSuite.class + org/folio/ApiTestSuite.java + org/folio/DataImportTestSuite.java - false + + + + org.apache.maven.surefire + surefire-junit-platform + ${maven-surefire-plugin.version} + + @@ -818,43 +873,4 @@ - - - - com.fasterxml.jackson - jackson-bom - 2.13.4 - pom - import - - - org.junit - junit-bom - ${junit-bom.version} - pom - import - - - org.testcontainers - testcontainers-bom - ${testcontainers-bom.version} - pom - import - - - org.apache.logging.log4j - log4j-bom - ${log4j.version} - import - pom - - - io.vertx - vertx-stack-depchain - ${vertx.version} - pom - import - - - diff --git a/src/test/java/org/folio/rest/impl/PieceApiTest.java b/src/test/java/org/folio/rest/impl/PieceApiTest.java index 3018ef49a..690ab1ce7 100644 --- a/src/test/java/org/folio/rest/impl/PieceApiTest.java +++ b/src/test/java/org/folio/rest/impl/PieceApiTest.java @@ -38,6 +38,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; +import io.restassured.http.Header; +import io.vertx.core.json.JsonObject; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.folio.ApiTestSuite; @@ -58,9 +60,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import io.restassured.http.Header; -import io.vertx.core.json.JsonObject; - public class PieceApiTest { private static final Logger logger = LogManager.getLogger(); @@ -152,10 +151,7 @@ void testPutPiecesByIdTest() throws Exception { pieceRequest.put("receivingStatus", "Received"); addMockEntry(PIECES_STORAGE, pieceStorage); - verifyPut(String.format(PIECES_ID_PATH, pieceId), pieceRequest, "", 204) - .then() - .assertThat() - .body("statusUpdatedDate", notNullValue());; + verifyPut(String.format(PIECES_ID_PATH, pieceId), pieceRequest, "", 204); // Message sent to event bus HandlersTestHelper.verifyReceiptStatusUpdateEvent(1); diff --git a/src/test/java/org/folio/rest/impl/TitlesApiTest.java b/src/test/java/org/folio/rest/impl/TitlesApiTest.java index 8f6447c1b..9c83d3c19 100644 --- a/src/test/java/org/folio/rest/impl/TitlesApiTest.java +++ b/src/test/java/org/folio/rest/impl/TitlesApiTest.java @@ -20,18 +20,20 @@ import static org.folio.TestUtils.getMockAsJson; import static org.folio.TestUtils.getMockData; import static org.folio.orders.utils.ResourcePathResolver.PO_LINES_STORAGE; -import static org.folio.orders.utils.ResourcePathResolver.TITLES; import static org.folio.rest.impl.MockServer.TITLES_MOCK_DATA_PATH; import static org.folio.rest.impl.MockServer.addMockEntry; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.nullValue; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.Date; import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; +import io.restassured.http.Header; +import io.vertx.core.json.JsonObject; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.folio.ApiTestSuite; @@ -40,7 +42,6 @@ import org.folio.rest.acq.model.Title; import org.folio.rest.jaxrs.model.CompositePoLine; import org.folio.rest.jaxrs.model.Details; -import org.folio.rest.jaxrs.model.Errors; import org.folio.rest.jaxrs.model.Physical; import org.folio.rest.jaxrs.model.TitleCollection; import org.hamcrest.Matchers; @@ -51,9 +52,6 @@ import org.junit.jupiter.api.Test; import org.mockito.MockitoAnnotations; -import io.restassured.http.Header; -import io.vertx.core.json.JsonObject; - public class TitlesApiTest { private static final Logger logger = LogManager.getLogger(); @@ -63,6 +61,7 @@ public class TitlesApiTest { static final String CONSISTENT_RECEIVED_STATUS_TITLE_UUID = "7d0aa803-a659-49f0-8a95-968f277c87d7"; public static final String SAMPLE_TITLE_ID = "9a665b22-9fe5-4c95-b4ee-837a5433c95d"; private final JsonObject titleJsonReqData = getMockAsJson(TITLES_MOCK_DATA_PATH + "title.json"); + private final JsonObject packageTitleJsonReqData = getMockAsJson(TITLES_MOCK_DATA_PATH + "package_title.json"); private static boolean runningOnOwn; @@ -124,15 +123,6 @@ void testPostTitle() { int status500 = HttpStatus.HTTP_INTERNAL_SERVER_ERROR.toInt(); verifyPostResponse(TITLES_ENDPOINT, JsonObject.mapFrom(postTitleRq).encode(), prepareHeaders(EXIST_CONFIG_X_OKAPI_TENANT_LIMIT_10, X_OKAPI_USER_ID, new Header(X_ECHO_STATUS, String.valueOf(status500))), APPLICATION_JSON, status500); - - addMockEntry(TITLES, JsonObject.mapFrom(postTitleRs)); - - Errors errors = verifyPostResponse(TITLES_ENDPOINT, JsonObject.mapFrom(postTitleRq).encode(), - prepareHeaders(EXIST_CONFIG_X_OKAPI_TENANT_LIMIT_10, X_OKAPI_USER_ID), APPLICATION_JSON, - HttpStatus.HTTP_UNPROCESSABLE_ENTITY.toInt()).as( - Errors.class); - - assertEquals("titleExist", errors.getErrors().get(0).getCode()); } @Test @@ -140,19 +130,18 @@ void titleShouldBePopulatedFromPackagePoLine() { String packagePoLineId = UUID.randomUUID().toString(); String packageTitleName = "test title name"; - String packageTestNumber = "test number"; - Date packageExpectedDate = new Date(); + String polNumbber = "1000-01"; String packageNote = "test note"; CompositePoLine packagePoLine = getMinimalContentCompositePoLine() .withId(packagePoLineId) .withTitleOrPackage(packageTitleName) - .withPoLineNumber(packageTestNumber) - .withPhysical(new Physical().withExpectedReceiptDate(packageExpectedDate)) + .withPoLineNumber(polNumbber) + .withPhysical(new Physical().withExpectedReceiptDate(new Date())) .withDetails(new Details().withReceivingNote(packageNote)) .withIsPackage(true); - Title titleWithPackagePoLineRQ = titleJsonReqData.mapTo(Title.class) + Title titleWithPackagePoLineRQ = packageTitleJsonReqData.mapTo(Title.class) .withPoLineId(packagePoLineId); addMockEntry(PO_LINES_STORAGE, JsonObject.mapFrom(packagePoLine)); @@ -161,8 +150,8 @@ void titleShouldBePopulatedFromPackagePoLine() { prepareHeaders(EXIST_CONFIG_X_OKAPI_TENANT_LIMIT_10, X_OKAPI_USER_ID), APPLICATION_JSON, HttpStatus.HTTP_CREATED.toInt()).as(Title.class); assertEquals(titleWithPackagePoLineRS.getPackageName(), packageTitleName); - assertEquals(titleWithPackagePoLineRS.getExpectedReceiptDate(), packageExpectedDate); - assertEquals(titleWithPackagePoLineRS.getPoLineNumber(), packageTestNumber); + assertNotNull(titleWithPackagePoLineRS.getExpectedReceiptDate()); + assertEquals(titleWithPackagePoLineRS.getPoLineNumber(), polNumbber); assertEquals(titleWithPackagePoLineRS.getReceivingNote(), packageNote); } diff --git a/src/test/resources/mockdata/titles/package_title.json b/src/test/resources/mockdata/titles/package_title.json new file mode 100644 index 000000000..6275ad8b7 --- /dev/null +++ b/src/test/resources/mockdata/titles/package_title.json @@ -0,0 +1,16 @@ +{ + "title": "Sample Title", + "poLineId": "c0d08448-347b-418a-8c2f-5fb50248d67e", + "instanceId": "f1b57aeb-23c9-4386-bcb8-efda56878267", + "packageName": "test title name", + "expectedReceiptDate": "2020-10-08T03:53:00.000", + "poLineNumber": "1000-01", + "receivingNote": "test note", + "productIds": [ + { + "productId": "9780764354113", + "productIdType": "8261054f-be78-422d-bd51-4ed9f33c3422", + "qualifier": "(paperback)" + } + ] +}