Fix DataIteratorContext usage in tests

Author: labkey-nicka

experiment/src/org/labkey/experiment/api/ExpDataClassDataTestCase.jsp

@@ -1073,6 +1073,7 @@ public void testInsertOptionUpdate() throws Exception
     rowsToUpdate.add(CaseInsensitiveHashMap.of("name", "D-1-d", "prop", "c1", "DataInputs/DataClassWithImportOption", "D-1"));
     rowsToUpdate.add(CaseInsensitiveHashMap.of("name", "D-2", "prop", "b1", "DataInputs/DataClassWithImportOption", null, "alias", "Grassland"));
 
+    context = new DataIteratorContext();
     context.setInsertOption(QueryUpdateService.InsertOption.UPDATE);
     count = qus.loadRows(user, c, MapDataIterator.of(rowsToUpdate), context, null);
 
@@ -1128,6 +1129,7 @@ public void testInsertOptionUpdate() throws Exception
     rowsToMerge.add(CaseInsensitiveHashMap.of("name", "D-2", "prop", "gene", longFieldName, "Pasture", "alias", "Exceedingly", "flag", "cOne"));
     rowsToMerge.add(CaseInsensitiveHashMap.of("name", "D-22", "prop", null, longFieldName, "Goal", "alias", "Immensely", "flag", "cEight"));
 
+    context = new DataIteratorContext();
     context.setInsertOption(QueryUpdateService.InsertOption.MERGE);
     count = qus.loadRows(user, c, MapDataIterator.of(rowsToMerge), context, null);
 
@@ -1157,8 +1159,7 @@ public void testInsertOptionUpdate() throws Exception
     // long field
     assertEquals("Very", rows.get(0).get(longFieldAlias));
     assertEquals("Long", rows.get(1).get(longFieldAlias));
-    // TODO: This is not updating as I would expect. Verify what is expected here with regards to updating via merge.
-//    assertEquals("Pasture", rows.get(2).get(longFieldAlias));
+    assertEquals("Pasture", rows.get(2).get(longFieldAlias));
     assertEquals("Goal", rows.get(3).get(longFieldAlias));
 
     // alias
@@ -1172,7 +1173,6 @@ public void testInsertOptionUpdate() throws Exception
     assertEquals("c200", rows.get(1).get(flagAlias));
     assertEquals("cOne", rows.get(2).get(flagAlias));
     assertEquals("cEight", rows.get(3).get(flagAlias));
-
 }
 
 private @NotNull TableInfo getDataClassTable(String dataClassName)
@@ -1226,7 +1226,9 @@ public void testUpdateAuditForLongField() throws Exception
 
     List<Map<String, Object>> rowsToUpdate = new ArrayList<>();
     rowsToUpdate.add(CaseInsensitiveHashMap.of("name", "A-1", fieldName, "Updated"));
+    context = new DataIteratorContext();
     context.setInsertOption(QueryUpdateService.InsertOption.UPDATE);
+    context.getConfigParameters().put(DetailedAuditLogDataIterator.AuditConfigs.AuditBehavior, AuditBehaviorType.DETAILED);
     count = qus.loadRows(user, c, MapDataIterator.of(rowsToUpdate), context, null);
     assertFalse("Unexpected errors from update", context.getErrors().hasErrors());
     assertEquals("Number of rows updated not as expected", 1, count);
@@ -1241,7 +1243,5 @@ public void testUpdateAuditForLongField() throws Exception
         String oldRecordMap = ((DetailedAuditTypeEvent) events.get(0)).getOldRecordMap();
         assertTrue("Old record map (" + oldRecordMap + ") does not contain expected field", oldRecordMap.contains(encodeURIComponent(fieldName.toLowerCase()) + "=Initial"));
     }
-
 }
-
 %>

experiment/src/org/labkey/experiment/api/ExpSampleTypeTestCase.jsp

@@ -17,8 +17,6 @@
 <%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@ page import="org.junit.After" %>
 <%@ page import="org.junit.Before" %>
-
-
 <%@ page import="org.junit.Test" %>
 <%@ page import="org.labkey.api.audit.AuditLogService" %>
 <%@ page import="org.labkey.api.audit.SampleTimelineAuditEvent" %>
@@ -51,15 +49,13 @@
 <%@ page import="org.labkey.api.exp.query.ExpSchema" %>
 <%@ page import="org.labkey.api.exp.query.SamplesSchema" %>
 <%@ page import="org.labkey.api.gwt.client.AuditBehaviorType" %>
-
 <%@ page import="org.labkey.api.gwt.client.model.GWTPropertyDescriptor" %>
 <%@ page import="org.labkey.api.query.BatchValidationException" %>
 <%@ page import="org.labkey.api.query.DefaultSchema" %>
 <%@ page import="org.labkey.api.query.FieldKey" %>
 <%@ page import="org.labkey.api.query.QuerySchema" %>
 <%@ page import="org.labkey.api.query.QueryService" %>
 <%@ page import="org.labkey.api.query.QueryUpdateService" %>
-
 <%@ page import="static org.hamcrest.CoreMatchers.hasItems" %>
 <%@ page import="static org.junit.Assert.*" %>
 <%@ page import="org.labkey.api.query.SchemaKey" %>
@@ -93,14 +89,9 @@
 <%@ page import="java.util.concurrent.TimeUnit" %>
 <%@ page import="org.jetbrains.annotations.NotNull" %>
 <%@ page import="org.labkey.api.dataiterator.MapDataIterator" %>
-
 <%@ page extends="org.labkey.api.jsp.JspTest.BVT" %>
 
 <%!
-/**
- * User: kevink
- * Date: 11/24/16
- */
 private static final String PROJECT_NAME = "_testSampleType";
 private final ExpProvisionedTableTestHelper helper = new ExpProvisionedTableTestHelper();
 
@@ -1235,6 +1226,7 @@ public void testInsertOptionUpdate() throws Exception
     rowsToUpdate.add(CaseInsensitiveHashMap.of("name", "S-1-1", "intVal", null));
     rowsToUpdate.add(CaseInsensitiveHashMap.of("name", "S-2", "intVal", 200));
 
+    context = new DataIteratorContext();
     context.setInsertOption(QueryUpdateService.InsertOption.UPDATE);
     count = qus.loadRows(user, c, MapDataIterator.of(rowsToUpdate), context, null);
 
@@ -1268,6 +1260,8 @@ public void testInsertOptionUpdate() throws Exception
     // update a sample that doesn't exist should throw error
     rowsToUpdate = new ArrayList<>();
     rowsToUpdate.add(CaseInsensitiveHashMap.of("name", "S-1-absent", "intVal", 100));
+    context = new DataIteratorContext();
+    context.setInsertOption(QueryUpdateService.InsertOption.UPDATE);
     qus.loadRows(user, c, MapDataIterator.of(rowsToUpdate), context, null);
     assertTrue(context.getErrors().hasErrors());
     String msg = !context.getErrors().getRowErrors().isEmpty() ? context.getErrors().getRowErrors().get(0).toString() : "no message";