diff options
Diffstat (limited to 'container-search/src/test')
3 files changed, 10 insertions, 13 deletions
diff --git a/container-search/src/test/java/ai/vespa/search/llm/LLMSearcherTest.java b/container-search/src/test/java/ai/vespa/search/llm/LLMSearcherTest.java index a8e988057d4..21691f3de90 100755 --- a/container-search/src/test/java/ai/vespa/search/llm/LLMSearcherTest.java +++ b/container-search/src/test/java/ai/vespa/search/llm/LLMSearcherTest.java @@ -14,7 +14,6 @@ import com.yahoo.search.Result; import com.yahoo.search.Searcher; import com.yahoo.search.result.EventStream; import com.yahoo.search.searchchain.Execution; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import java.io.File; @@ -139,7 +138,6 @@ public class LLMSearcherTest { } @Test - @Disabled public void testAsyncGeneration() { var executor = Executors.newFixedThreadPool(2); var sb = new StringBuilder(); @@ -156,17 +154,13 @@ public class LLMSearcherTest { assertEquals(1, result.getHitCount()); assertTrue(result.hits().get(0) instanceof EventStream); EventStream eventStream = (EventStream) result.hits().get(0); - var incoming = eventStream.incoming(); - incoming.addNewDataListener(() -> { - incoming.drain().forEach(event -> sb.append(event.toString())); - }, executor); incoming.completedFuture().join(); assertTrue(incoming.isComplete()); - // Ensure incoming has been fully drained to avoid race condition in this test - incoming.drain().forEach(event -> sb.append(event.toString())); + incoming.drain().forEach(event -> eventStream.add(event)); + eventStream.asList().forEach(event -> sb.append(event.toString())); } finally { executor.shutdownNow(); diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryLanguageTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryLanguageTestCase.java index 45282de817b..8fd296045df 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/test/QueryLanguageTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/test/QueryLanguageTestCase.java @@ -105,11 +105,6 @@ public class QueryLanguageTestCase { Model model = query.getModel(); Model model2 = query2.getModel(); - Language language1_0 = model.getParsingLanguage(); - Language language1_1 = model.getLanguage(); - Language language2_0 = model2.getParsingLanguage(); - Language language2_1 = model2.getLanguage(); - assertEquals(expectedLanguage, query.getModel().getParsingLanguage()); /* diff --git a/container-search/src/test/java/com/yahoo/search/schema/SchemaInfoTester.java b/container-search/src/test/java/com/yahoo/search/schema/SchemaInfoTester.java index 2ba399cf42d..820de5a6cb7 100644 --- a/container-search/src/test/java/com/yahoo/search/schema/SchemaInfoTester.java +++ b/container-search/src/test/java/com/yahoo/search/schema/SchemaInfoTester.java @@ -62,6 +62,8 @@ public class SchemaInfoTester { .addInput("query(myTensor4)", InputType.fromSpec("tensor<float>(x[5])")); schemas.add(new Schema.Builder("a") .add(common.build()) + .add(new Field.Builder("field1", "string").setIndex(true).addAlias("alias1").addAlias("alias2").build()) + .add(new Field.Builder("field2", "int").setAttribute(true).build()) .add(new RankProfile.Builder("inconsistent") .addInput("query(myTensor1)", InputType.fromSpec("tensor(a{},b{})")) .build()) @@ -102,6 +104,12 @@ public class SchemaInfoTester { var schemaA = new SchemaInfoConfig.Schema.Builder(); schemaA.name("a"); + schemaA.field(new SchemaInfoConfig.Schema.Field.Builder().name("field1").type("string") + .index(true).attribute(false) + .alias("alias1").alias("alias2")); + schemaA.field(new SchemaInfoConfig.Schema.Field.Builder().name("field2").type("int") + .index(false).attribute(true)); + schemaA.rankprofile(rankProfileCommon); var rankProfileInconsistentA = new SchemaInfoConfig.Schema.Rankprofile.Builder(); rankProfileInconsistentA.name("inconsistent"); |