Adapt AndroidXSmokeTest to work against the appsearch-alpha03 drop.

Test: AndroidXSmokeTest
Exempt-From-Owner-Approval: LSC for androidx update
Change-Id: I1f2599847db38e6c283c81b678616b416c47688c

2 files changed, 29 insertions, 18 deletions

diff --git a/java/tests/instrumentation/src/androidx/appsearch/smoketest/AppSearchSmokeTest.java b/java/tests/instrumentation/src/androidx/appsearch/smoketest/AndroidXSmokeTest.java
index 8fae104..98b1b25 100644
--- a/java/tests/instrumentation/src/androidx/appsearch/smoketest/AppSearchSmokeTest.java
+++ b/java/tests/instrumentation/src/androidx/appsearch/smoketest/AndroidXSmokeTest.java
@@ -24,6 +24,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.GenericDocument;
 import androidx.appsearch.app.PutDocumentsRequest;
 import androidx.appsearch.app.SearchResult;
 import androidx.appsearch.app.SearchResults;
@@ -32,15 +33,16 @@ import androidx.appsearch.app.SetSchemaRequest;
 import androidx.appsearch.localstorage.LocalStorage;
 import androidx.appsearch.localstorage.LocalStorage.SearchContext;
 import androidx.test.core.app.ApplicationProvider;
-import androidx.test.filters.SmallTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.List;
 
-@SmallTest
-public class AppSearchSmokeTest {
+@RunWith(AndroidJUnit4.class)
+public class AndroidXSmokeTest {
     private AppSearchSession appSearch;
 
     @Before
@@ -48,7 +50,8 @@ public class AppSearchSmokeTest {
         appSearch =
                 LocalStorage.createSearchSession(
                                 new SearchContext.Builder(
-                                                ApplicationProvider.getApplicationContext())
+                                                ApplicationProvider.getApplicationContext(),
+                                                "database")
                                         .build())
                         .get();
         // Remove all data before test
@@ -79,7 +82,7 @@ public class AppSearchSmokeTest {
                                 .build())
                 .get();
 
-        TestDocument input = new TestDocument("uri1", "avocado");
+        TestDocument input = new TestDocument("namespace", "id1", "avocado");
         appSearch
                 .put(new PutDocumentsRequest.Builder().addDocuments(input).build())
                 .get()
@@ -95,10 +98,11 @@ public class AppSearchSmokeTest {
         SearchResult result = page.get(0);
         assertThat(results.getNextPage().get()).isEmpty();
 
-        assertEquals("uri1", result.getDocument().getUri());
-        assertEquals("avocado", result.getDocument().getPropertyString("body"));
-        TestDocument output = result.getDocument().toDocumentClass(TestDocument.class);
-        assertEquals("uri1", output.getUri());
+        GenericDocument genericOutput = result.getGenericDocument();
+        assertEquals("id1", genericOutput.getId());
+        assertEquals("avocado", genericOutput.getPropertyString("body"));
+        TestDocument output = genericOutput.toDocumentClass(TestDocument.class);
+        assertEquals("id1", output.getId());
         assertEquals("avocado", output.getBody());
     }
 }
diff --git a/java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDocument.java b/java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDocument.java
index 089ff55..ebf32e4 100644
--- a/java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDocument.java
+++ b/java/tests/instrumentation/src/androidx/appsearch/smoketest/TestDocument.java
@@ -21,21 +21,28 @@ import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig;
 
 @Document
 public class TestDocument {
-    @Document.Uri private final String uri;
+    @Document.Namespace private final String mNamespace;
 
-    @Document.Property(indexingType = StringPropertyConfig.INDEXING_TYPE_PREFIXES)
-    private final String body;
+    @Document.Id private final String mId;
 
-    TestDocument(String uri, String body) {
-        this.uri = uri;
-        this.body = body;
+    @Document.StringProperty(indexingType = StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+    private final String mBody;
+
+    TestDocument(String namespace, String id, String body) {
+        mNamespace = namespace;
+        mId = id;
+        mBody = body;
+    }
+
+    public String getNamespace() {
+        return mNamespace;
     }
 
-    public String getUri() {
-        return uri;
+    public String getId() {
+        return mId;
     }
 
     public String getBody() {
-        return body;
+        return mBody;
     }
 }