in skip case, guarantee that error is thrown #1250

Author: ehennum

marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/ErrorListenerInputOutputEndpointTest.java

@@ -55,10 +55,10 @@ public void testInputOutputCallerWithRetry() {
 
 
         String              endpointState = "{\"next\":1}";
-        String              endpointConstants      = "{\"errorOnMax\":false, \"max\":4,\"collection\":\"bulkInputOutputTest_1\"}";
+        String              endpointConstants      = "{\"collection\":\"bulkInputOutputTest_1\"}";
 
         String              endpointState1 = "{\"next\":1}";
-        String              endpointConstants1      = "{\"errorOnMax\":false, \"max\":4,\"collection\":\"bulkInputOutputTest_2\"}";
+        String              endpointConstants1      = "{\"collection\":\"bulkInputOutputTest_2\"}";
         Set<String>         input          = IOTestUtil.setOf(
                 "{\"docNum\":1, \"docName\":\"doc1\"}",
                 "{\"docNum\":2, \"docName\":\"doc2\"}",
@@ -113,10 +113,10 @@ public void testInputOutputCallerWithSkip() {
 
 
         String              endpointState = "{\"next\":1}";
-        String              endpointConstants      = "{\"errorOnMax\":false, \"max\":4,\"collection\":\"bulkInputOutputTest_1\"}";
+        String              endpointConstants      = "{\"errorMin\":5,\"errorMax\":9,\"collection\":\"bulkInputOutputTest_1\"}";
 
         String              endpointState1 = "{\"next\":1}";
-        String              endpointConstants1      = "{\"errorOnMax\":false, \"max\":4,\"collection\":\"bulkInputOutputTest_2\"}";
+        String              endpointConstants1      = "{\"errorMin\":5,\"errorMax\":9,\"collection\":\"bulkInputOutputTest_2\"}";
         Set<String>         input          = IOTestUtil.setOf(
                 "{\"docNum\":1, \"docName\":\"doc1\"}",
                 "{\"docNum\":2, \"docName\":\"doc2\"}",
@@ -167,10 +167,10 @@ public void testInputOutputCallerWithStop() throws IOException {
 
 
         String              endpointState = "{\"next\":1}";
-        String              endpointConstants      = "{\"errorOnMax\":true, \"max\":4,\"collection\":\"bulkInputOutputTest_1\"}";
+        String              endpointConstants      = "{\"errorMin\":5,\"errorMax\":9,\"collection\":\"bulkInputOutputTest_1\"}";
 
         String              endpointState1 = "{\"next\":1}";
-        String              endpointConstants1      = "{\"errorOnMax\":true, \"max\":4,\"collection\":\"bulkInputOutputTest_2\"}";
+        String              endpointConstants1      = "{\"errorMin\":5,\"errorMax\":9,\"collection\":\"bulkInputOutputTest_2\"}";
         Set<String>         input          = IOTestUtil.setOf(
                 "{\"docNum\":1, \"docName\":\"doc1\"}",
                 "{\"docNum\":2, \"docName\":\"doc2\"}",

marklogic-client-api/src/test/resources/dataservices/errorListenerBulkIOInputOutputCaller.sjs

@@ -6,20 +6,22 @@ var input;         // jsonDocument*
 const inputCount = fn.count(input);
 
 const work = fn.head(xdmp.fromJSON(endpointConstants));
-
 const state = fn.head(xdmp.fromJSON(endpointState));
-state.next = state.next + inputCount;
 
-state.workMax = work.max;
+const errorMin = work.errorMin;
+const errorMax = work.errorMax;
+const inErrorRange = (0 < errorMin && 0 < errorMax && errorMin <= state.next && state.next < errorMax);
+
+state.next = state.next + inputCount;
 
 const inputs =
     (input instanceof Sequence) ? input.toArray().map(item => fn.head(xdmp.fromJSON(item))) :
     (input instanceof Document) ? [fn.head(xdmp.fromJSON(input))] :
                                   [ {UNKNOWN: input} ];
 
 //console.log(work.collection + ": state.next = " + state.next);
-var ranInt =  Math.floor(Math.random() * Math.floor(2));
-if ((ranInt == 1 && work.collection == "bulkInputOutputTest_1") || (work.errorOnMax === true && state.next > work.max)) {
+var ranInt = inErrorRange ? 1 : Math.floor(Math.random() * Math.floor(2));
+if (ranInt == 1 && work.collection == "bulkInputOutputTest_1") {
     //console.log(work.collection + ': ' + "state.next = " + state.next + ", ranInt = " + ranInt);
     fn.error(xs.QName("ERROR"), "Exception");
 }