Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f36a23b1 authored by Lucia Rossazza's avatar Lucia Rossazza Committed by Android (Google) Code Review
Browse files

Merge "FakeIcing#query should return Status.Code.OK Test: atest"

parents 6fc64280 b8da3007

apex/appsearch/service/java/com/android/server/appsearch/impl/FakeIcing.java

+5 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.util.SparseArray; 
import com.google.android.icing.proto.DocumentProto;

import com.google.android.icing.proto.PropertyProto;

import com.google.android.icing.proto.SearchResultProto;

import com.google.android.icing.proto.StatusProto;



import java.util.Locale;

import java.util.Map;
@@ -97,10 +98,12 @@ public class FakeIcing { 
    public SearchResultProto query(@NonNull String term) {

        String normTerm = normalizeString(term);

        Set<Integer> docIds = mIndex.get(normTerm);

        SearchResultProto.Builder results = SearchResultProto.newBuilder()

                .setStatus(StatusProto.newBuilder().setCode(StatusProto.Code.OK));

        if (docIds == null || docIds.isEmpty()) {

            return SearchResultProto.getDefaultInstance();

            return results.build();

        }

        SearchResultProto.Builder results = SearchResultProto.newBuilder();



        for (int docId : docIds) {

            DocumentProto document = mDocStore.get(docId);

            if (document != null) {

services/tests/servicestests/src/com/android/server/appsearch/impl/FakeIcingTest.java

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import androidx.test.runner.AndroidJUnit4; 
import com.google.android.icing.proto.DocumentProto;

import com.google.android.icing.proto.PropertyProto;

import com.google.android.icing.proto.SearchResultProto;

import com.google.android.icing.proto.StatusProto;



import org.junit.Test;

import org.junit.runner.RunWith;
@@ -117,6 +118,7 @@ public class FakeIcingTest { 
    private static List<String> queryGetUris(FakeIcing icing, String term) {

        List<String> uris = new ArrayList<>();

        SearchResultProto results = icing.query(term);

        assertThat(results.getStatus().getCode()).isEqualTo(StatusProto.Code.OK);

        for (SearchResultProto.ResultProto result : results.getResultsList()) {

            uris.add(result.getDocument().getUri());

        }