commit 49f2aedbdc106993d63f3daf27b87ee4b988da6c
author Thomas Holenstein <tholenst@google.com> Tue Jul 04 07:06:50 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Jul 04 07:08:00 2023 -0700
tree 6e0d3e6d325bf960f5fe57e9a2bc9b4c71f7d3b5
parent b5aeb937e19681a66d0e7b25438bc5a5b0a0ed7f

Avoid KeyTemplate#getValue in the Jwt tests.

PiperOrigin-RevId: 545437494
Change-Id: I0f65e3e27de0ed8355332deefb57520e92f7f98d

src/test/java/com/google/crypto/tink/jwt/BUILD.bazel

diff --git a/src/test/java/com/google/crypto/tink/jwt/BUILD.bazel b/src/test/java/com/google/crypto/tink/jwt/BUILD.bazel
index 9527c7a..b9176b8 100644
--- a/src/test/java/com/google/crypto/tink/jwt/BUILD.bazel
+++ b/src/test/java/com/google/crypto/tink/jwt/BUILD.bazel
@@ -112,6 +112,7 @@
         "//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 @@
         "//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",

src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPkcs1SignKeyManagerTest.java

diff --git a/src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPkcs1SignKeyManagerTest.java b/src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPkcs1SignKeyManagerTest.java
index 7a73e0c..92b28bc 100644
--- a/src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPkcs1SignKeyManagerTest.java
+++ b/src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPkcs1SignKeyManagerTest.java
@@ -25,6 +25,7 @@
 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 @@
   }
 
   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(

src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPssSignKeyManagerTest.java

diff --git a/src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPssSignKeyManagerTest.java b/src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPssSignKeyManagerTest.java
index 7af4403..9928c59 100644
--- a/src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPssSignKeyManagerTest.java
+++ b/src/test/java/com/google/crypto/tink/jwt/JwtRsaSsaPssSignKeyManagerTest.java
@@ -25,6 +25,7 @@
 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 @@
   }
 
   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(