Revert "Update AppSearchSmokeTest to match latest AppSearch API." am: 1d5658d179
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/13463364
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I73645bb18b95017ebeac2866aed4343b8db7692d
diff --git a/java/tests/instrumentation/src/androidx/appsearch/smoketest/AppSearchSmokeTest.java b/java/tests/instrumentation/src/androidx/appsearch/smoketest/AppSearchSmokeTest.java
index 5c70a94..2328ebf 100644
--- a/java/tests/instrumentation/src/androidx/appsearch/smoketest/AppSearchSmokeTest.java
+++ b/java/tests/instrumentation/src/androidx/appsearch/smoketest/AppSearchSmokeTest.java
@@ -22,7 +22,6 @@
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;
@@ -60,32 +59,29 @@
AppSearchSchema schema =
new AppSearchSchema.Builder("testType")
.addProperty(
- new StringPropertyConfig.Builder("prop")
+ new PropertyConfig.Builder("prop")
+ .setDataType(PropertyConfig.DATA_TYPE_STRING)
.setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
- .setIndexingType(
- StringPropertyConfig.INDEXING_TYPE_PREFIXES)
- .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+ .setIndexingType(PropertyConfig.INDEXING_TYPE_PREFIXES)
+ .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
.build())
.build();
- appSearch.setSchema(new SetSchemaRequest.Builder().addSchemas(schema).build()).get();
+ appSearch.setSchema(new SetSchemaRequest.Builder().addSchema(schema).build()).get();
}
@Test
public void smokeTestAnnotationProcessor() throws Exception {
appSearch
- .setSchema(
- new SetSchemaRequest.Builder()
- .addDocumentClasses(TestDocument.class)
- .build())
+ .setSchema(new SetSchemaRequest.Builder().addDataClass(TestDataClass.class).build())
.get();
- TestDocument input = new TestDocument("uri1", "avocado");
+ TestDataClass input = new TestDataClass("uri1", "avocado");
appSearch
- .put(new PutDocumentsRequest.Builder().addDocuments(input).build())
+ .putDocuments(new PutDocumentsRequest.Builder().addDataClass(input).build())
.get()
.checkSuccess();
SearchResults results =
- appSearch.search(
+ appSearch.query(
"av",
new SearchSpec.Builder()
.setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
@@ -97,7 +93,7 @@
assertEquals("uri1", result.getDocument().getUri());
assertEquals("avocado", result.getDocument().getPropertyString("body"));
- TestDocument output = result.getDocument().toDataClass(TestDocument.class);
+ TestDataClass output = result.getDocument().toDataClass(TestDataClass.class);
assertEquals("uri1", output.getUri());
assertEquals("avocado", output.getBody());
}
diff --git a/java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDocument.java b/java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDataClass.java
similarity index 71%
rename from java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDocument.java
rename to java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDataClass.java
index 089ff55..45bbf64 100644
--- a/java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDocument.java
+++ b/java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDataClass.java
@@ -16,17 +16,17 @@
package androidx.appsearch.smoketest;
-import androidx.appsearch.annotation.Document;
-import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig;
+import androidx.appsearch.annotation.AppSearchDocument;
+import androidx.appsearch.app.AppSearchSchema.PropertyConfig;
-@Document
-public class TestDocument {
- @Document.Uri private final String uri;
+@AppSearchDocument
+public class TestDataClass {
+ @AppSearchDocument.Uri private final String uri;
- @Document.Property(indexingType = StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+ @AppSearchDocument.Property(indexingType = PropertyConfig.INDEXING_TYPE_PREFIXES)
private final String body;
- TestDocument(String uri, String body) {
+ TestDataClass(String uri, String body) {
this.uri = uri;
this.body = body;
}