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

Commit b11d802d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Micro cleanup and refactoring"

parents c90fa88e 93d49935
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.content.Intent;
import android.os.UserManager;
import android.provider.SearchIndexableResource;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+2 −3
Original line number Diff line number Diff line
@@ -197,12 +197,11 @@ public class CardDatabaseHelper extends SQLiteOpenHelper {
    }

    Cursor getContextualCards() {
        final SQLiteDatabase db = this.getReadableDatabase();
        final SQLiteDatabase db = getReadableDatabase();
        final String selection = CardColumns.CARD_DISMISSED + "=0";
        Cursor cursor = db.query(CARD_TABLE, null /* columns */, selection,
        return db.query(CARD_TABLE, null /* columns */, selection,
                null /* selectionArgs */, null /* groupBy */, null /* having */,
                CardColumns.SCORE + " DESC" /* orderBy */);
        return cursor;
    }

    /**
+5 −11
Original line number Diff line number Diff line
@@ -28,33 +28,27 @@ import android.content.Context;
import android.net.Uri;

import com.android.settings.slices.CustomSliceRegistry;
import com.android.settings.slices.SettingsSliceProvider;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowContentResolver;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

@RunWith(RobolectricTestRunner.class)
public class ContextualCardLoaderTest {

    private Context mContext;
    private ContextualCardLoader mContextualCardLoader;
    private SettingsSliceProvider mProvider;

    @Before
    public void setUp() {
        mContext = RuntimeEnvironment.application;
        mContextualCardLoader = spy(new ContextualCardLoader(mContext));
        mProvider = new SettingsSliceProvider();
        ShadowContentResolver.registerProviderInternal(SettingsSliceProvider.SLICE_AUTHORITY,
                mProvider);
    }

    @Test