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

Commit f0b21ada authored by Anna Zhuravleva's avatar Anna Zhuravleva Committed by Android (Google) Code Review
Browse files

Merge "Use androidx LargeTest annotation for device tests." into main

parents 3ca244c3 440b6178

apct-tests/perftests/core/src/android/accessibility/AccessibilityPerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.app.Activity; 
import android.app.Instrumentation;

import android.app.UiAutomation;

import android.perftests.utils.PerfTestActivity;

import android.platform.test.annotations.LargeTest;

import android.view.View;

import android.view.ViewGroup;

import android.view.accessibility.AccessibilityEvent;
@@ -32,6 +31,7 @@ import android.widget.TextView; 


import androidx.benchmark.BenchmarkState;

import androidx.benchmark.junit4.BenchmarkRule;

import androidx.test.filters.LargeTest;

import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.rule.ActivityTestRule;

apct-tests/perftests/core/src/android/text/TextViewCursorAnchorInfoPerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ import android.content.Context; 
import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;

import android.perftests.utils.PerfTestActivity;

import android.platform.test.annotations.LargeTest;

import android.util.AttributeSet;

import android.view.View;

import android.view.ViewGroup;

import android.view.inputmethod.CursorAnchorInfo;

import android.widget.TextView;



import androidx.test.filters.LargeTest;

import androidx.test.rule.ActivityTestRule;



import org.junit.Before;

apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
            "name": "CtsJobSchedulerTestCases",

            "options": [

                {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},

                {"exclude-annotation": "android.platform.test.annotations.LargeTest"},

                {"exclude-annotation": "androidx.test.filters.LargeTest"},

                {"exclude-annotation": "androidx.test.filters.FlakyTest"},

                {"exclude-annotation": "androidx.test.filters.LargeTest"}

            ]
@@ -14,7 +14,7 @@ 
            "options": [

                {"include-filter": "com.android.server.job"},

                {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},

                {"exclude-annotation": "android.platform.test.annotations.LargeTest"},

                {"exclude-annotation": "androidx.test.filters.LargeTest"},

                {"exclude-annotation": "androidx.test.filters.FlakyTest"}

            ]

        },
@@ -23,7 +23,7 @@ 
            "options": [

                {"include-filter": "com.android.server.job"},

                {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},

                {"exclude-annotation": "android.platform.test.annotations.LargeTest"},

                {"exclude-annotation": "androidx.test.filters.LargeTest"},

                {"exclude-annotation": "androidx.test.filters.FlakyTest"}

            ]

        }

core/java/android/app/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ 
                    "include-annotation": "android.platform.test.annotations.Presubmit"

                },

                {

                    "exclude-annotation": "android.platform.test.annotations.LargeTest"

                    "exclude-annotation": "androidx.test.filters.LargeTest"

                },

                {

                    "exclude-annotation": "androidx.test.filters.FlakyTest"

core/java/android/content/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
          "include-annotation": "android.platform.test.annotations.Presubmit"

        },

        {

          "exclude-annotation": "android.platform.test.annotations.LargeTest"

          "exclude-annotation": "androidx.test.filters.LargeTest"

        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"