Skip to content

Commit 59279f0

Browse files
committed
Fixing tests to run on MarkLogic 12 nightly as well
1 parent dc5c43f commit 59279f0

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

marklogic-client-api/src/test/java/com/marklogic/client/test/junit5/RequiresMLElevenDotOne.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con
1515
if (markLogicVersion == null) {
1616
markLogicVersion = Common.getMarkLogicVersion();
1717
}
18-
return markLogicVersion.getMajor() >= 11 && markLogicVersion.getMinor() >= 1?
18+
boolean supported =
19+
(markLogicVersion.getMajor() == 11 && markLogicVersion.getMinor() >= 1) ||
20+
markLogicVersion.getMajor() >= 12;
21+
return supported ?
1922
ConditionEvaluationResult.enabled("MarkLogic is version 11.1 or higher") :
2023
ConditionEvaluationResult.disabled("MarkLogic is version 11.0.x or lower");
2124
}

marklogic-client-api/src/test/java/com/marklogic/client/test/rows/NewOpticMethodsInElevenDotOneTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void documentRootQuery() {
7272
@Disabled("See DBQ-643")
7373
void documentFormatQuery() {
7474
List<RowRecord> rows = resultRows(op
75-
.fromDocUris(op.cts.documentRootQuery("text"))
75+
.fromDocUris(op.cts.documentFormatQuery("text"))
7676
);
7777

7878
assertEquals(1, rows.size());

0 commit comments

Comments
 (0)