diff options
author | tholenst <tholenst@google.com> | 2023-07-04 07:06:50 -0700 |
---|---|---|
committer | Copybara-Service <copybara-worker@google.com> | 2023-07-04 07:08:15 -0700 |
commit | 3abb457a0dcbec333badcf584db92e771973eaa3 (patch) | |
tree | d2ef174f3a30ea185f9461653ab584ff249b526b /java_src/src/test/java/com/google/crypto/tink | |
parent | f0f8c26381af1ed223b1aeb4f4ce530bc0542b00 (diff) | |
download | tink-3abb457a0dcbec333badcf584db92e771973eaa3.tar.gz |
Avoid KeyTemplate#getValue in the Jwt tests.
PiperOrigin-RevId: 545437494
Diffstat (limited to 'java_src/src/test/java/com/google/crypto/tink')
3 files changed, 14 insertions, 2 deletions
diff --git a/java_src/src/test/java/com/google/crypto/tink/jwt/BUILD.bazel b/java_src/src/test/java/com/google/crypto/tink/jwt/BUILD.bazel index 9527c7ac7..b9176b827 100644 --- a/java_src/src/test/java/com/google/crypto/tink/jwt/BUILD.bazel +++ b/java_src/src/test/java/com/google/crypto/tink/jwt/BUILD.bazel @@ -112,6 +112,7 @@ java_test( "//src/main/java/com/google/crypto/tink:key_template", "//src/main/java/com/google/crypto/tink:key_templates", "//src/main/java/com/google/crypto/tink:registry_cluster", + "//src/main/java/com/google/crypto/tink/internal:key_template_proto_converter", "//src/main/java/com/google/crypto/tink/internal:key_type_manager", "//src/main/java/com/google/crypto/tink/jwt:json_util", "//src/main/java/com/google/crypto/tink/jwt:jwt_format", @@ -184,6 +185,7 @@ java_test( "//src/main/java/com/google/crypto/tink:key_template", "//src/main/java/com/google/crypto/tink:key_templates", "//src/main/java/com/google/crypto/tink:registry_cluster", + "//src/main/java/com/google/crypto/tink/internal:key_template_proto_converter", "//src/main/java/com/google/crypto/tink/internal:key_type_manager", "//src/main/java/com/google/crypto/tink/jwt:json_util", "//src/main/java/com/google/crypto/tink/jwt:jwt_format", diff --git a/java_src/src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPkcs1SignKeyManagerTest.java b/java_src/src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPkcs1SignKeyManagerTest.java index 7a73e0c7c..92b28bc3a 100644 --- a/java_src/src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPkcs1SignKeyManagerTest.java +++ b/java_src/src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPkcs1SignKeyManagerTest.java @@ -25,6 +25,7 @@ import com.google.crypto.tink.CleartextKeysetHandle; import com.google.crypto.tink.KeyTemplate; import com.google.crypto.tink.KeyTemplates; import com.google.crypto.tink.KeysetHandle; +import com.google.crypto.tink.internal.KeyTemplateProtoConverter; import com.google.crypto.tink.internal.KeyTypeManager; import com.google.crypto.tink.proto.JwtRsaSsaPkcs1Algorithm; import com.google.crypto.tink.proto.JwtRsaSsaPkcs1KeyFormat; @@ -270,8 +271,14 @@ public class JwtRsaSsaPkcs1SignKeyManagerTest { } private static void checkTemplate( - KeyTemplate template, JwtRsaSsaPkcs1Algorithm algorithm, int moduloSize, int publicExponent) + KeyTemplate javaTemplate, + JwtRsaSsaPkcs1Algorithm algorithm, + int moduloSize, + int publicExponent) throws Exception { + com.google.crypto.tink.proto.KeyTemplate template = + KeyTemplateProtoConverter.toProto(javaTemplate); + assertThat(template.getTypeUrl()).isEqualTo(new JwtRsaSsaPkcs1SignKeyManager().getKeyType()); JwtRsaSsaPkcs1KeyFormat format = JwtRsaSsaPkcs1KeyFormat.parseFrom( diff --git a/java_src/src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPssSignKeyManagerTest.java b/java_src/src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPssSignKeyManagerTest.java index 7af44038e..9928c59cb 100644 --- a/java_src/src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPssSignKeyManagerTest.java +++ b/java_src/src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPssSignKeyManagerTest.java @@ -25,6 +25,7 @@ import com.google.crypto.tink.CleartextKeysetHandle; import com.google.crypto.tink.KeyTemplate; import com.google.crypto.tink.KeyTemplates; import com.google.crypto.tink.KeysetHandle; +import com.google.crypto.tink.internal.KeyTemplateProtoConverter; import com.google.crypto.tink.internal.KeyTypeManager; import com.google.crypto.tink.proto.JwtRsaSsaPssAlgorithm; import com.google.crypto.tink.proto.JwtRsaSsaPssKeyFormat; @@ -268,8 +269,10 @@ public class JwtRsaSsaPssSignKeyManagerTest { } private static void checkTemplate( - KeyTemplate template, JwtRsaSsaPssAlgorithm algorithm, int moduloSize, int publicExponent) + KeyTemplate javaTemplate, JwtRsaSsaPssAlgorithm algorithm, int moduloSize, int publicExponent) throws Exception { + com.google.crypto.tink.proto.KeyTemplate template = + KeyTemplateProtoConverter.toProto(javaTemplate); assertThat(template.getTypeUrl()).isEqualTo(new JwtRsaSsaPssSignKeyManager().getKeyType()); JwtRsaSsaPssKeyFormat format = JwtRsaSsaPssKeyFormat.parseFrom( |