From 4769de57f80c08fbb82b9eaf481d9f71297a2a8d Mon Sep 17 00:00:00 2001 From: Ian Young Date: Tue, 3 Oct 2017 15:33:56 +0100 Subject: [PATCH] Use TestNG instead of JUnit --- .../validate/AlwaysAcceptValidatorTest.java | 6 +++--- .../validate/AlwaysRejectValidatorTest.java | 18 +++++++++--------- 2 files changed, 12 insertions(+), 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 index 762add7..f487094 100644 --- 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 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 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 index 583269a..79ea619 100644 --- 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 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 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 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 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"); } }