[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupN...

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Feb 11 14:37:49 2014
New Revision: 3613

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3613&view=rev
Log:
Replace Junit Assert with TestNG.

Modified:
    trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupNameTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/SAMLOutboundProtocolMessageSigningHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/BasicRoleDescriptorResolverTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/AbstractSAML1NameIdentifierGeneratorTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/AbstractSAML2NameIDGeneratorTest.java
    trunk/opensaml-xacml-impl/src/test/java/org/opensaml/xacml/ctx/provider/BaseObligationHandlerTest.java

Modified: trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupNameTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupNameTest.java?rev=3613&r1=3612&r2=3613&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupNameTest.java (original)
+++ trunk/opensaml-saml-api/src/test/java/org/opensaml/saml/metadata/EntitiesDescriptorGroupNameTest.java Tue Feb 11 14:37:49 2014
@@ -17,10 +17,11 @@
 
 package org.opensaml.saml.metadata;
 
-import junit.framework.Assert;
+
 
 import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
 
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 public class EntitiesDescriptorGroupNameTest {
@@ -28,10 +29,10 @@
     @Test
     public void testConstructor() {
         EntitiesDescriptorGroupName groupName = new EntitiesDescriptorGroupName("foo");
-        Assert.assertEquals("foo", groupName.getName());
+        Assert.assertEquals(groupName.getName(), "foo");
         
         groupName = new EntitiesDescriptorGroupName("    foo    ");
-        Assert.assertEquals("foo", groupName.getName());
+        Assert.assertEquals(groupName.getName(), "foo");
     }
     
     @Test(expectedExceptions=ConstraintViolationException.class)

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/SAMLOutboundProtocolMessageSigningHandlerTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/SAMLOutboundProtocolMessageSigningHandlerTest.java?rev=3613&r1=3612&r2=3613&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/SAMLOutboundProtocolMessageSigningHandlerTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/SAMLOutboundProtocolMessageSigningHandlerTest.java Tue Feb 11 14:37:49 2014
@@ -22,7 +22,6 @@
 import java.security.NoSuchProviderException;
 
 import org.joda.time.DateTime;
-import org.junit.Assert;
 import org.opensaml.core.xml.XMLObjectBaseTestCase;
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.messaging.handler.MessageHandlerException;
@@ -40,6 +39,7 @@
 import org.opensaml.xmlsec.keyinfo.KeyInfoGenerator;
 import org.opensaml.xmlsec.keyinfo.KeyInfoGeneratorManager;
 import org.opensaml.xmlsec.signature.support.SignatureConstants;
+import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -94,7 +94,7 @@
         
         handler.invoke(messageContext);
         
-        Assert.assertNotNull("Signature was null", response.getSignature());
+        Assert.assertNotNull(response.getSignature(), "Signature was null");
     }
 
 }

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/BasicRoleDescriptorResolverTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/BasicRoleDescriptorResolverTest.java?rev=3613&r1=3612&r2=3613&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/BasicRoleDescriptorResolverTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/BasicRoleDescriptorResolverTest.java Tue Feb 11 14:37:49 2014
@@ -26,7 +26,6 @@
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
-import org.junit.Assert;
 import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.core.xml.XMLObjectBaseTestCase;
 import org.opensaml.saml.common.xml.SAMLConstants;
@@ -38,6 +37,7 @@
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;

[... 140 lines stripped ...]