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

Commit 57f1b662 authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Add LSS tests to presubmit. 

Bug: 120536847
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/locksettings/
Test: insert a fail() into a test, see TH failure for patch set 1
Change-Id: Ic09abf94c1b0fdce29afe70a4fd01f31761c1208
parent 4d7990f4

services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -85,10 +85,11 @@ import android.security.keystore.AttestationUtils; 
import android.telephony.TelephonyManager;

import android.telephony.data.ApnSetting;

import android.test.MoreAsserts;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.ArraySet;

import android.util.Pair;



import androidx.test.filters.SmallTest;



import com.android.internal.R;

import com.android.internal.widget.LockPatternUtils;

import com.android.server.LocalServices;

services/tests/servicestests/src/com/android/server/locksettings/BaseLockSettingsServiceTests.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ import java.util.ArrayList; 
import java.util.Arrays;





public class BaseLockSettingsServiceTests extends AndroidTestCase {

public abstract class BaseLockSettingsServiceTests extends AndroidTestCase {

    protected static final int PRIMARY_USER_ID = 0;

    protected static final int MANAGED_PROFILE_USER_ID = 12;

    protected static final int TURNED_OFF_PROFILE_USER_ID = 17;

services/tests/servicestests/src/com/android/server/locksettings/CachedSyntheticPasswordTests.java

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import android.os.RemoteException;

import android.platform.test.annotations.Presubmit;



import androidx.test.filters.SmallTest;



import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.VerifyCredentialResponse;
@@ -40,6 +43,8 @@ import java.util.ArrayList; 
 * By default, those tests run without caching. Untrusted credential reset depends on caching so

 * this class included those tests.

 */

@SmallTest

@Presubmit

public class CachedSyntheticPasswordTests extends SyntheticPasswordTests {



    @Override

services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTests.java

+5 −0
Original line number Diff line number Diff line
@@ -26,8 +26,11 @@ import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_PASSW 
import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_PATTERN;



import android.os.RemoteException;

import android.platform.test.annotations.Presubmit;

import android.service.gatekeeper.GateKeeperResponse;



import androidx.test.filters.SmallTest;



import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.VerifyCredentialResponse;

import com.android.server.locksettings.FakeGateKeeperService.VerifyHandle;
@@ -36,6 +39,8 @@ import com.android.server.locksettings.LockSettingsStorage.CredentialHash; 
/**

 * runtest frameworks-services -c com.android.server.locksettings.LockSettingsServiceTests

 */

@SmallTest

@Presubmit

public class LockSettingsServiceTests extends BaseLockSettingsServiceTests {



    @Override

services/tests/servicestests/src/com/android/server/locksettings/LockSettingsShellCommandTest.java

+5 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC; 


import static com.android.internal.widget.LockPatternUtils.stringToPattern;



import static junit.framework.Assert.*;

import static junit.framework.Assert.assertEquals;



import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.any;
@@ -30,6 +30,10 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.when;



import static java.io.FileDescriptor.err;

import static java.io.FileDescriptor.in;

import static java.io.FileDescriptor.out;



import android.app.ActivityManager;

import android.content.Context;

import android.os.Binder;
@@ -51,8 +55,6 @@ import org.junit.runner.RunWith; 
import org.mockito.Mock;

import org.mockito.MockitoAnnotations;



import static java.io.FileDescriptor.*;



/**

 * Test class for {@link LockSettingsShellCommand}.

 *