[MODAUD-154] 1. test case updated

folio-org · Feb 10, 2023 · 65f6817 · 65f6817
1 parent 083301d
commit 65f6817
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 6 deletions.
diff --git a/mod-audit-server/src/test/java/org/folio/builder/service/FeeFineRecordBuilderTest.java b/mod-audit-server/src/test/java/org/folio/builder/service/FeeFineRecordBuilderTest.java
@@ -1,7 +1,6 @@
 package org.folio.builder.service;
 
 import static org.folio.rest.jaxrs.model.LogRecord.Action.BILLED;
-import static org.folio.utils.TenantApiTestUtil.FEE_FINE_PAYLOAD_JSON;
 import static org.folio.utils.TenantApiTestUtil.getFile;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
@@ -15,7 +14,6 @@
 import org.apache.logging.log4j.Logger;
 import org.folio.builder.description.FeeFineDescriptionBuilder;
 import org.folio.rest.jaxrs.model.LogRecord;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 
@@ -24,11 +22,12 @@
 public class FeeFineRecordBuilderTest extends BuilderTestBase {
   private static final Logger logger = LogManager.getLogger();
 
-  @Test
-  void testFeeFine() throws Exception {
+  @ParameterizedTest
+  @EnumSource(FeeFineUtil.class)
+  void testFeeFine(FeeFineUtil feeFineUtil) throws Exception {
     logger.info("===== Test fees/fines log records builder =====");
 
-    JsonObject payload = new JsonObject(getFile(FEE_FINE_PAYLOAD_JSON));
+    JsonObject payload = new JsonObject(getFile(feeFineUtil.getFileName()));
     List<LogRecord> records = feeFineRecordBuilder.buildLogRecord(payload).get();
 
     assertThat(records.size(), equalTo(1));
@@ -46,7 +45,7 @@ void testFeeFine() throws Exception {
     assertThat(feeFineLogRecord.getServicePointId(), equalTo("7c5abc9f-f3d7-4856-b8d7-6712462ca007"));
     assertThat(feeFineLogRecord.getSource(), equalTo("ADMINISTRATOR, DIKU"));
     assertThat(feeFineLogRecord.getDescription(),
-      equalTo("Fee/Fine type: manual charge. Fee/Fine owner: sample owner. Amount: 10.00. manual. Additional information to staff: Comments from Staff"));
+      equalTo("Fee/Fine type: manual charge. Fee/Fine owner: sample owner. Amount: 10.00. "+ feeFineUtil.getType() +". Additional information to staff: Comments from Staff"));
   }
 
   @ParameterizedTest

diff --git a/mod-audit-server/src/test/java/org/folio/builder/service/FeeFineUtil.java b/mod-audit-server/src/test/java/org/folio/builder/service/FeeFineUtil.java
@@ -0,0 +1,30 @@
+package org.folio.builder.service;
+
+public enum FeeFineUtil {
+
+  MANUAL("payloads/fee_fine_billed.json","manual"),
+  AUTOMATED("payloads/fee_fine_billed_automated.json","automated");
+  private String fileName;
+  private String type;
+
+  FeeFineUtil(String fileName, String type) {
+    this.fileName = fileName;
+    this.type = type;
+  }
+
+  public String getFileName() {
+    return fileName;
+  }
+
+  public void setFileName(String fileName) {
+    this.fileName = fileName;
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+}
diff --git a/mod-audit-server/src/test/resources/payloads/fee_fine_billed_automated.json b/mod-audit-server/src/test/resources/payloads/fee_fine_billed_automated.json
@@ -0,0 +1,20 @@
+{
+  "logEventType":"FEE_FINE",
+  "payload": {
+    "userId":"6f36265e-722a-490a-b436-806e63af2ea7",
+    "userBarcode":"693787594998493",
+    "itemBarcode":"90000",
+    "itemId":"100d10bf-2f06-4aa0-be15-0b95b2d9f9e3",
+    "action":"Billed",
+    "comments": "Comments from Staff",
+    "date":"2020-10-15T12:17:38.627Z",
+    "servicePointId":"7c5abc9f-f3d7-4856-b8d7-6712462ca007",
+    "source":"ADMINISTRATOR, DIKU",
+    "feeFineId":"7ad9dfa0-6ee9-43ba-8db5-7a034ce05838",
+    "feeFineOwner":"sample owner",
+    "loanId":"0",
+    "automated":true,
+    "type":"manual charge",
+    "amount":10.0
+  }
+}