diff options
10 files changed, 44 insertions, 5 deletions
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java index bd7774a64019..5b1970004971 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -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; diff --git a/services/tests/servicestests/src/com/android/server/locksettings/BaseLockSettingsServiceTests.java b/services/tests/servicestests/src/com/android/server/locksettings/BaseLockSettingsServiceTests.java index 3d02576c8e7f..2fbeebdb4937 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/BaseLockSettingsServiceTests.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/BaseLockSettingsServiceTests.java @@ -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; diff --git a/services/tests/servicestests/src/com/android/server/locksettings/CachedSyntheticPasswordTests.java b/services/tests/servicestests/src/com/android/server/locksettings/CachedSyntheticPasswordTests.java index ca4330fa7a5d..d2a914527880 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/CachedSyntheticPasswordTests.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/CachedSyntheticPasswordTests.java @@ -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 diff --git a/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTests.java b/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTests.java index 255e694bffaf..7ebc7454d995 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTests.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTests.java @@ -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 diff --git a/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsShellCommandTest.java b/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsShellCommandTest.java index fcfc6d2267c5..c00d33b431c3 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsShellCommandTest.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsShellCommandTest.java @@ -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}. * diff --git a/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsStorageTests.java b/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsStorageTests.java index 6e1f35784c7d..8af4edda3b8b 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsStorageTests.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsStorageTests.java @@ -29,11 +29,14 @@ import android.database.sqlite.SQLiteDatabase; import android.os.FileUtils; import android.os.UserManager; import android.os.storage.StorageManager; +import android.platform.test.annotations.Presubmit; import android.test.AndroidTestCase; import android.util.Log; import android.util.Log.TerribleFailure; import android.util.Log.TerribleFailureHandler; +import androidx.test.filters.SmallTest; + import com.android.internal.widget.LockPatternUtils; import com.android.server.PersistentDataBlockManagerInternal; import com.android.server.locksettings.LockSettingsStorage.CredentialHash; @@ -48,6 +51,8 @@ import java.util.concurrent.CountDownLatch; /** * runtest frameworks-services -c com.android.server.locksettings.LockSettingsStorageTests */ +@SmallTest +@Presubmit public class LockSettingsStorageTests extends AndroidTestCase { private static final int SOME_USER_ID = 1034; private final byte[] PASSWORD_0 = "thepassword0".getBytes(); diff --git a/services/tests/servicestests/src/com/android/server/locksettings/PasswordSlotManagerTests.java b/services/tests/servicestests/src/com/android/server/locksettings/PasswordSlotManagerTests.java index 1d5a99b8af04..31526b55411c 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/PasswordSlotManagerTests.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/PasswordSlotManagerTests.java @@ -16,8 +16,11 @@ package com.android.server.locksettings; +import android.platform.test.annotations.Presubmit; import android.test.AndroidTestCase; +import androidx.test.filters.SmallTest; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.HashMap; @@ -25,6 +28,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +@SmallTest +@Presubmit public class PasswordSlotManagerTests extends AndroidTestCase { PasswordSlotManagerTestable mManager; diff --git a/services/tests/servicestests/src/com/android/server/locksettings/SP800DeriveTests.java b/services/tests/servicestests/src/com/android/server/locksettings/SP800DeriveTests.java index fc2dcb9cc83b..29d0fc1f43d1 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/SP800DeriveTests.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/SP800DeriveTests.java @@ -16,10 +16,15 @@ package com.android.server.locksettings; +import android.platform.test.annotations.Presubmit; import android.test.AndroidTestCase; +import androidx.test.filters.SmallTest; + import com.android.internal.util.HexDump; +@SmallTest +@Presubmit public class SP800DeriveTests extends AndroidTestCase { public void testFixedInput() throws Exception { // CAVP: https://csrc.nist.gov/projects/cryptographic-algorithm-validation-program/key-derivation diff --git a/services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java b/services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java index 5a9ca0f88287..0273f7651207 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java @@ -33,6 +33,9 @@ import static org.mockito.Mockito.verify; import android.app.admin.PasswordMetrics; import android.os.RemoteException; import android.os.UserHandle; +import android.platform.test.annotations.Presubmit; + +import androidx.test.filters.SmallTest; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.VerifyCredentialResponse; @@ -48,6 +51,8 @@ import java.util.ArrayList; /** * runtest frameworks-services -c com.android.server.locksettings.SyntheticPasswordTests */ +@SmallTest +@Presubmit public class SyntheticPasswordTests extends BaseLockSettingsServiceTests { public static final byte[] PAYLOAD = new byte[] {1, 2, -1, -2, 55}; diff --git a/services/tests/servicestests/src/com/android/server/locksettings/WeaverBasedSyntheticPasswordTests.java b/services/tests/servicestests/src/com/android/server/locksettings/WeaverBasedSyntheticPasswordTests.java index 5e567044fba6..abbf01681c87 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/WeaverBasedSyntheticPasswordTests.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/WeaverBasedSyntheticPasswordTests.java @@ -1,5 +1,11 @@ package com.android.server.locksettings; +import android.platform.test.annotations.Presubmit; + +import androidx.test.filters.SmallTest; + +@SmallTest +@Presubmit public class WeaverBasedSyntheticPasswordTests extends SyntheticPasswordTests { @Override |