commit 659e987ef9f53287885c658c1ad0527ff447e5bf
author Alexander Dorokhine <adorokhine@google.com> Mon Feb 01 21:18:32 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 01 21:18:32 2021 +0000
tree 3e9dbc52fe547ee17029ee0b0e399ea1ec695d10
parent 694712181f7f2df569851489454e19b350b0ca36
parent f223e1f66dee5b95314fb491593eec6329a1ca65

Update AppSearchSmokeTest to match latest AppSearch API. am: f223e1f66d

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/13452382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I13155d0e2d056aa08fde6da9f1cfacbbe814e3e1

java/tests/instrumentation/src/androidx/appsearch/smoketest/AppSearchSmokeTest.java

diff --git a/java/tests/instrumentation/src/androidx/appsearch/smoketest/AppSearchSmokeTest.java b/java/tests/instrumentation/src/androidx/appsearch/smoketest/AppSearchSmokeTest.java
index 2328ebf..5c70a94 100644
--- a/java/tests/instrumentation/src/androidx/appsearch/smoketest/AppSearchSmokeTest.java
+++ b/java/tests/instrumentation/src/androidx/appsearch/smoketest/AppSearchSmokeTest.java
@@ -22,6 +22,7 @@
 
 import androidx.appsearch.app.AppSearchSchema;
 import androidx.appsearch.app.AppSearchSchema.PropertyConfig;
+import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig;
 import androidx.appsearch.app.AppSearchSession;
 import androidx.appsearch.app.PutDocumentsRequest;
 import androidx.appsearch.app.SearchResult;
@@ -59,29 +60,32 @@
         AppSearchSchema schema =
                 new AppSearchSchema.Builder("testType")
                         .addProperty(
-                                new PropertyConfig.Builder("prop")
-                                        .setDataType(PropertyConfig.DATA_TYPE_STRING)
+                                new StringPropertyConfig.Builder("prop")
                                         .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
-                                        .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
-                                        .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
+                                        .setIndexingType(
+                                                StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
                                         .build())
                         .build();
-        appSearch.setSchema(new SetSchemaRequest.Builder().addSchema(schema).build()).get();
+        appSearch.setSchema(new SetSchemaRequest.Builder().addSchemas(schema).build()).get();
     }
 
     @Test
     public void smokeTestAnnotationProcessor() throws Exception {
         appSearch
-                .setSchema(new SetSchemaRequest.Builder().addDataClass(TestDataClass.class).build())
+                .setSchema(
+                        new SetSchemaRequest.Builder()
+                                .addDocumentClasses(TestDocument.class)
+                                .build())
                 .get();
 
-        TestDataClass input = new TestDataClass("uri1", "avocado");
+        TestDocument input = new TestDocument("uri1", "avocado");
         appSearch
-                .putDocuments(new PutDocumentsRequest.Builder().addDataClass(input).build())
+                .put(new PutDocumentsRequest.Builder().addDocuments(input).build())
                 .get()
                 .checkSuccess();
         SearchResults results =
-                appSearch.query(
+                appSearch.search(
                         "av",
                         new SearchSpec.Builder()
                                 .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
@@ -93,7 +97,7 @@
 
         assertEquals("uri1", result.getDocument().getUri());
         assertEquals("avocado", result.getDocument().getPropertyString("body"));
-        TestDataClass output = result.getDocument().toDataClass(TestDataClass.class);
+        TestDocument output = result.getDocument().toDataClass(TestDocument.class);
         assertEquals("uri1", output.getUri());
         assertEquals("avocado", output.getBody());
     }

java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDocument.java

diff --git a/java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDataClass.java b/java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDocument.java
similarity index 71%
rename from java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDataClass.java
rename to java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDocument.java
index 45bbf64..089ff55 100644
--- a/java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDataClass.java
+++ b/java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDocument.java
@@ -16,17 +16,17 @@
 
 package androidx.appsearch.smoketest;
 
-import androidx.appsearch.annotation.AppSearchDocument;
-import androidx.appsearch.app.AppSearchSchema.PropertyConfig;
+import androidx.appsearch.annotation.Document;
+import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig;
 
-@AppSearchDocument
-public class TestDataClass {
-    @AppSearchDocument.Uri private final String uri;
+@Document
+public class TestDocument {
+    @Document.Uri private final String uri;
 
-    @AppSearchDocument.Property(indexingType = PropertyConfig.INDEXING_TYPE_PREFIXES)
+    @Document.Property(indexingType = StringPropertyConfig.INDEXING_TYPE_PREFIXES)
     private final String body;
 
-    TestDataClass(String uri, String body) {
+    TestDocument(String uri, String body) {
         this.uri = uri;
         this.body = body;
     }