From e7e659e9d26401c8c36300d4760d4e34acd26d0a Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 28 Sep 2021 21:19:41 +0200 Subject: encode -> embed --- .../grouping/vespa/IntegerEmbedderTestCase.java | 35 ++++++++++++++++++++++ .../grouping/vespa/IntegerEncoderTestCase.java | 35 ---------------------- .../types/test/QueryProfileTypeTestCase.java | 27 ++++++++--------- 3 files changed, 48 insertions(+), 49 deletions(-) create mode 100644 container-search/src/test/java/com/yahoo/search/grouping/vespa/IntegerEmbedderTestCase.java delete mode 100644 container-search/src/test/java/com/yahoo/search/grouping/vespa/IntegerEncoderTestCase.java (limited to 'container-search/src/test/java/com/yahoo') diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/IntegerEmbedderTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/IntegerEmbedderTestCase.java new file mode 100644 index 00000000000..18a9f11e15e --- /dev/null +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/IntegerEmbedderTestCase.java @@ -0,0 +1,35 @@ +// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.search.grouping.vespa; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +/** + * @author Simon Thoresen Hult + */ +public class IntegerEmbedderTestCase { + + @Test + public void requireThatIntEncoderWorksAsExpected() { + assertEncode("A", 0); + assertEncode("BC", 1); + assertEncode("CBI", 12); + assertEncode("CPG", 123); + assertEncode("DJKE", 1234); + assertEncode("EGAHC", 12345); + assertEncode("FDMEIA", 123456); + assertEncode("GCFKNAO", 1234567); + assertEncode("HBHIMCJM", 12345678); + assertEncode("HOLHJKCK", 123456789); + assertEncode("IJDCMAFKE", 1234567890); + assertEncode("IIKKEBPOF", -1163005939); + assertEncode("IECKEIKID", -559039810); + } + + private static void assertEncode(String expected, int toEncode) { + IntegerEncoder actual = new IntegerEncoder(); + actual.append(toEncode); + assertEquals(expected, actual.toString()); + } +} diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/IntegerEncoderTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/IntegerEncoderTestCase.java deleted file mode 100644 index 3b48ae35fcf..00000000000 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/IntegerEncoderTestCase.java +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.search.grouping.vespa; - -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -/** - * @author Simon Thoresen Hult - */ -public class IntegerEncoderTestCase { - - @Test - public void requireThatIntEncoderWorksAsExpected() { - assertEncode("A", 0); - assertEncode("BC", 1); - assertEncode("CBI", 12); - assertEncode("CPG", 123); - assertEncode("DJKE", 1234); - assertEncode("EGAHC", 12345); - assertEncode("FDMEIA", 123456); - assertEncode("GCFKNAO", 1234567); - assertEncode("HBHIMCJM", 12345678); - assertEncode("HOLHJKCK", 123456789); - assertEncode("IJDCMAFKE", 1234567890); - assertEncode("IIKKEBPOF", -1163005939); - assertEncode("IECKEIKID", -559039810); - } - - private static void assertEncode(String expected, int toEncode) { - IntegerEncoder actual = new IntegerEncoder(); - actual.append(toEncode); - assertEquals(expected, actual.toString()); - } -} diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeTestCase.java index 45f53a1cdb9..e22263070e0 100644 --- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeTestCase.java @@ -4,7 +4,7 @@ package com.yahoo.search.query.profile.types.test; import com.yahoo.component.ComponentId; import com.yahoo.container.jdisc.HttpRequest; import com.yahoo.language.Language; -import com.yahoo.language.process.Encoder; +import com.yahoo.language.process.Embedder; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorType; import com.yahoo.yolean.Exceptions; @@ -22,7 +22,6 @@ import com.yahoo.search.query.profile.types.QueryProfileTypeRegistry; import org.junit.Before; import org.junit.Test; -import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.List; @@ -441,19 +440,19 @@ public class QueryProfileTypeTestCase { } @Test - public void testUnencodedTensorRankFeatureInRequest() { + public void testUnembeddedTensorRankFeatureInRequest() { QueryProfile profile = new QueryProfile("test"); profile.setType(testtype); registry.register(profile); CompiledQueryProfileRegistry cRegistry = registry.compile(); - String textToEncode = "text to encode as tensor"; + String textToEmbed = "text to embed into a tensor"; Tensor expectedTensor = Tensor.from("tensor(x[5]):[3,7,4,0,0]]"); Query query1 = new Query.Builder().setRequest(HttpRequest.createTestRequest("?" + urlEncode("ranking.features.query(myTensor4)") + - "=" + urlEncode("encode(" + textToEncode + ")"), + "=" + urlEncode("embed(" + textToEmbed + ")"), com.yahoo.jdisc.http.HttpRequest.Method.GET)) .setQueryProfile(cRegistry.getComponent("test")) - .setEncoder(new MockEncoder(textToEncode, Language.UNKNOWN, expectedTensor)) + .setEmbedder(new MockEmbedder(textToEmbed, Language.UNKNOWN, expectedTensor)) .build(); assertEquals(0, query1.errors().size()); assertEquals(expectedTensor, query1.properties().get("ranking.features.query(myTensor4)")); @@ -461,11 +460,11 @@ public class QueryProfileTypeTestCase { // Explicit language Query query2 = new Query.Builder().setRequest(HttpRequest.createTestRequest("?" + urlEncode("ranking.features.query(myTensor4)") + - "=" + urlEncode("encode(" + textToEncode + ")") + + "=" + urlEncode("embed(" + textToEmbed + ")") + "&language=en", com.yahoo.jdisc.http.HttpRequest.Method.GET)) .setQueryProfile(cRegistry.getComponent("test")) - .setEncoder(new MockEncoder(textToEncode, Language.ENGLISH, expectedTensor)) + .setEmbedder(new MockEmbedder(textToEmbed, Language.ENGLISH, expectedTensor)) .build(); assertEquals(0, query2.errors().size()); assertEquals(expectedTensor, query2.properties().get("ranking.features.query(myTensor4)")); @@ -723,28 +722,28 @@ public class QueryProfileTypeTestCase { } } - private static final class MockEncoder implements Encoder { + private static final class MockEmbedder implements Embedder { private final String expectedText; private final Language expectedLanguage; private final Tensor tensorToReturn; - public MockEncoder(String expectedText, - Language expectedLanguage, - Tensor tensorToReturn) { + public MockEmbedder(String expectedText, + Language expectedLanguage, + Tensor tensorToReturn) { this.expectedText = expectedText; this.expectedLanguage = expectedLanguage; this.tensorToReturn = tensorToReturn; } @Override - public List encode(String text, Language language) { + public List embed(String text, Language language) { fail("Unexpected call"); return null; } @Override - public Tensor encode(String text, Language language, TensorType tensorType) { + public Tensor embed(String text, Language language, TensorType tensorType) { assertEquals(expectedText, text); assertEquals(expectedLanguage, language); assertEquals(tensorToReturn.type(), tensorType); -- cgit v1.2.3