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

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

Merge "Mark core unit tests for Presubmit"

parents fa828543 6438ee54

tests/anomaly-tester/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 
-->



<resources>

    <string name="app_name">AnomalyTester</string>

    <string name="app_name" translatable="false">AnomalyTester</string>

</resources>

tests/unit/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common ims-common 
LOCAL_STATIC_JAVA_LIBRARIES := \

    android-support-test \

    espresso-core \

    espresso-contrib-nodep \

    espresso-intents-nodep \

    legacy-android-test \

    mockito-target-minus-junit4 \

    platform-test-annotations \

    truth-prebuilt \

    ub-uiautomator \

    espresso-contrib-nodep \

    espresso-intents-nodep \



    ub-uiautomator



# Include all test java files.

LOCAL_SRC_FILES := $(call all-java-files-under, src)

tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.core; 
import static junit.framework.Assert.fail;



import android.content.Context;

import android.platform.test.annotations.Presubmit;

import android.provider.SearchIndexableResource;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.MediumTest;
@@ -49,6 +50,7 @@ public class PreferenceControllerContractTest { 
    }



    @Test

    @Presubmit

    public void controllersInSearchShouldImplementPreferenceControllerMixin() {

        final Set<String> errorClasses = new ArraySet<>();

tests/unit/src/com/android/settings/core/UniquePreferenceTest.java

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static junit.framework.Assert.fail; 
import android.content.Context;

import android.content.res.Resources;

import android.content.res.XmlResourceParser;

import android.platform.test.annotations.Presubmit;

import android.provider.SearchIndexableResource;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.MediumTest;
@@ -83,6 +84,7 @@ public class UniquePreferenceTest { 
     * should have a key.

     */

    @Test

    @Presubmit

    public void allPreferencesShouldHaveUniqueKey()

            throws IOException, XmlPullParserException, Resources.NotFoundException {

        final Set<String> uniqueKeys = new HashSet<>();