From 5b9422ffdf522172c1a69d28007bf82ee74ffa0e Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Mon, 4 Mar 2013 11:37:49 -0500 Subject: [PATCH] cleaned up old unit tests --- .../src/test/resources/jwe/jweHeader | 1 - .../src/test/resources/jwk/jwkFail | 15 --- .../src/test/resources/jwk/jwkSuccess | 15 --- .../src/test/resources/jwk/rsaOnly | 8 -- .../src/test/resources/jwt/claims | 6 -- .../src/test/resources/jwt/hs256 | 2 - .../src/test/resources/jwt/hs384 | 2 - .../src/test/resources/jwt/hs512 | 2 - .../src/test/resources/jwt/plaintext | 2 - .../src/test/resources/jwt/rs256 | 2 - .../src/test/resources/jwt/rs384 | 2 - .../src/test/resources/jwt/rs512 | 2 - .../src/test/resources/x509/HmacJwt | 6 -- .../src/test/resources/x509/x509Cert | 15 --- .../connect/view/X509CertificateViewTest.java | 91 ------------------- 15 files changed, 171 deletions(-) delete mode 100644 openid-connect-common/src/test/resources/jwe/jweHeader delete mode 100644 openid-connect-common/src/test/resources/jwk/jwkFail delete mode 100644 openid-connect-common/src/test/resources/jwk/jwkSuccess delete mode 100644 openid-connect-common/src/test/resources/jwk/rsaOnly delete mode 100644 openid-connect-common/src/test/resources/jwt/claims delete mode 100644 openid-connect-common/src/test/resources/jwt/hs256 delete mode 100644 openid-connect-common/src/test/resources/jwt/hs384 delete mode 100644 openid-connect-common/src/test/resources/jwt/hs512 delete mode 100644 openid-connect-common/src/test/resources/jwt/plaintext delete mode 100644 openid-connect-common/src/test/resources/jwt/rs256 delete mode 100644 openid-connect-common/src/test/resources/jwt/rs384 delete mode 100644 openid-connect-common/src/test/resources/jwt/rs512 delete mode 100644 openid-connect-common/src/test/resources/x509/HmacJwt delete mode 100644 openid-connect-common/src/test/resources/x509/x509Cert delete mode 100644 openid-connect-server/src/test/java/org/mitre/openid/connect/view/X509CertificateViewTest.java diff --git a/openid-connect-common/src/test/resources/jwe/jweHeader b/openid-connect-common/src/test/resources/jwe/jweHeader deleted file mode 100644 index 2763d3eb8..000000000 --- a/openid-connect-common/src/test/resources/jwe/jweHeader +++ /dev/null @@ -1 +0,0 @@ -{"alg":"RSA1_5","enc":"A256CBC","int":"HS256","iv":"AxY8DCtDaGlsbGljb3RoZQ","kdf":"CS256"} \ No newline at end of file diff --git a/openid-connect-common/src/test/resources/jwk/jwkFail b/openid-connect-common/src/test/resources/jwk/jwkFail deleted file mode 100644 index 4a208df47..000000000 --- a/openid-connect-common/src/test/resources/jwk/jwkFail +++ /dev/null @@ -1,15 +0,0 @@ - {"jwk": - [ - {"alg":"never", - "crv":"gonna", - "x":"MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4", - "y":"4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM", - "use":"give", - "kid":"1"}, - - {"alg":"you", - "mod": "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw", - "exp":"up", - "kid":"rick astley"} - ] - } \ No newline at end of file diff --git a/openid-connect-common/src/test/resources/jwk/jwkSuccess b/openid-connect-common/src/test/resources/jwk/jwkSuccess deleted file mode 100644 index 1ad6f5d5f..000000000 --- a/openid-connect-common/src/test/resources/jwk/jwkSuccess +++ /dev/null @@ -1,15 +0,0 @@ - {"jwk": - [ - {"alg":"EC", - "crv":"P-256", - "x":"MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4", - "y":"4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM", - "use":"enc", - "kid":"1"}, - - {"alg":"RSA", - "mod": "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw", - "exp":"AQAB", - "kid":"2011-04-29"} - ] - } \ No newline at end of file diff --git a/openid-connect-common/src/test/resources/jwk/rsaOnly b/openid-connect-common/src/test/resources/jwk/rsaOnly deleted file mode 100644 index a5f42177d..000000000 --- a/openid-connect-common/src/test/resources/jwk/rsaOnly +++ /dev/null @@ -1,8 +0,0 @@ - {"jwk": - [ - {"alg":"RSA", - "mod": "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAtVT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn64tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FDW2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n91CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINHaQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw", - "exp":"AQAB", - "kid":"2011-04-29"} - ] - } \ No newline at end of file diff --git a/openid-connect-common/src/test/resources/jwt/claims b/openid-connect-common/src/test/resources/jwt/claims deleted file mode 100644 index 11f69c7e2..000000000 --- a/openid-connect-common/src/test/resources/jwt/claims +++ /dev/null @@ -1,6 +0,0 @@ -{"iss":"joe", - "user_id":34252452623, - "aud":"yolo", - "exp":35324583457247, - "iat":43215325235, - "nonce":"howdy"} \ No newline at end of file diff --git a/openid-connect-common/src/test/resources/jwt/hs256 b/openid-connect-common/src/test/resources/jwt/hs256 deleted file mode 100644 index a4cdd0b17..000000000 --- a/openid-connect-common/src/test/resources/jwt/hs256 +++ /dev/null @@ -1,2 +0,0 @@ -{"typ":"JWT", - "alg":"HS256"} diff --git a/openid-connect-common/src/test/resources/jwt/hs384 b/openid-connect-common/src/test/resources/jwt/hs384 deleted file mode 100644 index 68f175c1a..000000000 --- a/openid-connect-common/src/test/resources/jwt/hs384 +++ /dev/null @@ -1,2 +0,0 @@ -{"typ":"JWT", - "alg":"HS384"} diff --git a/openid-connect-common/src/test/resources/jwt/hs512 b/openid-connect-common/src/test/resources/jwt/hs512 deleted file mode 100644 index 42c727e09..000000000 --- a/openid-connect-common/src/test/resources/jwt/hs512 +++ /dev/null @@ -1,2 +0,0 @@ -{"typ":"JWT", - "alg":"HS512"} diff --git a/openid-connect-common/src/test/resources/jwt/plaintext b/openid-connect-common/src/test/resources/jwt/plaintext deleted file mode 100644 index e16befde3..000000000 --- a/openid-connect-common/src/test/resources/jwt/plaintext +++ /dev/null @@ -1,2 +0,0 @@ -{"typ":"JWT", - "alg":"none"} \ No newline at end of file diff --git a/openid-connect-common/src/test/resources/jwt/rs256 b/openid-connect-common/src/test/resources/jwt/rs256 deleted file mode 100644 index 1d069af3f..000000000 --- a/openid-connect-common/src/test/resources/jwt/rs256 +++ /dev/null @@ -1,2 +0,0 @@ -{"typ":"JWT", - "alg":"RS256"} \ No newline at end of file diff --git a/openid-connect-common/src/test/resources/jwt/rs384 b/openid-connect-common/src/test/resources/jwt/rs384 deleted file mode 100644 index 21ceb32e6..000000000 --- a/openid-connect-common/src/test/resources/jwt/rs384 +++ /dev/null @@ -1,2 +0,0 @@ -{"typ":"JWT", - "alg":"RS384"} diff --git a/openid-connect-common/src/test/resources/jwt/rs512 b/openid-connect-common/src/test/resources/jwt/rs512 deleted file mode 100644 index 37d614532..000000000 --- a/openid-connect-common/src/test/resources/jwt/rs512 +++ /dev/null @@ -1,2 +0,0 @@ -{"typ":"JWT", - "alg":"RS512"} diff --git a/openid-connect-common/src/test/resources/x509/HmacJwt b/openid-connect-common/src/test/resources/x509/HmacJwt deleted file mode 100644 index f076c9dab..000000000 --- a/openid-connect-common/src/test/resources/x509/HmacJwt +++ /dev/null @@ -1,6 +0,0 @@ -eyJ0eXAiOiJKV1QiLA0KICJhbGciOiJIUzI1NiJ9 -. -eyJpc3MiOiJqb2UiLA0KICJleHAiOjEzMDA4MTkzODAsDQogImh0dHA6Ly9leGFt -cGxlLmNvbS9pc19yb290Ijp0cnVlfQ -. -dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk \ No newline at end of file diff --git a/openid-connect-common/src/test/resources/x509/x509Cert b/openid-connect-common/src/test/resources/x509/x509Cert deleted file mode 100644 index 2d60d2c3e..000000000 --- a/openid-connect-common/src/test/resources/x509/x509Cert +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICxDCCAi0CBECcV/wwDQYJKoZIhvcNAQEEBQAwgagxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIEwVU -ZXhhczEPMA0GA1UEBxMGQXVzdGluMSowKAYDVQQKEyFUaGUgVW5pdmVyc2l0eSBvZiBUZXhhcyBh -dCBBdXN0aW4xKDAmBgNVBAsTH0luZm9ybWF0aW9uIFRlY2hub2xvZ3kgU2VydmljZXMxIjAgBgNV -BAMTGXhtbGdhdGV3YXkuaXRzLnV0ZXhhcy5lZHUwHhcNMDQwNTA4MDM0NjA0WhcNMDQwODA2MDM0 -NjA0WjCBqDELMAkGA1UEBhMCVVMxDjAMBgNVBAgTBVRleGFzMQ8wDQYDVQQHEwZBdXN0aW4xKjAo -BgNVBAoTIVRoZSBVbml2ZXJzaXR5IG9mIFRleGFzIGF0IEF1c3RpbjEoMCYGA1UECxMfSW5mb3Jt -YXRpb24gVGVjaG5vbG9neSBTZXJ2aWNlczEiMCAGA1UEAxMZeG1sZ2F0ZXdheS5pdHMudXRleGFz -LmVkdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsmc+6+NjLmanvh+FvBziYdBwTiz+d/DZ -Uy2jyvij6f8Xly6zkhHLSsuBzw08wPzr2K+F359bf9T3uiZMuao//FBGtDrTYpvQwkn4PFZwSeY2 -Ynw4edxp1JEWT2zfOY+QJDfNgpsYQ9hrHDwqnpbMVVqjdBq5RgTKGhFBj9kxEq0CAwEAATANBgkq -hkiG9w0BAQQFAAOBgQCPYGXF6oRbnjti3CPtjfwORoO7ab1QzNS9Z2rLMuPnt6POlm1A3UPEwCS8 -6flTlAqg19Sh47H7+Iq/LuzotKvUE5ugK52QRNMa4c0OSaO5UEM5EfVox1pT9tZV1Z3whYYMhThg -oC4y/On0NUVMN5xfF/GpSACga/bVjoNvd8HWEg== ------END CERTIFICATE----- \ No newline at end of file diff --git a/openid-connect-server/src/test/java/org/mitre/openid/connect/view/X509CertificateViewTest.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/view/X509CertificateViewTest.java deleted file mode 100644 index 7d952c4c1..000000000 --- a/openid-connect-server/src/test/java/org/mitre/openid/connect/view/X509CertificateViewTest.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * - */ -package org.mitre.openid.connect.view; - -import java.io.IOException; -import java.lang.reflect.Field; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.NoSuchAlgorithmException; -import java.security.PublicKey; -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mitre.openid.connect.config.ConfigurationPropertiesBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.replay; - -/** - * @author jricher - * - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { "classpath:test-context.xml" }) -public class X509CertificateViewTest { - - @Autowired - private ConfigurationPropertiesBean config; - - /** - * Test method for {@link org.mitre.openid.connect.view.X509CertificateView#renderMergedOutputModel(java.util.Map, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}. - * @throws IOException - * @throws NoSuchAlgorithmException - * @throws NoSuchFieldException - * @throws SecurityException - * @throws IllegalAccessException - * @throws IllegalArgumentException - */ - @Test - public void testRenderMergedOutputModelMapOfStringObjectHttpServletRequestHttpServletResponse() throws IOException, NoSuchAlgorithmException, SecurityException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException { - - X509CertificateView view = new X509CertificateView(); - - // set the config bean - Field field = view.getClass().getDeclaredField("config"); - field.setAccessible(true); - field.set(view, config); - - Map model = createMock(Map.class); - HttpServletRequest request = createMock(HttpServletRequest.class); - HttpServletResponse response = createMock(HttpServletResponse.class); - - // make a signer from a randomly-generated key - KeyPairGenerator generator = KeyPairGenerator.getInstance("RSA"); - KeyPair kp = generator.generateKeyPair(); - - // add that signer to the map - Map keys = new HashMap(); - keys.put("rsa1", kp.getPublic()); - - expect(model.get("keys")).andReturn(keys); - - // throw away output for now - expect(response.getOutputStream()).andReturn(new ServletOutputStream() { - public void write(int b) throws IOException { } - }); - - response.setContentType("application/x-pem-file"); - expectLastCall(); - - replay(model); - replay(request); - replay(response); - - view.renderMergedOutputModel(model , request, response); - - } - -}