commit 257610236148f097ed4a174ceacd97f02e046ff4
author Alexander Dorokhine <adorokhine@google.com> Sat Jan 18 11:13:43 2020 -0800
committer Alexander Dorokhine <adorokhine@google.com> Sat Jan 18 11:13:43 2020 -0800
tree 30133f9a969bf7c7b9a044ecdf8560842ac47d29
parent 05e9f64245a696d6add70ed06205746f7cdbea5e

Update CTS tests for synchronous API.

Test: presubmit
Bug: 145635424
Change-Id: I4232c48b0692eee1cfce52aba5fb769325cc14d8

tests/appsearch/src/com/android/cts/appsearch/AppSearchManagerTest.java

diff --git a/tests/appsearch/src/com/android/cts/appsearch/AppSearchManagerTest.java b/tests/appsearch/src/com/android/cts/appsearch/AppSearchManagerTest.java
index 73c8d34f..4756a2c 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/AppSearchManagerTest.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/AppSearchManagerTest.java
@@ -25,19 +25,11 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import com.android.internal.util.ConcurrentUtils;
-
-import com.google.common.collect.ImmutableList;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-
 @RunWith(AndroidJUnit4.class)
 public class AppSearchManagerTest {
-    private final Executor mExecutor = ConcurrentUtils.DIRECT_EXECUTOR;
     private final Context mContext = InstrumentationRegistry.getInstrumentation().getContext();
     private final AppSearchManager mAppSearch = mContext.getSystemService(AppSearchManager.class);
 
@@ -49,7 +41,7 @@
     }
 
     @Test
-    public void testSetSchema() throws Exception {
+    public void testSetSchema() {
         AppSearchSchema emailSchema = AppSearchSchema.newBuilder("Email")
                 .addProperty(AppSearchSchema.newPropertyBuilder("subject")
                         .setDataType(PropertyConfig.DATA_TYPE_STRING)
@@ -64,10 +56,6 @@
                         .setTokenizerType(PropertyConfig.TOKENIZER_TYPE_PLAIN)
                         .build()
                 ).build();
-
-        CompletableFuture<Throwable> result = new CompletableFuture<>();
-        mAppSearch.setSchema(
-                ImmutableList.of(emailSchema), /*force=*/false, mExecutor, result::complete);
-        assertThat(result.get()).isEqualTo(null);
+        mAppSearch.setSchema(emailSchema);
     }
 }