commit 8d07ca1bfe8f1a2ff37820731a881102eded2e3f
author jgkim <jgkim2@humaxdigital.com> Thu Feb 20 10:22:09 2020 +0900
committer Jonggun Kim <jgkim2@humaxdigital.com> Tue Jun 09 01:05:26 2020 +0000
tree 7f58954d2a0bd81597de70e78ee5598f7608511a
parent 89a9ec036c5e6bceedbb4637069443ef96403fc1

CtsJobSchedulerTestCases: Fix issues in android.jobscheduler.cts.ConnectivityConstraintTest

1.android.jobscheduler.cts.ConnectivityConstraintTest#testConnectivityConstraintExecutes_withWifi
2.android.jobscheduler.cts.ConnectivityConstraintTest#testUnmeteredConstraintExecutes_withWifi
3.android.jobscheduler.cts.ConnectivityConstraintTest#testMeteredConstraintExecutes_withWifi

Bug:143000256
Test: run cts-on-gsi -m CtsJobSchedulerTestCases -t android.jobscheduler.cts.ConnectivityConstraintTest#testConnectivityConstraintExecutes_withWifi
Test: run cts-on-gsi -m CtsJobSchedulerTestCases -t android.jobscheduler.cts.ConnectivityConstraintTest#testUnmeteredConstraintExecutes_withWifi
Test: run cts-on-gsi -m CtsJobSchedulerTestCases -t android.jobscheduler.cts.ConnectivityConstraintTest#testMeteredConstraintExecutes_withWifi
Change-Id: I1329390722cb5db498a6769e915287c71677ee78
Merged-In: I028c9d3040cd63ac7a611e882d1dfad53a8231a2

tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java

diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java
index e092a0d..7f7d870 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java
@@ -80,10 +80,12 @@
         mBuilder =
                 new JobInfo.Builder(CONNECTIVITY_JOB_ID, kJobServiceComponent);
 
-        mInitialWiFiState = mWifiManager.isWifiEnabled();
         mInitialRestrictBackground = SystemUtil
                 .runShellCommand(getInstrumentation(), RESTRICT_BACKGROUND_GET_CMD)
                 .contains("enabled");
+        if (mHasWifi) {
+            mInitialWiFiState = mWifiManager.isWifiEnabled();
+        }
     }
 
     @Override
@@ -94,26 +96,24 @@
         if (mInitialRestrictBackground) {
             SystemUtil.runShellCommand(getInstrumentation(), RESTRICT_BACKGROUND_ON_CMD);
         }
-
         // Ensure that we leave WiFi in its previous state.
-        if (mWifiManager.isWifiEnabled() == mInitialWiFiState) {
-            return;
-        }
-        NetworkInfo.State expectedState = mInitialWiFiState ?
-                NetworkInfo.State.CONNECTED : NetworkInfo.State.DISCONNECTED;
-        ConnectivityActionReceiver receiver =
-                new ConnectivityActionReceiver(ConnectivityManager.TYPE_WIFI,
-                        expectedState);
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
-        mContext.registerReceiver(receiver, filter);
+        if (mHasWifi && (mWifiManager.isWifiEnabled() != mInitialWiFiState)) {
+            NetworkInfo.State expectedState = mInitialWiFiState ?
+                    NetworkInfo.State.CONNECTED : NetworkInfo.State.DISCONNECTED;
+            ConnectivityActionReceiver receiver =
+                    new ConnectivityActionReceiver(ConnectivityManager.TYPE_WIFI,
+                            expectedState);
+            IntentFilter filter = new IntentFilter();
+            filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+            mContext.registerReceiver(receiver, filter);
 
-        assertTrue(mWifiManager.setWifiEnabled(mInitialWiFiState));
-        receiver.waitForStateChange();
-        assertTrue("Failure to restore previous WiFi state",
+            assertTrue(mWifiManager.setWifiEnabled(mInitialWiFiState));
+            receiver.waitForStateChange();
+            assertTrue("Failure to restore previous WiFi state",
                 mWifiManager.isWifiEnabled() == mInitialWiFiState);
 
-        mContext.unregisterReceiver(receiver);
+            mContext.unregisterReceiver(receiver);
+        }
 
         super.tearDown();
     }