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

Commit ef13466e authored by Felipe Leme's avatar Felipe Leme
Browse files

Fixed NetworkPolicyManagerServiceTest. 

NetworkPolicyManagerServiceTest had many tests there were @Suppressed
because they were obsolete and harder to fix using Easymocks.

This CL replaced EasyMock by Mockito and re-enabled most tests, although
some tests were removed because:
- It's underlying logic changed too much that.
- It would be hard to mock all external entities they interact with.
- They are covered by CTS tests.

Fixes: 30764608

Change-Id: I53ff86fc9b64cb058846f1aefa244771630d9e1e
parent ed45cf3c

services/core/java/com/android/server/DeviceIdleController.java

+1 −2
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import android.os.Bundle; 
import android.os.Environment;

import android.os.FileUtils;

import android.os.Handler;

import android.os.IBinder;

import android.os.IDeviceIdleController;

import android.os.IMaintenanceActivityListener;

import android.os.Looper;
@@ -1238,7 +1237,7 @@ public class DeviceIdleController extends SystemService 
        }

    }



    public final class LocalService {

    public class LocalService {

        public void addPowerSaveTempWhitelistAppDirect(int appId, long duration, boolean sync,

                String reason) {

            addPowerSaveTempWhitelistAppDirectInternal(0, appId, duration, sync, reason);

services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java

+281 −481

File changed.

Preview size limit exceeded, changes collapsed.