From 2dd61a31f74d9763dd5d90134f1af9523b0c02d8 Mon Sep 17 00:00:00 2001
From: Kweku Adams <kwekua@google.com>
Date: Wed, 21 Apr 2021 14:04:23 -0700
Subject: [PATCH] Change test to use public stop reasons.

Bug: 141645789
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/job
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/job
Test: atest CtsJobSchedulerTestCases
Change-Id: I326c35f7047347d81588c94ac5b29e6d5739d97b
---
 .../job/BackgroundRestrictionsTest.java       | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/services/tests/servicestests/src/com/android/server/job/BackgroundRestrictionsTest.java b/services/tests/servicestests/src/com/android/server/job/BackgroundRestrictionsTest.java
index 68a6e6017bc60..d91a7481d026a 100644
--- a/services/tests/servicestests/src/com/android/server/job/BackgroundRestrictionsTest.java
+++ b/services/tests/servicestests/src/com/android/server/job/BackgroundRestrictionsTest.java
@@ -91,12 +91,12 @@ public class BackgroundRestrictionsTest {
                     case ACTION_JOB_STARTED:
                         mTestJobStatus.running = true;
                         mTestJobStatus.jobId = params.getJobId();
-                        mTestJobStatus.stopReason = JobParameters.REASON_CANCELED;
+                        mTestJobStatus.stopReason = JobParameters.STOP_REASON_UNDEFINED;
                         break;
                     case ACTION_JOB_STOPPED:
                         mTestJobStatus.running = false;
                         mTestJobStatus.jobId = params.getJobId();
-                        mTestJobStatus.stopReason = params.getLegacyStopReason();
+                        mTestJobStatus.stopReason = params.getStopReason();
                         break;
                 }
             }
@@ -142,7 +142,8 @@ public class BackgroundRestrictionsTest {
         setAppOpsModeAllowed(false);
         mIActivityManager.makePackageIdle(TEST_APP_PACKAGE, UserHandle.USER_CURRENT);
         assertTrue("Job did not stop after putting app under bg-restriction",
-                awaitJobStop(DEFAULT_WAIT_TIMEOUT));
+                awaitJobStop(DEFAULT_WAIT_TIMEOUT,
+                        JobParameters.STOP_REASON_BACKGROUND_RESTRICTION));
 
         setPowerExemption(true);
         scheduleTestJob();
@@ -152,7 +153,8 @@ public class BackgroundRestrictionsTest {
 
         setPowerExemption(false);
         assertTrue("Job did not stop after removing from the power exemption list",
-                awaitJobStop(DEFAULT_WAIT_TIMEOUT));
+                awaitJobStop(DEFAULT_WAIT_TIMEOUT,
+                        JobParameters.STOP_REASON_BACKGROUND_RESTRICTION));
 
         scheduleTestJob();
         Thread.sleep(TestJobActivity.JOB_MINIMUM_LATENCY);
@@ -170,7 +172,7 @@ public class BackgroundRestrictionsTest {
         setAppOpsModeAllowed(false);
         mIActivityManager.makePackageIdle(TEST_APP_PACKAGE, UserHandle.USER_CURRENT);
         assertFalse("Job stopped even when feature flag was disabled",
-                awaitJobStop(DEFAULT_WAIT_TIMEOUT));
+                awaitJobStop(DEFAULT_WAIT_TIMEOUT, JobParameters.STOP_REASON_UNDEFINED));
     }
 
     @After
@@ -208,11 +210,13 @@ public class BackgroundRestrictionsTest {
         });
     }
 
-    private boolean awaitJobStop(long timeout) throws InterruptedException {
+    private boolean awaitJobStop(long timeout, @JobParameters.StopReason int expectedStopReason)
+            throws InterruptedException {
         return waitUntilTrue(timeout, () -> {
             synchronized (mTestJobStatus) {
-                return (mTestJobStatus.jobId == mTestJobId) && !mTestJobStatus.running &&
-                        mTestJobStatus.stopReason == JobParameters.REASON_CONSTRAINTS_NOT_SATISFIED;
+                return (mTestJobStatus.jobId == mTestJobId) && !mTestJobStatus.running
+                        && (expectedStopReason == JobParameters.STOP_REASON_UNDEFINED
+                        || mTestJobStatus.stopReason == expectedStopReason);
             }
         });
     }