CE-1955 Test fixes

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/BulkInsertTransformStep.java

@@ -233,7 +233,7 @@ public class BulkInsertTransformStep extends AbstractTransformStep
       /////////////////////////////////////////////////////////////////////////////////
       // run all validation from the insert action - in Preview mode (boolean param) //
       /////////////////////////////////////////////////////////////////////////////////
-      insertInput.setRecords(recordsWithoutAnyErrors);
+      insertInput.setRecords(recordsWithoutUkErrors);
       InsertAction insertAction = new InsertAction();
       insertAction.performValidations(insertInput, true);
       List<QRecord> validationResultRecords = insertInput.getRecords();

qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/mapping/FlatRowsToRecordTest.java

@@ -84,7 +84,7 @@ class FlatRowsToRecordTest extends BaseTest
       records = rowsToRecord.nextPage(fileToRows, header, mapping, 2);
       assertEquals(List.of("Marge", "Bart"), getValues(records, "firstName"));
       assertEquals(List.of(2, 2), getValues(records, "noOfShoes"));
-      assertEquals(ListBuilder.of("", "99.95"), getValues(records, "cost"));
+      assertEquals(ListBuilder.of(null, new BigDecimal("99.95")), getValues(records, "cost"));
 
       records = rowsToRecord.nextPage(fileToRows, header, mapping, Integer.MAX_VALUE);
       assertEquals(List.of("Ned"), getValues(records, "firstName"));

qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/mapping/ValueMapperTest.java

@@ -52,15 +52,15 @@ class ValueMapperTest extends BaseTest
       BulkInsertMapping mapping = new BulkInsertMapping().withFieldNameToValueMapping(Map.of(
          "storeId", Map.of("QQQMart", 1, "Q'R'Us", 2),
          "shipToName", Map.of("HoJu", "Homer", "Bart", "Bartholomew"),
-         "lineItem.sku", Map.of("ABC", "Alphabet"),
+         "orderLine.sku", Map.of("ABC", "Alphabet"),
-         "lineItem.extrinsics.value", Map.of("foo", "bar", "bar", "baz"),
+         "orderLine.extrinsics.value", Map.of("foo", "bar", "bar", "baz"),
          "extrinsics.key", Map.of("1", "one", "2", "two")
       ));
 
       QRecord inputRecord = new QRecord()
          .withValue("storeId", "QQQMart")
          .withValue("shipToName", "HoJu")
-         .withAssociatedRecord("lineItem", new QRecord()
+         .withAssociatedRecord("orderLine", new QRecord()
             .withValue("sku", "ABC")
             .withAssociatedRecord("extrinsics", new QRecord()
                .withValue("key", "myKey")
@@ -80,7 +80,7 @@ class ValueMapperTest extends BaseTest
       QRecord expectedRecord = new QRecord()
          .withValue("storeId", 1)
          .withValue("shipToName", "Homer")
-         .withAssociatedRecord("lineItem", new QRecord()
+         .withAssociatedRecord("orderLine", new QRecord()
             .withValue("sku", "Alphabet")
             .withAssociatedRecord("extrinsics", new QRecord()
                .withValue("key", "myKey")

qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/mapping/WideRowsToRecordWithExplicitMappingTest.java

@@ -83,13 +83,13 @@ class WideRowsToRecordWithExplicitMappingTest extends BaseTest
       assertEquals(1, order.getValueInteger("orderNo"));
       assertEquals("Homer", order.getValueString("shipToName"));
       assertEquals(List.of("DONUT", "BEER", "COUCH"), getValues(order.getAssociatedRecords().get("orderLine"), "sku"));
-      assertEquals(List.of("12", "500", "1"), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
+      assertEquals(List.of(12, 500, 1), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
 
       order = records.get(1);
       assertEquals(2, order.getValueInteger("orderNo"));
       assertEquals("Ned", order.getValueString("shipToName"));
       assertEquals(List.of("BIBLE", "LAWNMOWER"), getValues(order.getAssociatedRecords().get("orderLine"), "sku"));
-      assertEquals(List.of("7", "1"), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
+      assertEquals(List.of(7, 1), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
    }
 
 
@@ -139,7 +139,7 @@ class WideRowsToRecordWithExplicitMappingTest extends BaseTest
       assertEquals(1, order.getValueInteger("orderNo"));
       assertEquals("Homer", order.getValueString("shipToName"));
       assertEquals(List.of("DONUT", "BEER", "COUCH"), getValues(order.getAssociatedRecords().get("orderLine"), "sku"));
-      assertEquals(List.of("12", "500", "1"), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
+      assertEquals(List.of(12, 500, 1), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
       assertEquals(List.of("Store Name", "Coupon Code"), getValues(order.getAssociatedRecords().get("extrinsics"), "key"));
       assertEquals(List.of("QQQ Mart", "10QOff"), getValues(order.getAssociatedRecords().get("extrinsics"), "value"));
 
@@ -147,7 +147,7 @@ class WideRowsToRecordWithExplicitMappingTest extends BaseTest
       assertEquals(2, order.getValueInteger("orderNo"));
       assertEquals("Ned", order.getValueString("shipToName"));
       assertEquals(List.of("BIBLE", "LAWNMOWER"), getValues(order.getAssociatedRecords().get("orderLine"), "sku"));
-      assertEquals(List.of("7", "1"), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
+      assertEquals(List.of(7, 1), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
       assertThat(order.getAssociatedRecords().get("extrinsics")).isNullOrEmpty();
    }
 
@@ -166,7 +166,7 @@ class WideRowsToRecordWithExplicitMappingTest extends BaseTest
          """;
 
       Integer defaultStoreId        = 42;
-      Integer defaultLineNo         = 47;
+      String  defaultLineNo         = "47";
       String  defaultLineExtraValue = "bar";
 
       CsvFileToRows   fileToRows = CsvFileToRows.forString(csv);
@@ -197,8 +197,8 @@ class WideRowsToRecordWithExplicitMappingTest extends BaseTest
                new BulkInsertWideLayoutMapping.ChildRecordMapping(
                   Map.of("sku", "SKU 3", "quantity", "Quantity 3"),
                   Map.of("extrinsics", new BulkInsertWideLayoutMapping(List.of(
-                        new BulkInsertWideLayoutMapping.ChildRecordMapping(Map.of("key", "Line Extrinsic Key 3.1", "value", "Line Extrinsic Value 3.1")),
+                     new BulkInsertWideLayoutMapping.ChildRecordMapping(Map.of("key", "Line Extrinsic Key 3.1", "value", "Line Extrinsic Value 3.1")),
-                        new BulkInsertWideLayoutMapping.ChildRecordMapping(Map.of("key", "Line Extrinsic Key 3.2", "value", "Line Extrinsic Value 3.2"))
+                     new BulkInsertWideLayoutMapping.ChildRecordMapping(Map.of("key", "Line Extrinsic Key 3.2", "value", "Line Extrinsic Value 3.2"))
                   ))))
             )),
             "extrinsics", new BulkInsertWideLayoutMapping(List.of(
@@ -225,7 +225,7 @@ class WideRowsToRecordWithExplicitMappingTest extends BaseTest
       assertEquals("Homer", order.getValueString("shipToName"));
       assertEquals(defaultStoreId, order.getValue("storeId"));
       assertEquals(List.of("DONUT", "BEER", "COUCH"), getValues(order.getAssociatedRecords().get("orderLine"), "sku"));
-      assertEquals(List.of("12", "500", "1"), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
+      assertEquals(List.of(12, 500, 1), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
       assertEquals(List.of(defaultLineNo, defaultLineNo, defaultLineNo), getValues(order.getAssociatedRecords().get("orderLine"), "lineNumber"));
       assertEquals(List.of("Store Name", "Coupon Code"), getValues(order.getAssociatedRecords().get("extrinsics"), "key"));
       assertEquals(List.of("QQQ Mart", "10QOff"), getValues(order.getAssociatedRecords().get("extrinsics"), "value"));
@@ -247,7 +247,7 @@ class WideRowsToRecordWithExplicitMappingTest extends BaseTest
       assertEquals("Ned", order.getValueString("shipToName"));
       assertEquals(defaultStoreId, order.getValue("storeId"));
       assertEquals(List.of("BIBLE", "LAWNMOWER"), getValues(order.getAssociatedRecords().get("orderLine"), "sku"));
-      assertEquals(List.of("7", "1"), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
+      assertEquals(List.of(7, 1), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
       assertEquals(List.of(defaultLineNo, defaultLineNo), getValues(order.getAssociatedRecords().get("orderLine"), "lineNumber"));
       assertThat(order.getAssociatedRecords().get("extrinsics")).isNullOrEmpty();
 

qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/mapping/WideRowsToRecordWithSpreadMappingTest.java

@@ -101,13 +101,13 @@ class WideRowsToRecordWithSpreadMappingTest extends BaseTest
       assertEquals(1, order.getValueInteger("orderNo"));
       assertEquals("Homer", order.getValueString("shipToName"));
       assertEquals(List.of("DONUT", "BEER", "COUCH"), getValues(order.getAssociatedRecords().get("orderLine"), "sku"));
-      assertEquals(List.of("12", "500", "1"), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
+      assertEquals(List.of(12, 500, 1), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
 
       order = records.get(1);
       assertEquals(2, order.getValueInteger("orderNo"));
       assertEquals("Ned", order.getValueString("shipToName"));
       assertEquals(List.of("BIBLE", "LAWNMOWER"), getValues(order.getAssociatedRecords().get("orderLine"), "sku"));
-      assertEquals(List.of("7", "1"), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
+      assertEquals(List.of(7, 1), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
    }
 
 
@@ -173,7 +173,7 @@ class WideRowsToRecordWithSpreadMappingTest extends BaseTest
       assertEquals(1, order.getValueInteger("orderNo"));
       assertEquals("Homer", order.getValueString("shipToName"));
       assertEquals(List.of("DONUT", "BEER", "COUCH"), getValues(order.getAssociatedRecords().get("orderLine"), "sku"));
-      assertEquals(List.of("12", "500", "1"), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
+      assertEquals(List.of(12, 500, 1), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
       assertEquals(List.of("Store Name", "Coupon Code"), getValues(order.getAssociatedRecords().get("extrinsics"), "key"));
       assertEquals(List.of("QQQ Mart", "10QOff"), getValues(order.getAssociatedRecords().get("extrinsics"), "value"));
 
@@ -181,7 +181,7 @@ class WideRowsToRecordWithSpreadMappingTest extends BaseTest
       assertEquals(2, order.getValueInteger("orderNo"));
       assertEquals("Ned", order.getValueString("shipToName"));
       assertEquals(List.of("BIBLE", "LAWNMOWER"), getValues(order.getAssociatedRecords().get("orderLine"), "sku"));
-      assertEquals(List.of("7", "1"), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
+      assertEquals(List.of(7, 1), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
       assertThat(order.getAssociatedRecords().get("extrinsics")).isNullOrEmpty();
    }
 
@@ -223,7 +223,7 @@ class WideRowsToRecordWithSpreadMappingTest extends BaseTest
    private void testOrderLinesWithLineExtrinsicsAndOrderExtrinsic(String csv) throws QException
    {
       Integer defaultStoreId        = 42;
-      Integer defaultLineNo         = 47;
+      String  defaultLineNo         = "47";
       String  defaultLineExtraValue = "bar";
 
       CsvFileToRows   fileToRows = CsvFileToRows.forString(csv);
@@ -261,7 +261,7 @@ class WideRowsToRecordWithSpreadMappingTest extends BaseTest
       assertEquals("Homer", order.getValueString("shipToName"));
       assertEquals(defaultStoreId, order.getValue("storeId"));
       assertEquals(List.of("DONUT", "BEER", "COUCH"), getValues(order.getAssociatedRecords().get("orderLine"), "sku"));
-      assertEquals(List.of("12", "500", "1"), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
+      assertEquals(List.of(12, 500, 1), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
       assertEquals(List.of(defaultLineNo, defaultLineNo, defaultLineNo), getValues(order.getAssociatedRecords().get("orderLine"), "lineNumber"));
       assertEquals(List.of("Store Name", "Coupon Code"), getValues(order.getAssociatedRecords().get("extrinsics"), "key"));
       assertEquals(List.of("QQQ Mart", "10QOff"), getValues(order.getAssociatedRecords().get("extrinsics"), "value"));
@@ -283,7 +283,7 @@ class WideRowsToRecordWithSpreadMappingTest extends BaseTest
       assertEquals("Ned", order.getValueString("shipToName"));
       assertEquals(defaultStoreId, order.getValue("storeId"));
       assertEquals(List.of("BIBLE", "LAWNMOWER"), getValues(order.getAssociatedRecords().get("orderLine"), "sku"));
-      assertEquals(List.of("7", "1"), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
+      assertEquals(List.of(7, 1), getValues(order.getAssociatedRecords().get("orderLine"), "quantity"));
       assertEquals(List.of(defaultLineNo, defaultLineNo), getValues(order.getAssociatedRecords().get("orderLine"), "lineNumber"));
       assertThat(order.getAssociatedRecords().get("extrinsics")).isNullOrEmpty();