Skip to content

Commit 3801a29

Browse files
author
ehennum
committed
in stop case, throw error before all input is consumed #1250
1 parent 8aec44d commit 3801a29

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ public void testInputOutputCallerWithRetry() {
5555

5656

5757
String endpointState = "{\"next\":1}";
58-
String endpointConstants = "{\"max\":4,\"collection\":\"bulkInputOutputTest_1\"}";
58+
String endpointConstants = "{\"errorOnMax\":false, \"max\":4,\"collection\":\"bulkInputOutputTest_1\"}";
5959

6060
String endpointState1 = "{\"next\":1}";
61-
String endpointConstants1 = "{\"max\":4,\"collection\":\"bulkInputOutputTest_2\"}";
61+
String endpointConstants1 = "{\"errorOnMax\":false, \"max\":4,\"collection\":\"bulkInputOutputTest_2\"}";
6262
Set<String> input = IOTestUtil.setOf(
6363
"{\"docNum\":1, \"docName\":\"doc1\"}",
6464
"{\"docNum\":2, \"docName\":\"doc2\"}",
@@ -113,10 +113,10 @@ public void testInputOutputCallerWithSkip() {
113113

114114

115115
String endpointState = "{\"next\":1}";
116-
String endpointConstants = "{\"max\":4,\"collection\":\"bulkInputOutputTest_1\"}";
116+
String endpointConstants = "{\"errorOnMax\":false, \"max\":4,\"collection\":\"bulkInputOutputTest_1\"}";
117117

118118
String endpointState1 = "{\"next\":1}";
119-
String endpointConstants1 = "{\"max\":4,\"collection\":\"bulkInputOutputTest_2\"}";
119+
String endpointConstants1 = "{\"errorOnMax\":false, \"max\":4,\"collection\":\"bulkInputOutputTest_2\"}";
120120
Set<String> input = IOTestUtil.setOf(
121121
"{\"docNum\":1, \"docName\":\"doc1\"}",
122122
"{\"docNum\":2, \"docName\":\"doc2\"}",
@@ -167,10 +167,10 @@ public void testInputOutputCallerWithStop() throws IOException {
167167

168168

169169
String endpointState = "{\"next\":1}";
170-
String endpointConstants = "{\"max\":4,\"collection\":\"bulkInputOutputTest_1\"}";
170+
String endpointConstants = "{\"errorOnMax\":true, \"max\":4,\"collection\":\"bulkInputOutputTest_1\"}";
171171

172172
String endpointState1 = "{\"next\":1}";
173-
String endpointConstants1 = "{\"max\":4,\"collection\":\"bulkInputOutputTest_2\"}";
173+
String endpointConstants1 = "{\"errorOnMax\":true, \"max\":4,\"collection\":\"bulkInputOutputTest_2\"}";
174174
Set<String> input = IOTestUtil.setOf(
175175
"{\"docNum\":1, \"docName\":\"doc1\"}",
176176
"{\"docNum\":2, \"docName\":\"doc2\"}",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ const inputs =
1818
[ {UNKNOWN: input} ];
1919

2020
//console.log(work.collection + ": state.next = " + state.next);
21-
var ranInt = Math.floor(Math.random() * Math.floor(2));
22-
if (ranInt == 1 && work.collection == "bulkInputOutputTest_1") {
21+
var ranInt = Math.floor(Math.random() * Math.floor(2));
22+
if ((ranInt == 1 && work.collection == "bulkInputOutputTest_1") || (work.errorOnMax === true && state.next > work.max)) {
2323
//console.log(work.collection + ': ' + "state.next = " + state.next + ", ranInt = " + ranInt);
2424
fn.error(xs.QName("ERROR"), "Exception");
2525
}

0 commit comments

Comments
 (0)