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

Commit b2799663 authored by Charles Chen's avatar Charles Chen Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-63dae37384ff42c4ad3ee8cab0e7dbc9" into tm-mainline-prod 

* changes:
  [automerge] Promote WMJetpackUnitTests to presubmit 2p: 77071e81
  Promote WMJetpackUnitTests to presubmit
parents 27e8c4c0 d8503772

libs/WindowManager/Jetpack/src/TEST_MAPPING

0 → 100644
+32 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "WMJetpackUnitTests",

      "options": [

        {

          "include-annotation": "android.platform.test.annotations.Presubmit"

        },

        {

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

        },

        {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

    },

    {

      "name": "CtsWindowManagerJetpackTestCases",

      "options": [

        {

          "include-annotation": "android.platform.test.annotations.Presubmit"

        },

        {

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

        },

        {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

    }

  ]

}
 
 No newline at end of file

libs/WindowManager/Jetpack/tests/unittest/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ package { 


android_test {

    name: "WMJetpackUnitTests",

    // To make the test run via TEST_MAPPING

    test_suites: ["device-tests"],



    srcs: [

        "**/*.java",

libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/WindowExtensionsTest.java

+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package androidx.window.extensions; 


import static com.google.common.truth.Truth.assertThat;



import android.platform.test.annotations.Presubmit;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;
@@ -25,6 +27,13 @@ import org.junit.Before; 
import org.junit.Test;

import org.junit.runner.RunWith;



/**

 * Test class for {@link WindowExtensionsTest}.

 *

 * Build/Install/Run:

 *  atest WMJetpackUnitTests:WindowExtensionsTest

 */

@Presubmit

@SmallTest

@RunWith(AndroidJUnit4.class)

public class WindowExtensionsTest {

libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import static org.junit.Assert.assertNull; 
import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.never;



import android.platform.test.annotations.Presubmit;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;
@@ -39,6 +41,7 @@ import org.mockito.MockitoAnnotations; 
 * Build/Install/Run:

 *  atest WMJetpackUnitTests:JetpackTaskFragmentOrganizerTest

 */

@Presubmit

@SmallTest

@RunWith(AndroidJUnit4.class)

public class JetpackTaskFragmentOrganizerTest {

libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/SplitControllerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ import static com.google.common.truth.Truth.assertWithMessage; 
import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;



import android.platform.test.annotations.Presubmit;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.window.extensions.embedding.SplitController.TaskContainer;
@@ -37,6 +39,7 @@ import org.junit.runner.RunWith; 
 * Build/Install/Run:

 *  atest WMJetpackUnitTests:SplitController

 */

@Presubmit

@SmallTest

@RunWith(AndroidJUnit4.class)

public class SplitControllerTest {