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

Commit 16e64b57 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add DisplayTest to FrameworksTestsFilter" into sc-dev am: 3203531c 

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

Change-Id: Id35669923a961324c73a2543e79e5138562c937d
parents b53a8aa9 3203531c

core/tests/mockingcoretests/src/android/view/DisplayTests.java→core/tests/mockingcoretests/src/android/view/DisplayTest.java

+5 −2
Original line number Diff line number Diff line
@@ -56,12 +56,15 @@ import java.util.function.Consumer; 
 *

 * <p>Build/Install/Run:

 *

 * atest FrameworksMockingCoreTests:android.view.DisplayTests

 * atest FrameworksMockingCoreTests:android.view.DisplayTest

 *

 * <p>This test class is a part of Window Manager Service tests and specified in

 * {@link com.android.server.wm.test.filters.FrameworksTestsFilter}.

 */

@RunWith(AndroidJUnit4.class)

@SmallTest

@Presubmit

public class DisplayTests {

public class DisplayTest {



    private static final int APP_WIDTH = 272;

    private static final int APP_HEIGHT = 700;

tests/utils/testutils/java/com/android/server/wm/test/filters/FrameworksTestsFilter.java

+9 −0
Original line number Diff line number Diff line
@@ -30,12 +30,21 @@ import com.android.test.filters.SelectTest; 
 *     -e selectTest_verbose true \

 *     com.android.frameworks.coretests/androidx.test.runner.AndroidJUnitRunner

 * </pre>

 *

 * <p>Use this filter when running FrameworksMockingCoreTests as

 * <pre>

 * adb shell am instrument -w \

 *     -e filter com.android.server.wm.test.filters.FrameworksTestsFilter \

 *     -e selectTest_verbose true \

 *     com.android.frameworks.mockingcoretests/androidx.test.runner.AndroidJUnitRunner

 * </pre>

 */

public final class FrameworksTestsFilter extends SelectTest {



    private static final String[] SELECTED_TESTS = {

            // Test specifications for FrameworksMockingCoreTests.

            "android.app.activity.ActivityThreadClientTest",

            "android.view.DisplayTest",

            // Test specifications for FrameworksCoreTests.

            "android.app.servertransaction.", // all tests under the package.

            "android.view.CutoutSpecificationTest",