tests updated to work with updated getJWTVerifyKeys handling issuer correctly

jalauros · jalauros · commit d3978731c584 · 2018-08-20T18:17:19.000+03:00
diff --git a/src/test/java/org/oidc/msg/AbstractMessageTest.java b/src/test/java/org/oidc/msg/AbstractMessageTest.java
@@ -194,7 +194,7 @@ public void testSuccessFromJWTSignVerifyNone() throws InvalidClaimException, Ill
     String jwt = getSignedJwt("none");
     KeyJar keyJar = getKeyJarPub();
     mockMessage.fromJwt(jwt, keyJar, keyOwner);
-    Assert.assertEquals(mockMessage.getClaims().get("iss"), "op");
+    Assert.assertEquals(mockMessage.getClaims().get("iss"), keyOwner);
   }
 
   @Test
@@ -209,7 +209,7 @@ public void testSuccessFromJWTSignVerifyRS() throws InvalidClaimException, Illeg
     mockMessage.fromJwt(jwt, keyJar, keyOwner);
     jwt = getSignedJwt("RS512");
     mockMessage.fromJwt(jwt, keyJar, keyOwner);
-    Assert.assertEquals(mockMessage.getClaims().get("iss"), "op");
+    Assert.assertEquals(mockMessage.getClaims().get("iss"), keyOwner);
   }
   
   @Test
diff --git a/src/test/java/org/oidc/msg/BaseMessageTest.java b/src/test/java/org/oidc/msg/BaseMessageTest.java
@@ -50,7 +50,7 @@ public abstract class BaseMessageTest<T extends AbstractMessage> {
   private static final String PRIVATE_KEY_FILE = "src/test/resources/rsa-private.pem";
   private static final String PUBLIC_KEY_FILE = "src/test/resources/rsa-public.pem";
   //TODO: return keyOwner to https://issuer.example.com once edmund explains how parameter is used in getJWTVerifyKeys 
-  protected String keyOwner = "";//"https://issuer.example.com";
+  protected String keyOwner = "https://issuer.example.com";
   protected KeyJar keyJarOfPrivateKeys = null;
   protected KeyJar keyJarOfPublicKeys = null;
   protected String signedJwt = null;
@@ -148,7 +148,7 @@ protected String getSignedJwt(String alg)
       default:
         break;
     }
-    return JWT.create().withIssuer("op").sign(algorithm);
+    return JWT.create().withIssuer(keyOwner).sign(algorithm);
   }
 
   /**
@@ -209,7 +209,7 @@ protected KeyJar getKeyJarPub()
    */
   protected String generateIdTokenNow(Map<String, Object> claims, Key key, String algo)
       throws InvalidClaimException {
-    claims.put("iss", "issuer");
+    claims.put("iss", keyOwner);
     claims.put("sub", "subject");
     claims.put("aud", "clientid");
     claims.put("exp", (System.currentTimeMillis() / 1000) + 5);
diff --git a/src/test/java/org/oidc/msg/oidc/AuthenticationRequestTest.java b/src/test/java/org/oidc/msg/oidc/AuthenticationRequestTest.java
@@ -248,7 +248,7 @@ public void testUrlEncodingSuccess()
 
   private IDToken getIDTokenHint() throws InvalidClaimException {
     Map<String, Object> idTokenClaims = new HashMap<String, Object>();
-    idTokenClaims.put("iss", "issuer");
+    idTokenClaims.put("iss", keyOwner);
     idTokenClaims.put("sub", "subject");
     idTokenClaims.put("aud", "clientid");
     long now = System.currentTimeMillis() / 1000;
