[java-identity-provider COMMIT] /trunk/idp-core/src/test/java/net/shibboleth/idp/spring/IdentifiableBeanPostProcessor...

[noreply at shibboleth.net]

Author: iay
Date: Tue Apr  1 07:15:18 2014
New Revision: 5674

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5674&view=rev
Log:
Use TestNG, not JUnit.

Modified:
    trunk/idp-core/src/test/java/net/shibboleth/idp/spring/IdentifiableBeanPostProcessorTest.java

Modified: trunk/idp-core/src/test/java/net/shibboleth/idp/spring/IdentifiableBeanPostProcessorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/test/java/net/shibboleth/idp/spring/IdentifiableBeanPostProcessorTest.java?rev=5674&r1=5673&r2=5674&view=diff
==============================================================================
--- trunk/idp-core/src/test/java/net/shibboleth/idp/spring/IdentifiableBeanPostProcessorTest.java (original)
+++ trunk/idp-core/src/test/java/net/shibboleth/idp/spring/IdentifiableBeanPostProcessorTest.java Tue Apr  1 07:15:18 2014
@@ -19,7 +19,6 @@
 
 import javax.annotation.Nonnull;
 
-import junit.framework.Assert;
 import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -28,6 +27,7 @@
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 /**
@@ -43,22 +43,22 @@
 
     @Test public void defaultedIdentifiable() {
         IdentifiedComponent bean = applicationContext.getBean("IdentifiableBean", Identifiable.class);
-        Assert.assertEquals("IdentifiableBean", bean.getId());
+        Assert.assertEquals(bean.getId(), "IdentifiableBean");
     }
 
     @Test public void nonDefaultedIdentified() {
         IdentifiedComponent bean = applicationContext.getBean("NonDefaultIdentifiedBean", Identified.class);
-        Assert.assertEquals("NameForAnIdentifiedBean", bean.getId());
+        Assert.assertEquals(bean.getId(), "NameForAnIdentifiedBean");
     }
 
     @Test public void nonDefaultedIdentifiable() {
         IdentifiedComponent bean = applicationContext.getBean("NonDefaultIdentifiableBean", Identifiable.class);
-        Assert.assertEquals("NameForAnIdentifiableBean", bean.getId());
+        Assert.assertEquals(bean.getId(), "NameForAnIdentifiableBean");
     }
 
     @Test public void TautologousTest() {
         IdentifiedComponent bean = applicationContext.getBean("TautologousName", Identifiable.class);
-        Assert.assertEquals("TautologousName", bean.getId());
+        Assert.assertEquals(bean.getId(), "TautologousName");
     }
 
     public static class Identified extends AbstractIdentifiedInitializableComponent {