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

Commit bebe5b7c authored by Janis Danisevskis's avatar Janis Danisevskis
Browse files

Fixed KeyGenParameterSpecTest 

Test: atest KeystoreTests
Change-Id: If663677b01738025dca01bf209b634c1d04c6be4
parent 738e422b

keystore/tests/src/android/security/ParcelableKeyGenParameterSpecTest.java

+5 −5
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ public final class ParcelableKeyGenParameterSpecTest { 
    static final String ALIAS = "keystore-alias";

    static final String ANOTHER_ALIAS = "another-keystore-alias";

    static final int KEY_PURPOSES = KeyProperties.PURPOSE_SIGN | KeyProperties.PURPOSE_VERIFY;

    static final int UID = 1230;

    static final int KEYSIZE = 2048;

    static final X500Principal SUBJECT = new X500Principal("CN=subject");

    static final BigInteger SERIAL = new BigInteger("1234567890");
@@ -61,7 +60,7 @@ public final class ParcelableKeyGenParameterSpecTest { 


    public static KeyGenParameterSpec configureDefaultSpec() {

        return new KeyGenParameterSpec.Builder(ALIAS, KEY_PURPOSES)

                .setUid(UID)

                .setNamespace(KeyProperties.NAMESPACE_WIFI)

                .setKeySize(KEYSIZE)

                .setCertificateSubject(SUBJECT)

                .setCertificateSerialNumber(SERIAL)
@@ -88,10 +87,11 @@ public final class ParcelableKeyGenParameterSpecTest { 
                .build();

    }



    public static void validateSpecValues(KeyGenParameterSpec spec, int uid, String alias) {

    public static void validateSpecValues(KeyGenParameterSpec spec,

            @KeyProperties.Namespace int namespace, String alias) {

        assertThat(spec.getKeystoreAlias(), is(alias));

        assertThat(spec.getPurposes(), is(KEY_PURPOSES));

        assertThat(spec.getUid(), is(uid));

        assertThat(spec.getNamespace(), is(namespace));

        assertThat(spec.getKeySize(), is(KEYSIZE));

        assertThat(spec.getCertificateSubject(), is(SUBJECT));

        assertThat(spec.getCertificateSerialNumber(), is(SERIAL));
@@ -134,7 +134,7 @@ public final class ParcelableKeyGenParameterSpecTest { 
        Parcel parcel = parcelForReading(spec);

        ParcelableKeyGenParameterSpec fromParcel =

            ParcelableKeyGenParameterSpec.CREATOR.createFromParcel(parcel);

        validateSpecValues(fromParcel.getSpec(), UID, ALIAS);

        validateSpecValues(fromParcel.getSpec(), KeyProperties.NAMESPACE_WIFI, ALIAS);

        assertThat(parcel.dataAvail(), is(0));

    }

keystore/tests/src/android/security/keystore/KeyGenParameterSpecTest.java

+1 −3
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ import static org.junit.Assert.assertEquals; 
import static org.junit.Assert.assertThat;



import android.security.ParcelableKeyGenParameterSpecTest;

import android.security.keystore.KeyGenParameterSpec;

import android.security.keystore.KeyProperties;



import androidx.test.runner.AndroidJUnit4;
@@ -41,7 +39,7 @@ public final class KeyGenParameterSpecTest { 
        KeyGenParameterSpec copiedSpec =

                new KeyGenParameterSpec.Builder(spec).build();

        ParcelableKeyGenParameterSpecTest.validateSpecValues(

                copiedSpec, spec.getUid(), spec.getKeystoreAlias());

                copiedSpec, spec.getNamespace(), spec.getKeystoreAlias());

    }



    @Test