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

Commit 4681849a authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Rename WM test filter to FrameworksTestsFilter 

This CL adds Window Manager related tests of FrameworksServicesTests
to the test filter, and adds a comment to each tests mentioning about
FrameworksTestsFilter.

Test: Pass all 85 non-flaky presubmit tests of FrameworksCoreTests specified
      in FrameworksTestsFilter.
  $ tradefed.sh run commandAndExit FrameworksCoreTests \
      --instrumentation-arg filter=com.android.server.wm.test.filters.FrameworksTestsFilter
      --include-annotation android.platform.test.annotations.Presubmit \
      --exclude-annotation androidx.test.filters.FlakyTest

Test: Pass all 133 non-flaky presubmit tests of FrameworksServicesTests
      specified in FrameworksTestsFilter.
  $ tradefed.sh run commandAndExit FrameworksServicesTests \
      --instrumentation-arg filter=com.android.server.wm.test.filters.FrameworksTestsFilter
      --include-annotation android.platform.test.annotations.Presubmit \
      --exclude-annotation androidx.test.filters.FlakyTest

Test: Pass all 162 non-flaky presubmit tests of FrameworksServicesTests
      specified as under package com.android.server.wm.
  $ tradefed.sh run commandAndExit FrameworksServicesTests \
      --instrumentation-arg selectTest=com.android.server.wm. \
      --instrumentation-arg filter=com.android.server.wm.test.filters.FrameworksTestsFilter
      --include-annotation android.platform.test.annotations.Presubmit \
      --exclude-annotation androidx.test.filters.FlakyTest
Bug: 122451194

Change-Id: I9592ff01158eec1b4ef4d0dd22be243e10bd198e
Merged-In: I9592ff01158eec1b4ef4d0dd22be243e10bd198e
parent 06bdf061

core/tests/coretests/src/android/app/servertransaction/ClientTransactionTests.java

+9 −0
Original line number Diff line number Diff line
@@ -29,6 +29,15 @@ import android.support.test.runner.AndroidJUnit4; 
import org.junit.Test;

import org.junit.runner.RunWith;



/**

 * Tests for {@link ClientTransaction}.

 *

 * <p>Build/Install/Run:

 *  atest FrameworksCoreTests:ClientTransactionTests

 *

 * <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

core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java

+9 −0
Original line number Diff line number Diff line
@@ -41,6 +41,15 @@ import android.support.test.runner.AndroidJUnit4; 
import org.junit.Test;

import org.junit.runner.RunWith;



/**

 * Tests for {@link ObjectPool}.

 *

 * <p>Build/Install/Run:

 *  atest FrameworksCoreTests:ObjectPoolTests

 *

 * <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

core/tests/coretests/src/android/app/servertransaction/TransactionExecutorTests.java

+10 −3
Original line number Diff line number Diff line
@@ -26,9 +26,8 @@ import static android.app.servertransaction.ActivityLifecycleItem.ON_STOP; 
import static android.app.servertransaction.ActivityLifecycleItem.PRE_ON_CREATE;

import static android.app.servertransaction.ActivityLifecycleItem.UNDEFINED;



import static junit.framework.Assert.assertEquals;



import static org.junit.Assert.assertArrayEquals;

import static org.junit.Assert.assertEquals;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.inOrder;
@@ -58,7 +57,15 @@ import java.util.Collections; 
import java.util.List;

import java.util.stream.Collectors;



/** Test {@link TransactionExecutor} logic. */

/**

 * Test {@link TransactionExecutor} logic.

 *

 * <p>Build/Install/Run:

 *  atest FrameworksCoreTests:TransactionExecutorTests

 *

 * <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

core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java

+11 −3
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ import static android.app.servertransaction.TestUtils.mergedConfig; 
import static android.app.servertransaction.TestUtils.referrerIntentList;

import static android.app.servertransaction.TestUtils.resultInfoList;



import static junit.framework.Assert.assertEquals;

import static junit.framework.Assert.assertTrue;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;



import android.app.IApplicationThread;

import android.app.IInstrumentationWatcher;
@@ -60,7 +60,15 @@ import org.junit.runner.RunWith; 
import java.util.List;

import java.util.Map;



/** Test parcelling and unparcelling of transactions and transaction items. */

/**

 * Test parcelling and unparcelling of transactions and transaction items.

 *

 * <p>Build/Install/Run:

 *  atest FrameworksCoreTests:TransactionParcelTests

 *

 * <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

core/tests/coretests/src/android/view/DisplayCutoutTest.java

+9 −0
Original line number Diff line number Diff line
@@ -40,6 +40,15 @@ import org.junit.runner.RunWith; 


import java.util.Arrays;



/**

 * Tests for {@link DisplayCutout}.

 *

 * <p>Build/Install/Run:

 *  atest FrameworksCoreTests:DisplayCutoutTest

 *

 * <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