patched unit test to new format
parent
03e7337b9f
commit
cc727cee3e
|
@ -3,16 +3,12 @@
|
|||
*/
|
||||
package org.mitre.openid.connect.view;
|
||||
|
||||
import static org.easymock.EasyMock.createMock;
|
||||
import static org.easymock.EasyMock.expect;
|
||||
import static org.easymock.EasyMock.expectLastCall;
|
||||
import static org.easymock.EasyMock.replay;
|
||||
|
||||
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;
|
||||
|
||||
|
@ -20,20 +16,17 @@ import javax.servlet.ServletOutputStream;
|
|||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.apache.http.HttpRequest;
|
||||
import org.apache.http.HttpResponse;
|
||||
import org.easymock.EasyMock;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mitre.jwt.signer.JwsAlgorithm;
|
||||
import org.mitre.jwt.signer.JwtSigner;
|
||||
import org.mitre.jwt.signer.impl.RsaSigner;
|
||||
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 com.google.common.io.NullOutputStream;
|
||||
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
|
||||
|
@ -72,13 +65,12 @@ public class X509CertificateViewTest {
|
|||
// make a signer from a randomly-generated key
|
||||
KeyPairGenerator generator = KeyPairGenerator.getInstance("RSA");
|
||||
KeyPair kp = generator.generateKeyPair();
|
||||
RsaSigner rsaSigner = new RsaSigner(JwsAlgorithm.RS256.getJwaName(), kp.getPublic(), kp.getPrivate());
|
||||
|
||||
// add that signer to the map
|
||||
Map<String, JwtSigner> signers = new HashMap<String, JwtSigner>();
|
||||
signers.put("rsa1", rsaSigner);
|
||||
Map<String, PublicKey> keys = new HashMap<String, PublicKey>();
|
||||
keys.put("rsa1", kp.getPublic());
|
||||
|
||||
expect(model.get("signers")).andReturn(signers);
|
||||
expect(model.get("keys")).andReturn(keys);
|
||||
|
||||
// throw away output for now
|
||||
expect(response.getOutputStream()).andReturn(new ServletOutputStream() {
|
||||
|
|
Loading…
Reference in New Issue