re-enabled optimizeTopK test assertions (#543)

rashtao · rashtao · commit 6e1306fed9ce · 2024-03-21T21:16:36.000+01:00
diff --git a/driver/src/test/java/com/arangodb/ArangoSearchAsyncTest.java b/driver/src/test/java/com/arangodb/ArangoSearchAsyncTest.java
@@ -716,9 +716,8 @@ void arangoSearchOptions(ArangoDatabaseAsync db) throws ExecutionException, Inte
             assertThat(nested.getName()).isEqualTo("f2");
         }
 
-        if (isEnterprise() && isAtLeastVersion(3, 11)) {
-            // FIXME: BTS-1428
-            // assertThat(properties.getOptimizeTopK()).containsExactly(optimizeTopK);
+        if (isEnterprise() && isAtLeastVersion(3, 12)) {
+             assertThat(properties.getOptimizeTopK()).containsExactly(optimizeTopK);
         }
 
     }
diff --git a/driver/src/test/java/com/arangodb/ArangoSearchTest.java b/driver/src/test/java/com/arangodb/ArangoSearchTest.java
@@ -715,9 +715,8 @@ void arangoSearchOptions(ArangoDatabase db) {
             assertThat(nested.getName()).isEqualTo("f2");
         }
 
-        if (isEnterprise() && isAtLeastVersion(3, 11)) {
-            // FIXME: BTS-1428
-            // assertThat(properties.getOptimizeTopK()).containsExactly(optimizeTopK);
+        if (isEnterprise() && isAtLeastVersion(3, 12)) {
+             assertThat(properties.getOptimizeTopK()).containsExactly(optimizeTopK);
         }
 
     }
diff --git a/driver/src/test/java/com/arangodb/InvertedIndexAsyncTest.java b/driver/src/test/java/com/arangodb/InvertedIndexAsyncTest.java
@@ -147,9 +147,8 @@ private void assertCorrectIndexEntity(InvertedIndexEntity indexResult, InvertedI
         assertThat(indexResult.getCache()).isEqualTo(options.getCache());
         assertThat(indexResult.getPrimaryKeyCache()).isEqualTo(options.getPrimaryKeyCache());
 
-        if (isEnterprise() && isAtLeastVersion(3, 11)) {
-            // FIXME: BTS-1428
-            // assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());
+        if (isEnterprise() && isAtLeastVersion(3, 12)) {
+             assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());
         }
     }
 
diff --git a/driver/src/test/java/com/arangodb/InvertedIndexTest.java b/driver/src/test/java/com/arangodb/InvertedIndexTest.java
@@ -146,9 +146,8 @@ private void assertCorrectIndexEntity(InvertedIndexEntity indexResult, InvertedI
         assertThat(indexResult.getCache()).isEqualTo(options.getCache());
         assertThat(indexResult.getPrimaryKeyCache()).isEqualTo(options.getPrimaryKeyCache());
 
-        if (isEnterprise() && isAtLeastVersion(3, 11)) {
-            // FIXME: BTS-1428
-            // assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());
+        if (isEnterprise() && isAtLeastVersion(3, 12)) {
+             assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -716,9 +716,8 @@ void arangoSearchOptions(ArangoDatabaseAsync db) throws ExecutionException, Inte`
`716`	`716`	`assertThat(nested.getName()).isEqualTo("f2");`
`717`	`717`	`}`
`718`	`718`
`719`		`- if (isEnterprise() && isAtLeastVersion(3, 11)) {`
`720`		`- // FIXME: BTS-1428`
`721`		`- // assertThat(properties.getOptimizeTopK()).containsExactly(optimizeTopK);`
	`719`	`+ if (isEnterprise() && isAtLeastVersion(3, 12)) {`
	`720`	`+ assertThat(properties.getOptimizeTopK()).containsExactly(optimizeTopK);`
`722`	`721`	`}`
`723`	`722`
`724`	`723`	`}`
Original file line number	Diff line number	Diff line change
`@@ -715,9 +715,8 @@ void arangoSearchOptions(ArangoDatabase db) {`
`715`	`715`	`assertThat(nested.getName()).isEqualTo("f2");`
`716`	`716`	`}`
`717`	`717`
`718`		`- if (isEnterprise() && isAtLeastVersion(3, 11)) {`
`719`		`- // FIXME: BTS-1428`
`720`		`- // assertThat(properties.getOptimizeTopK()).containsExactly(optimizeTopK);`
	`718`	`+ if (isEnterprise() && isAtLeastVersion(3, 12)) {`
	`719`	`+ assertThat(properties.getOptimizeTopK()).containsExactly(optimizeTopK);`
`721`	`720`	`}`
`722`	`721`
`723`	`722`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,9 +147,8 @@ private void assertCorrectIndexEntity(InvertedIndexEntity indexResult, InvertedI`
`147`	`147`	`assertThat(indexResult.getCache()).isEqualTo(options.getCache());`
`148`	`148`	`assertThat(indexResult.getPrimaryKeyCache()).isEqualTo(options.getPrimaryKeyCache());`
`149`	`149`
`150`		`- if (isEnterprise() && isAtLeastVersion(3, 11)) {`
`151`		`- // FIXME: BTS-1428`
`152`		`- // assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());`
	`150`	`+ if (isEnterprise() && isAtLeastVersion(3, 12)) {`
	`151`	`+ assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());`
`153`	`152`	`}`
`154`	`153`	`}`
`155`	`154`
Original file line number	Diff line number	Diff line change
`@@ -146,9 +146,8 @@ private void assertCorrectIndexEntity(InvertedIndexEntity indexResult, InvertedI`
`146`	`146`	`assertThat(indexResult.getCache()).isEqualTo(options.getCache());`
`147`	`147`	`assertThat(indexResult.getPrimaryKeyCache()).isEqualTo(options.getPrimaryKeyCache());`
`148`	`148`
`149`		`- if (isEnterprise() && isAtLeastVersion(3, 11)) {`
`150`		`- // FIXME: BTS-1428`
`151`		`- // assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());`
	`149`	`+ if (isEnterprise() && isAtLeastVersion(3, 12)) {`
	`150`	`+ assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());`
`152`	`151`	`}`
`153`	`152`	`}`
`154`	`153`