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

Commit 0fcf3af1 authored by Xiang Wang's avatar Xiang Wang
Browse files

Add TEST_MAPPING for game manager and game service code 

Test: atest
Bug: b/243854920
Change-Id: Ic0368d79b3dccb8a69cc78a66ba7bd9a5bc43871
parent 56fe9580

core/java/android/service/games/TEST_MAPPING

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

  "presubmit": [

    // TODO(b/245615658): fix flaky CTS test CtsGameServiceTestCases and add it as presubmit

    {

      "name": "FrameworksMockingServicesTests",

      "options": [

        {

          "include-filter": "android.service.games"

        },

        {

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

        }

      ]

    }

  ]

}
 
 No newline at end of file

services/core/java/com/android/server/app/TEST_MAPPING

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

  "presubmit": [

    {

      "name": "CtsGameManagerTestCases",

      "options": [

        {

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

        }

      ]

    },

    {

      "name": "FrameworksMockingServicesTests",

      "options": [

        {

          "include-filter": "com.android.server.app"

        },

        {

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

        }

      ]

    }

  ]

}
 
 No newline at end of file

services/tests/mockingservicestests/src/android/service/games/GameSessionTrampolineActivityTest.java

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.widget.LinearLayout; 
import android.widget.TextView;



import androidx.test.espresso.NoActivityResumedException;

import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;



import com.android.internal.infra.AndroidFuture;
@@ -80,6 +81,7 @@ public class GameSessionTrampolineActivityTest { 
    }



    @Test

    @FlakyTest(bugId = 245615459)

    public void launch_targetActivityFinishesSuccessfully_futureCompletedWithSameResults() {

        AndroidFuture<GameSessionActivityResult> resultFuture =

                startTestActivityViaGameSessionTrampolineActivity();
@@ -96,6 +98,7 @@ public class GameSessionTrampolineActivityTest { 
    }



    @Test

    @FlakyTest(bugId = 245616660)

    public void launch_trampolineActivityProcessDeath_futureCompletedWithSameResults() {

        setAlwaysFinishActivities(true);