[java-identity-provider COMMIT] /trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransien...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Mar  1 15:19:16 2015
New Revision: 7393

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7393&view=rev
Log:
"Bad data" test causes key alias to become empty, so this test now throws.

Modified:
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java?rev=7393&r1=7392&r2=7393&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java Sun Mar  1 15:19:16 2015
@@ -122,17 +122,19 @@
         Assert.assertEquals(decoder.decode(ct, RECIPIENT), PRINCIPAL);
     }
 
-    @Test(expectedExceptions = {NameDecoderException.class,}) public void timeout()
+    @Test(expectedExceptions = NameDecoderException.class)
+    public void timeout()
             throws SubjectCanonicalizationException, DataSealerException, NameDecoderException {
         final String ct = code(PRINCIPAL, RECIPIENT, -10);
 
         decoder.decode(ct, RECIPIENT);
     }
 
-    @Test public void baddata() throws DataSealerException, NameDecoderException {
+    @Test(expectedExceptions = NameDecoderException.class)
+    public void baddata() throws DataSealerException, NameDecoderException {
         final String ct = code(PRINCIPAL, ISSUER, RECIPIENT);
 
-        Assert.assertNull(decoder.decode(ct.toUpperCase(), RECIPIENT));
+        decoder.decode(ct.toUpperCase(), RECIPIENT);
     }
 
     @Test public void baddata2() throws DataSealerException, NameDecoderException {