[java-identity-provider] branch master updated: Clean up accidental junit imports.

Scott Cantor cantor.2 at osu.edu
Thu Apr 16 14:38:28 EDT 2020


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

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=3be3d2a881489be63c7c0e63393c8ffeae1dd11c

The following commit(s) were added to refs/heads/master by this push:
       new  3be3d2a   Clean up accidental junit imports.
3be3d2a is described below

commit 3be3d2a881489be63c7c0e63393c8ffeae1dd11c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Apr 16 14:38:26 2020 -0400

    Clean up accidental junit imports.
---
 .../idp/saml/metadata/impl/EntityAttributesPredicateTest.java           | 2 +-
 .../src/test/java/net/shibboleth/idp/ui/csrf/CSRFTokenManagerTest.java  | 2 +-
 .../test/java/net/shibboleth/idp/ui/csrf/impl/SimpleCSRFTokenTest.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/EntityAttributesPredicateTest.java b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/EntityAttributesPredicateTest.java
index 24f9b65..b81cbf0 100644
--- a/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/EntityAttributesPredicateTest.java
+++ b/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/metadata/impl/EntityAttributesPredicateTest.java
@@ -35,12 +35,12 @@ import org.opensaml.saml.saml2.core.Attribute;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 import org.springframework.context.support.ConversionServiceFactoryBean;
 import org.springframework.context.support.GenericApplicationContext;
+import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 
-import junit.framework.Assert;
 import net.shibboleth.ext.spring.config.StringToDurationConverter;
 import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
 import net.shibboleth.idp.attribute.transcoding.AttributeTranscoderRegistry;
diff --git a/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/CSRFTokenManagerTest.java b/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/CSRFTokenManagerTest.java
index ed4dad1..5dbc86c 100644
--- a/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/CSRFTokenManagerTest.java
+++ b/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/CSRFTokenManagerTest.java
@@ -17,10 +17,10 @@
 
 package net.shibboleth.idp.ui.csrf;
 
+import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import junit.framework.Assert;
 import net.shibboleth.idp.ui.csrf.impl.SimpleCSRFToken;
 import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
 import net.shibboleth.utilities.java.support.security.impl.SecureRandomIdentifierGenerationStrategy;
diff --git a/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/impl/SimpleCSRFTokenTest.java b/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/impl/SimpleCSRFTokenTest.java
index 9755de3..6db08f1 100644
--- a/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/impl/SimpleCSRFTokenTest.java
+++ b/idp-ui/src/test/java/net/shibboleth/idp/ui/csrf/impl/SimpleCSRFTokenTest.java
@@ -19,9 +19,9 @@ package net.shibboleth.idp.ui.csrf.impl;
 
 import java.util.UUID;
 
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import junit.framework.Assert;
 import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
 
 /**

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


More information about the commits mailing list