Use TestNG instead of JUnit

InCommon · Oct 3, 2017 · 4769de5 · 4769de5
1 parent 95687f9
commit 4769de5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/test/java/uk/org/iay/incommon/mda/validate/AlwaysAcceptValidatorTest.java b/src/test/java/uk/org/iay/incommon/mda/validate/AlwaysAcceptValidatorTest.java
@@ -3,9 +3,9 @@
 
 import java.util.List;
 
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import junit.framework.Assert;
 import net.shibboleth.metadata.ErrorStatus;
 import net.shibboleth.metadata.Item;
 import net.shibboleth.metadata.validate.Validator;
@@ -22,10 +22,10 @@ public void validate() throws Exception {
 
         final Item<String> item = new MockItem("test");
         final Validator.Action action = v.validate("foo", item, "stage");
-        Assert.assertEquals(Action.DONE, action);
+        Assert.assertEquals(action, Action.DONE);
 
         final List<ErrorStatus> errs = item.getItemMetadata().get(ErrorStatus.class);
-        Assert.assertEquals(0, errs.size());
+        Assert.assertEquals(errs.size(), 0);
     }
 
 }
diff --git a/src/test/java/uk/org/iay/incommon/mda/validate/AlwaysRejectValidatorTest.java b/src/test/java/uk/org/iay/incommon/mda/validate/AlwaysRejectValidatorTest.java
@@ -3,9 +3,9 @@
 
 import java.util.List;
 
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import junit.framework.Assert;
 import net.shibboleth.metadata.ErrorStatus;
 import net.shibboleth.metadata.Item;
 import net.shibboleth.metadata.validate.Validator;
@@ -22,14 +22,14 @@ public void validate() throws Exception {
 
         final Item<String> item = new MockItem("test");
         final Validator.Action action = v.validate("foo", item, "stage");
-        Assert.assertEquals(Action.DONE, action);
+        Assert.assertEquals(action, Action.DONE);
 
         final List<ErrorStatus> errs = item.getItemMetadata().get(ErrorStatus.class);
-        Assert.assertEquals(1, errs.size());
+        Assert.assertEquals(errs.size(), 1);
 
         final ErrorStatus err = errs.get(0);
-        Assert.assertEquals("stage/comp", err.getComponentId());
-        Assert.assertEquals("value rejected: 'foo'", err.getStatusMessage());
+        Assert.assertEquals(err.getComponentId(), "stage/comp");
+        Assert.assertEquals(err.getStatusMessage(), "value rejected: 'foo'");
     }
 
     @Test
@@ -41,14 +41,14 @@ public void validateWithMessage() throws Exception {
 
         final Item<String> item = new MockItem("test");
         final Validator.Action action = v.validate(new Double(1.25), item, "stage");
-        Assert.assertEquals(Action.DONE, action);
+        Assert.assertEquals(action, Action.DONE);
 
         final List<ErrorStatus> errs = item.getItemMetadata().get(ErrorStatus.class);
-        Assert.assertEquals(1, errs.size());
+        Assert.assertEquals(errs.size(), 1);
 
         final ErrorStatus err = errs.get(0);
-        Assert.assertEquals("stage/comp", err.getComponentId());
-        Assert.assertEquals("decimal 1.25", err.getStatusMessage());
+        Assert.assertEquals(err.getComponentId(), "stage/comp");
+        Assert.assertEquals(err.getStatusMessage(), "decimal 1.25");
     }
 
 }