1 files changed, 13 insertions, 14 deletions

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<float>(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<Integer> encode(String text, Language language) {
+        public List<Integer> 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);