[java-opensaml] branch master updated: Fix some tests which were still using junit

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository java-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=78c6822c4f40a9715d805750d2c780dbf0a6ba0d

The following commit(s) were added to refs/heads/master by this push:
       new  78c6822   Fix some tests which were still using junit
78c6822 is described below

commit 78c6822c4f40a9715d805750d2c780dbf0a6ba0d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Aug 8 16:31:41 2017 +0100

    Fix some tests which were still using junit
---
 .../saml/common/messaging/SAMLMessageSecuritySupportTest.java         | 2 +-
 .../saml/metadata/resolver/impl/EntityIDDigestGeneratorTest.java      | 4 ++--
 .../saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java | 2 +-
 .../opensaml/security/trust/impl/TrustEngineX509TrustManagerTest.java | 4 +---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/opensaml-saml-api/src/test/java/org/opensaml/saml/common/messaging/SAMLMessageSecuritySupportTest.java b/opensaml-saml-api/src/test/java/org/opensaml/saml/common/messaging/SAMLMessageSecuritySupportTest.java
index ffe138e..2977c79 100644
--- a/opensaml-saml-api/src/test/java/org/opensaml/saml/common/messaging/SAMLMessageSecuritySupportTest.java
+++ b/opensaml-saml-api/src/test/java/org/opensaml/saml/common/messaging/SAMLMessageSecuritySupportTest.java
@@ -17,9 +17,9 @@
 
 package org.opensaml.saml.common.messaging;
 
-import org.junit.Assert;
 import org.opensaml.core.config.ConfigurationService;
 import org.opensaml.saml.config.SAMLConfiguration;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 /**
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/EntityIDDigestGeneratorTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/EntityIDDigestGeneratorTest.java
index 72e7d6f..8e1ee5f 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/EntityIDDigestGeneratorTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/EntityIDDigestGeneratorTest.java
@@ -21,10 +21,10 @@ import java.security.NoSuchAlgorithmException;
 
 import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.security.crypto.JCAConstants;
+import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import junit.framework.Assert;
 import net.shibboleth.utilities.java.support.codec.StringDigester;
 import net.shibboleth.utilities.java.support.codec.StringDigester.OutputFormat;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -70,7 +70,7 @@ public class EntityIDDigestGeneratorTest {
         
         Assert.assertEquals("metadata." + controlValueSHA1Hex + ".xml", generator.apply(criteria));
         
-        StringDigester digester = new StringDigester(JCAConstants.DIGEST_SHA1, OutputFormat.HEX_UPPER);
+        final StringDigester digester = new StringDigester(JCAConstants.DIGEST_SHA1, OutputFormat.HEX_UPPER);
         
         generator = new EntityIDDigestGenerator(digester, null, null, null);
         
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java
index 9f3ea22..2eee85c 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/LocalDynamicMetadataResolverTest.java
@@ -20,13 +20,13 @@ package org.opensaml.saml.metadata.resolver.impl;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 
-import org.junit.Assert;
 import org.opensaml.core.criterion.EntityIdCriterion;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.XMLObjectBaseTestCase;
 import org.opensaml.core.xml.persist.MapLoadSaveManager;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 import org.opensaml.security.crypto.JCAConstants;
+import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
diff --git a/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManagerTest.java b/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManagerTest.java
index b043e42..7d68bfb 100644
--- a/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManagerTest.java
+++ b/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/TrustEngineX509TrustManagerTest.java
@@ -25,7 +25,6 @@ import java.io.IOException;
 import javax.annotation.Nonnull;
 
 import org.cryptacular.util.KeyPairUtil;
-import org.junit.Assert;
 import org.ldaptive.Connection;
 import org.ldaptive.ConnectionConfig;
 import org.ldaptive.DefaultConnectionFactory;
@@ -38,8 +37,7 @@ import org.ldaptive.SearchResult;
 import org.ldaptive.ssl.SslConfig;
 import org.opensaml.security.credential.BasicCredential;
 import org.opensaml.security.credential.impl.StaticCredentialResolver;
-import org.opensaml.security.trust.impl.ExplicitKeyTrustEngine;
-import org.opensaml.security.trust.impl.TrustEngineX509TrustManager;
+import org.testng.Assert;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;

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