Merge pull request #1685 from marklogic/feature/optic-removal

Removed zero and random as scoring methods

Author: rjrudin

marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSearchOptions.java

@@ -43,6 +43,8 @@ public interface PlanSearchOptions {
 	 */
 	PlanSearchOptions withBm25LengthWeight(double bm25LengthWeight);
     enum ScoreMethod {
-        LOGTFIDF, LOGTF, SIMPLE, BM25, ZERO, RANDOM;
+        LOGTFIDF, LOGTF, SIMPLE, BM25;
+		// zero and random aren't in the 12 EA release.
+		//ZERO, RANDOM;
     }
 }

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

@@ -5,6 +5,7 @@
 import com.marklogic.client.row.RowRecord;
 import com.marklogic.client.test.junit5.RequiresML12;
 import com.marklogic.client.type.PlanSearchOptions;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -41,14 +42,15 @@ void badBm25LengthWeight() {
 	}
 
 	@Test
+	@Disabled("zero and random aren't in the 12 EA release.")
 	void zero() {
-		rowManager.withUpdate(false);
-		PlanSearchOptions options = op.searchOptions().withScoreMethod(PlanSearchOptions.ScoreMethod.ZERO);
-		List<RowRecord> rows = resultRows(op.fromSearch(op.cts.wordQuery("saxophone"), null, null, options));
-		assertEquals(2, rows.size());
-		rows.forEach(row -> {
-			assertEquals(0, row.getInt("score"), "The score for every row should be 0.");
-		});
+//		rowManager.withUpdate(false);
+//		PlanSearchOptions options = op.searchOptions().withScoreMethod(PlanSearchOptions.ScoreMethod.ZERO);
+//		List<RowRecord> rows = resultRows(op.fromSearch(op.cts.wordQuery("saxophone"), null, null, options));
+//		assertEquals(2, rows.size());
+//		rows.forEach(row -> {
+//			assertEquals(0, row.getInt("score"), "The score for every row should be 0.");
+//		});
 	}
 
 	@Test