OAK-11719: compatibility mode test

Author: tihom88

oak-query-spi/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/VectorQuery.java

@@ -31,7 +31,6 @@ public class VectorQuery {
     public static final String INFERENCE_QUERY_CONFIG_PREFIX = System.getProperty(
             INFERENCE_QUERY_CONFIG_PREFIX_KEY, DEFAULT_INFERENCE_QUERY_CONFIG_PREFIX);
     public static final String EXPERIMENTAL_COMPATIBILITY_MODE_KEY = "oak.inference.experimental.compatibility";
-    public static final Boolean IS_EXPERIMENTAL_COMPATIBILITY_MODE_ENABLE = Boolean.getBoolean(EXPERIMENTAL_COMPATIBILITY_MODE_KEY);
 
     private final String queryInferenceConfig;
     private final String queryText;
@@ -76,7 +75,7 @@ private String[] parseText(String inputText) {
                 }
                 queryTextPart = text;
             } else {
-                if (IS_EXPERIMENTAL_COMPATIBILITY_MODE_ENABLE) {
+                if (isCompatibilityModeEnabled()) {
                     // No JSON part present but starts with prefix
                     // we return "{}" to be compatible with experimental inference queries
                     jsonPart = "{}";
@@ -102,4 +101,8 @@ public String getQueryInferenceConfig() {
     public String getQueryText() {
         return queryText;
     }
+
+    private boolean isCompatibilityModeEnabled() {
+        return Boolean.getBoolean(EXPERIMENTAL_COMPATIBILITY_MODE_KEY);
+    }
 }

oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/fulltext/VectorQueryCompatibilityModeTest.java

@@ -29,18 +29,18 @@ public class VectorQueryCompatibilityModeTest {
     @Before
     public void setUp() {
         // Set up any necessary system properties or configurations
-        System.setProperty(VectorQuery.INFERENCE_QUERY_CONFIG_PREFIX_KEY, "true");
+        System.setProperty(VectorQuery.EXPERIMENTAL_COMPATIBILITY_MODE_KEY, "true");
     }
 
     @After
     public void tearDown() {
         // Clean up any system properties set during the tests
         System.clearProperty(VectorQuery.EXPERIMENTAL_COMPATIBILITY_MODE_KEY);
+        System.clearProperty(VectorQuery.INFERENCE_QUERY_CONFIG_PREFIX_KEY);
     }
 
     @Test
     public void testQueryWithEmptyConfigExperimentalInferenceCompatible() {
-        enableExperimentalInferenceCompatibility();
         // Input string: "??query text"
         String inputString = VectorQuery.INFERENCE_QUERY_CONFIG_PREFIX + VectorQuery.INFERENCE_QUERY_CONFIG_PREFIX + "query text";
         VectorQuery query = new VectorQuery(inputString);
@@ -51,16 +51,13 @@ public void testQueryWithEmptyConfigExperimentalInferenceCompatible() {
 
     @Test
     public void testPrefixOnlyQueryExperimentalInferenceCompatible() {
-        enableExperimentalInferenceCompatibility();
         // Input string: "?query text"
         VectorQuery query = new VectorQuery(VectorQuery.INFERENCE_QUERY_CONFIG_PREFIX + "query text");
         assertEquals("{}", query.getQueryInferenceConfig());
         // With the implementation fix, the prefix should now be correctly stripped
         assertEquals("query text", query.getQueryText());
     }
 
-    private void enableExperimentalInferenceCompatibility() {
-        System.setProperty(VectorQuery.EXPERIMENTAL_COMPATIBILITY_MODE_KEY, "true");
-    }
-
+    // We don't need to explicitly enable experimental compatibility mode in each test anymore
+    // as it's already set in setUp()
 }

oak-query-spi/src/test/java/org/apache/jackrabbit/oak/spi/query/fulltext/VectorQueryTest.java

@@ -18,12 +18,27 @@
  */
 package org.apache.jackrabbit.oak.spi.query.fulltext;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
 public class VectorQueryTest {
 
+    @Before
+    public void setUp() {
+        // Ensure compatibility mode is disabled for these tests
+        System.setProperty(VectorQuery.EXPERIMENTAL_COMPATIBILITY_MODE_KEY, "false");
+    }
+
+    @After
+    public void tearDown() {
+        // Clean up all system properties set during the tests
+        System.clearProperty(VectorQuery.EXPERIMENTAL_COMPATIBILITY_MODE_KEY);
+        System.clearProperty(VectorQuery.INFERENCE_QUERY_CONFIG_PREFIX_KEY);
+    }
+
     @Test
     public void testBasicQuery() {
         // Input string: "simple query"
@@ -115,8 +130,8 @@ public void testPrefixOnlyQueryExperimentalInferenceNonCompatible() {
         // Input string: "?query text"
         VectorQuery query = new VectorQuery(VectorQuery.INFERENCE_QUERY_CONFIG_PREFIX + "query text");
         assertEquals("", query.getQueryInferenceConfig());
-        // With the implementation fix, the prefix should now be correctly stripped
-        assertEquals("?query text", query.getQueryText());
+        // When compatibility mode is disabled, the prefix should remain part of the query text
+        assertEquals(VectorQuery.INFERENCE_QUERY_CONFIG_PREFIX + "query text", query.getQueryText());
     }
 
 }