MLE-31642 fromLexicons Test fix

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

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2010-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+ */
+package com.marklogic.client.test.junit5;
+
+import com.marklogic.client.test.Common;
+import com.marklogic.client.test.MarkLogicVersion;
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+public class RequiresML12Dot0OrLower implements ExecutionCondition {
+
+	private static MarkLogicVersion markLogicVersion;
+
+	@Override
+	public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+		if (markLogicVersion == null) {
+			markLogicVersion = Common.getMarkLogicVersion();
+		}
+		boolean isML12Dot0OrLower = markLogicVersion.getMajor() < 12 ||
+			(markLogicVersion.getMajor() == 12 && (markLogicVersion.getMinor() == null || markLogicVersion.getMinor() == 0));
+		return isML12Dot0OrLower ?
+			ConditionEvaluationResult.enabled("MarkLogic is version 12.0 or lower") :
+			ConditionEvaluationResult.disabled("MarkLogic is version 12.1 or higher");
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+ * Copyright (c) 2010-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
  */
 package com.marklogic.client.test.rows;
 
@@ -9,6 +9,8 @@
 import com.marklogic.client.row.RowRecord;
 import com.marklogic.client.test.Common;
 import com.marklogic.client.test.junit5.RequiresML11;
+import com.marklogic.client.test.junit5.RequiresML12Dot0OrLower;
+import com.marklogic.client.test.junit5.RequiresML12Dot1;
 import com.marklogic.client.type.CtsReferenceExpr;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -40,6 +42,7 @@ public void propertiesFragmentsShouldNotBeReturned() {
      * 2022-12-12 This is now running only on ML 11, as it's consistently failing on ML 10. We have a fix slated for
      * 11.x, and it's not clear yet if it'll be backported to ML 10.
      */
+	@ExtendWith(RequiresML12Dot0OrLower.class)
     @Test
     public void propertiesFragmentShouldNotBeReturnedByFromLexicons() {
         Map<String, CtsReferenceExpr> lexicons = new HashMap<>();
@@ -52,6 +55,30 @@ public void propertiesFragmentShouldNotBeReturnedByFromLexicons() {
         verifyPropertiesFragmentsAreNotReturned(plan);
     }
 
+    /**
+     * In ML 12.1+, fromLexicons enumerates both content fragments and properties fragments, so joinDoc
+     * returns twice as many rows as written documents. This behavior was introduced in ML 12.1 as part of
+	 * MLE-27052 and intended behavior was validated in MLE-31757 comments.
+     */
+    @ExtendWith(RequiresML12Dot1.class)
+    @Test
+    public void propertiesFragmentShouldBeReturnedByFromLexicons() {
+        Map<String, CtsReferenceExpr> lexicons = new HashMap<>();
+        lexicons.put("uri", op.cts.uriReference());
+
+        PlanBuilder.ModifyPlan plan = op.fromLexicons(lexicons, "", op.fragmentIdCol("fragmentId"))
+            .where(op.cts.directoryQuery("/acme/"))
+            .joinDoc(op.col("doc"), op.col("uri"));
+
+        final int docCount = 50;
+        writeDocs(docCount);
+
+        List<RowRecord> rows = resultRows(plan);
+        assertEquals(docCount * 2, rows.size(),
+            "In ML 12.1+, fromLexicons returns both content fragments and properties fragments, so the row " +
+                "count should be twice the number of written documents.");
+    }
+
     private void verifyPropertiesFragmentsAreNotReturned(PlanBuilder.ModifyPlan plan) {
         final int docCount = 50;
         writeDocs(docCount);