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

Commit 7221cfa1 authored by Hui Kang's avatar Hui Kang Committed by Automerger Merge Worker
Browse files

Merge "Remove IwTest annotation." into udc-dev am: 839c41d9 am: 8e3138f1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23716066



Change-Id: I78eedde909fc1ac44d1bdf9922267579cdbfd03f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0fad1890 8e3138f1

core/tests/coretests/src/android/content/res/FontScaleConverterActivityTest.java

+0 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static com.google.common.truth.Truth.assertThat; 
import android.app.Activity;

import android.compat.testing.PlatformCompatChangeRule;

import android.os.Bundle;

import android.platform.test.annotations.IwTest;

import android.platform.test.annotations.PlatinumTest;

import android.platform.test.annotations.Presubmit;

import android.provider.Settings;
@@ -74,7 +73,6 @@ public class FontScaleConverterActivityTest { 
    }



    @PlatinumTest(focusArea = "accessibility")

    @IwTest(focusArea = "accessibility")

    @Test

    public void testFontsScaleNonLinearly() {

        final ActivityScenario<TestActivity> scenario = rule.getScenario();
@@ -106,7 +104,6 @@ public class FontScaleConverterActivityTest { 
    }



    @PlatinumTest(focusArea = "accessibility")

    @IwTest(focusArea = "accessibility")

    @Test

    public void testOnConfigurationChanged_doesNotCrash() {

        final ActivityScenario<TestActivity> scenario = rule.getScenario();
@@ -121,7 +118,6 @@ public class FontScaleConverterActivityTest { 
    }



    @PlatinumTest(focusArea = "accessibility")

    @IwTest(focusArea = "accessibility")

    @Test

    public void testUpdateConfiguration_doesNotCrash() {

        final ActivityScenario<TestActivity> scenario = rule.getScenario();

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/CopyContentInSplit.kt

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.wm.shell.flicker.splitscreen



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.IwTest

import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.tools.common.traces.component.ComponentNameMatcher
@@ -62,7 +61,6 @@ class CopyContentInSplit(override val flicker: FlickerTest) : 
        }



    @PlatinumTest(focusArea = "sysui")

    @IwTest(focusArea = "sysui")

    @Presubmit

    @Test

    override fun cujCompleted() {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DragDividerToResize.kt

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.wm.shell.flicker.splitscreen



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.IwTest

import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
@@ -60,7 +59,6 @@ class DragDividerToResize(override val flicker: FlickerTest) : 
        }



    @PlatinumTest(focusArea = "sysui")

    @IwTest(focusArea = "sysui")

    @Presubmit

    @Test

    override fun cujCompleted() {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchAppByDoubleTapDivider.kt

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.wm.shell.flicker.splitscreen



import android.platform.test.annotations.IwTest

import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit
@@ -61,7 +60,6 @@ class SwitchAppByDoubleTapDivider(override val flicker: FlickerTest) : 
        }



    @PlatinumTest(focusArea = "sysui")

    @IwTest(focusArea = "sysui")

    @Presubmit

    @Test

    override fun cujCompleted() {

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBetweenSplitPairs.kt

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.wm.shell.flicker.splitscreen



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.IwTest

import android.platform.test.annotations.PlatinumTest

import android.platform.test.annotations.Presubmit

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
@@ -64,7 +63,6 @@ class SwitchBetweenSplitPairs(override val flicker: FlickerTest) : 
        }



    @PlatinumTest(focusArea = "sysui")

    @IwTest(focusArea = "sysui")

    @Presubmit

    @Test

    override fun cujCompleted() {