[java-metadata-aggregator] 02/02: Junit to TestNG conversion

[Ian Young]

This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch master
in repository java-metadata-aggregator.

View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=e6e9c70a4aa12bac822ef5b9af59cc3851c3e472

commit e6e9c70a4aa12bac822ef5b9af59cc3851c3e472
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Wed Jan 31 17:39:47 2018 +0000

    Junit to TestNG conversion
---
 .../shibboleth/metadata/validate/BaseValidatorTest.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/BaseValidatorTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/BaseValidatorTest.java
index 2e711f6..9c7848e 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/BaseValidatorTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/validate/BaseValidatorTest.java
@@ -3,9 +3,9 @@ package net.shibboleth.metadata.validate;
 
 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.MockItem;
@@ -32,10 +32,10 @@ public class BaseValidatorTest {
         b.initialize();
         Assert.assertEquals(b.getMessage(), "value rejected: '%s'");
         final Item<String> item = new MockItem("test");
-        Assert.assertEquals(Action.DONE, b.validate("foo", item, "stage"));
+        Assert.assertEquals(b.validate("foo", item, "stage"), Action.DONE);
         final List<ErrorStatus> errs = item.getItemMetadata().get(ErrorStatus.class);
-        Assert.assertEquals(1, errs.size());
-        Assert.assertEquals("value rejected: 'foo'", errs.get(0).getStatusMessage());
+        Assert.assertEquals(errs.size(), 1);
+        Assert.assertEquals(errs.get(0).getStatusMessage(), "value rejected: 'foo'");
     }
 
     @Test
@@ -46,9 +46,9 @@ public class BaseValidatorTest {
         b.initialize();
         Assert.assertEquals(b.getMessage(), "%s is bad");
         final Item<String> item = new MockItem("test");
-        Assert.assertEquals(Action.DONE, b.validate("foo", item, "stage"));
+        Assert.assertEquals(b.validate("foo", item, "stage"), Action.DONE);
         final List<ErrorStatus> errs = item.getItemMetadata().get(ErrorStatus.class);
-        Assert.assertEquals(1, errs.size());
-        Assert.assertEquals("foo is bad", errs.get(0).getStatusMessage());
+        Assert.assertEquals(errs.size(), 1);
+        Assert.assertEquals(errs.get(0).getStatusMessage(), "foo is bad");
     }
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.