[spring-extensions] 02/02: Fix a slew of tests that were using a deprecated spring assertion rather than testng

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository spring-extensions.

View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=223814625ea25842a8e0f17a247656f4b2962670

commit 223814625ea25842a8e0f17a247656f4b2962670
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Aug 8 16:21:22 2017 +0100

    Fix a slew of tests that were using a deprecated spring assertion rather than testng
---
 .../ext/spring/factory/PrivateKeyFactoryBeanTest.java        |  8 ++++----
 .../ext/spring/factory/PublicKeyFactoryBeanTest.java         |  8 ++++----
 .../spring/factory/X509CertificateChainFactoryBeanTest.java  |  6 +++---
 .../ext/spring/factory/X509CertificateFactoryBeanTest.java   | 12 ++++++------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/test/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBeanTest.java b/src/test/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBeanTest.java
index 1384a28..6a4b791 100644
--- a/src/test/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBeanTest.java
+++ b/src/test/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBeanTest.java
@@ -22,7 +22,7 @@ import java.security.interfaces.RSAPrivateKey;
 
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
-import org.springframework.util.Assert;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 @ContextConfiguration({"PrivateKeyFactoryBean-config.xml"})
@@ -30,10 +30,10 @@ public class PrivateKeyFactoryBeanTest extends AbstractTestNGSpringContextTests
 
     @Test public void testFactory() {
         final Object bean = applicationContext.getBean("key");
-        Assert.notNull(bean);
-        Assert.isInstanceOf(RSAPrivateKey.class, bean);
+        Assert.assertNotNull(bean);
+        Assert.assertTrue(bean instanceof RSAPrivateKey);
         final RSAPrivateKey rsaKey = (RSAPrivateKey)bean;
-        Assert.isTrue(rsaKey.getModulus().bitLength() == 2048);
+        Assert.assertTrue(rsaKey.getModulus().bitLength() == 2048);
     }
 
 }
diff --git a/src/test/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBeanTest.java b/src/test/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBeanTest.java
index 944602c..dab7bc3 100644
--- a/src/test/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBeanTest.java
+++ b/src/test/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBeanTest.java
@@ -22,7 +22,7 @@ import java.security.interfaces.RSAPublicKey;
 
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
-import org.springframework.util.Assert;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 @ContextConfiguration({"PublicKeyFactoryBean-config.xml"})
@@ -30,10 +30,10 @@ public class PublicKeyFactoryBeanTest extends AbstractTestNGSpringContextTests {
 
     @Test public void testFactory() {
         final Object bean = applicationContext.getBean("key");
-        Assert.notNull(bean);
-        Assert.isInstanceOf(RSAPublicKey.class, bean);
+        Assert.assertNotNull(bean);
+        Assert.assertTrue(bean instanceof RSAPublicKey);
         final RSAPublicKey rsaKey = (RSAPublicKey)bean;
-        Assert.isTrue(rsaKey.getModulus().bitLength() == 2048);
+        Assert.assertTrue(rsaKey.getModulus().bitLength() == 2048);
     }
 
 }
diff --git a/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBeanTest.java b/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBeanTest.java
index b80edf2..7b4b9e2 100644
--- a/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBeanTest.java
+++ b/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBeanTest.java
@@ -22,7 +22,7 @@ import java.security.cert.X509Certificate;
 
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
-import org.springframework.util.Assert;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 @ContextConfiguration({"X509CertificateChainFactoryBean-config.xml"})
@@ -30,9 +30,9 @@ public class X509CertificateChainFactoryBeanTest extends AbstractTestNGSpringCon
 
     @Test public void testFactory() {
         final Object bean = applicationContext.getBean("chain");
-        Assert.notNull(bean);
+        Assert.assertNotNull(bean);
         final X509Certificate[] chain = (X509Certificate[])bean;
-        Assert.isTrue(chain.length == 3);
+        Assert.assertTrue(chain.length == 3);
     }
 
 }
diff --git a/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBeanTest.java b/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBeanTest.java
index 7f52e4d..dcce5e6 100644
--- a/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBeanTest.java
+++ b/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBeanTest.java
@@ -24,7 +24,7 @@ import java.security.interfaces.RSAPublicKey;
 
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
-import org.springframework.util.Assert;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 @ContextConfiguration({"X509CertificateFactoryBean-config.xml"})
@@ -32,14 +32,14 @@ public class X509CertificateFactoryBeanTest extends AbstractTestNGSpringContextT
 
     @Test public void testFactory() {
         final Object bean = applicationContext.getBean("certificate");
-        Assert.notNull(bean);
-        Assert.isInstanceOf(X509Certificate.class, bean);
+        Assert.assertNotNull(bean);
+        Assert.assertTrue(bean instanceof X509Certificate);
         final X509Certificate cert = (X509Certificate)bean;
         final PublicKey pubkey = cert.getPublicKey();
-        Assert.notNull(pubkey);
-        Assert.isInstanceOf(RSAPublicKey.class, pubkey);
+        Assert.assertNotNull(pubkey);
+        Assert.assertTrue(pubkey instanceof RSAPublicKey);
         final RSAPublicKey rsaKey = (RSAPublicKey)pubkey;
-        Assert.isTrue(rsaKey.getModulus().bitLength() == 2048);
+        Assert.assertTrue(rsaKey.getModulus().bitLength() == 2048);
     }
 
 }

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