diff --git a/.gitignore b/.gitignore index 7f99627..c5f6b1b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ hs_err_pid* /.DS_Store /.classpath /.project +/target/ diff --git a/pom.xml b/pom.xml index 06bb59b..3812499 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 direct-policy Direct Project policy enablement engine - 7.0 + 8.0.0 Direct Project policy enablement engine 2010 http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/direct-policy/${project.version} @@ -23,57 +23,58 @@ http://nhindirect.org - 3.0.0 + 3.5.0 scm:git:https://github.com/DirectProjectJavaRI/direct-policy.git scm:git:https://github.com/DirectProjectJavaRI/direct-policy.git - - org.springframework.boot - spring-boot-dependencies - 2.2.4.RELEASE - + + org.springframework.boot + spring-boot-dependencies + 2.5.2 + + New BSD License http://nhindirect.org/BSDLicense - + + + 1.4.17 + 1.6.2 + 1.68 + 2.8.0 + com.thoughtworks.xstream xstream - 1.4.11.1 + ${xstream.version} org.bouncycastle bcprov-jdk15on - 1.64 + ${bcprov-jdk15on.version} - javax.mail - mail - 1.4.3 - - - javax.activation - activation - - - + com.sun.mail + javax.mail + ${javax-mail.version} + commons-io commons-io - 2.6 - + ${commons-io.version} + org.apache.commons commons-lang3 org.springframework.boot - spring-boot-starter-web + spring-boot-starter-webflux test @@ -81,33 +82,25 @@ spring-boot-starter-test test - - junit - junit - test - - - org.mockito - mockito-core - test - + + org.junit.jupiter + junit-jupiter-engine + test + org.apache.maven.wagon wagon-webdav-jackrabbit - 3.1.0 org.apache.maven.wagon wagon-ssh-external - 3.1.0 org.apache.maven.wagon wagon-ssh - 3.1.0 @@ -136,6 +129,7 @@ org.apache.maven.plugins maven-jxr-plugin + 3.1.1 org.apache.maven.plugins @@ -168,32 +162,27 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - true - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - + + org.apache.maven.plugins + maven-jar-plugin + + + true + + + + + + test-jar + + + + org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 - -Xdoclint:none + -Xdoclint:none UTF-8 UTF-8 true @@ -214,7 +203,8 @@ - + + @@ -235,14 +227,12 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.9 org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 + maven-javadoc-plugin - -Xdoclint:none + -Xdoclint:none UTF-8 UTF-8 true @@ -269,6 +259,7 @@ org.apache.maven.plugins maven-jxr-plugin + 3.1.1 org.codehaus.mojo diff --git a/src/main/java/org/nhindirect/policy/x509/IssuerAttributeField.java b/src/main/java/org/nhindirect/policy/x509/IssuerAttributeField.java index 0ebe264..e120564 100644 --- a/src/main/java/org/nhindirect/policy/x509/IssuerAttributeField.java +++ b/src/main/java/org/nhindirect/policy/x509/IssuerAttributeField.java @@ -29,7 +29,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY import javax.security.auth.x500.X500Principal; import org.bouncycastle.asn1.ASN1Object; -import org.bouncycastle.asn1.DERObjectIdentifier; +import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.x500.AttributeTypeAndValue; import org.bouncycastle.asn1.x500.RDN; import org.bouncycastle.asn1.x500.X500Name; @@ -106,7 +106,7 @@ public void injectReferenceValue(X509Certificate value) throws PolicyProcessExce final X500Name x500Name = getX509Name(tbsStruct); - final RDN[] values = x500Name.getRDNs(new DERObjectIdentifier(getRDNAttributeFieldId().getId())); + final RDN[] values = x500Name.getRDNs(new ASN1ObjectIdentifier(getRDNAttributeFieldId().getId())); if (values.length == 0 && this.isRequired()) throw new PolicyRequiredException(getFieldName() + " field attribute " + rdnAttributeId.getName() + " is marked as required but is not present."); diff --git a/src/test/java/org/nhindirect/policy/LiteralPolicyExpressionFactory_getInstanceTest.java b/src/test/java/org/nhindirect/policy/LiteralPolicyExpressionFactory_getInstanceTest.java index 1aeff97..c9369cf 100644 --- a/src/test/java/org/nhindirect/policy/LiteralPolicyExpressionFactory_getInstanceTest.java +++ b/src/test/java/org/nhindirect/policy/LiteralPolicyExpressionFactory_getInstanceTest.java @@ -1,9 +1,9 @@ package org.nhindirect.policy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class LiteralPolicyExpressionFactory_getInstanceTest { diff --git a/src/test/java/org/nhindirect/policy/OperationPolicyExpression_getInstanceTest.java b/src/test/java/org/nhindirect/policy/OperationPolicyExpression_getInstanceTest.java index 4b6b8ab..4c9e8f4 100644 --- a/src/test/java/org/nhindirect/policy/OperationPolicyExpression_getInstanceTest.java +++ b/src/test/java/org/nhindirect/policy/OperationPolicyExpression_getInstanceTest.java @@ -1,11 +1,11 @@ package org.nhindirect.policy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.Vector; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OperationPolicyExpression_getInstanceTest { diff --git a/src/test/java/org/nhindirect/policy/PolicyFilterFactory_getInstanceTest.java b/src/test/java/org/nhindirect/policy/PolicyFilterFactory_getInstanceTest.java index 471ffd3..af4c400 100644 --- a/src/test/java/org/nhindirect/policy/PolicyFilterFactory_getInstanceTest.java +++ b/src/test/java/org/nhindirect/policy/PolicyFilterFactory_getInstanceTest.java @@ -1,10 +1,11 @@ package org.nhindirect.policy; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; -import org.junit.Test; import org.nhindirect.policy.impl.DefaultPolicyFilter; public class PolicyFilterFactory_getInstanceTest diff --git a/src/test/java/org/nhindirect/policy/PolicyFilter_simpleTextLexiconTest.java b/src/test/java/org/nhindirect/policy/PolicyFilter_simpleTextLexiconTest.java index 69f63a0..39b009e 100644 --- a/src/test/java/org/nhindirect/policy/PolicyFilter_simpleTextLexiconTest.java +++ b/src/test/java/org/nhindirect/policy/PolicyFilter_simpleTextLexiconTest.java @@ -1,12 +1,12 @@ package org.nhindirect.policy; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; import java.io.InputStream; import java.security.cert.X509Certificate; import org.apache.commons.io.IOUtils; -import org.junit.Test; import org.nhindirect.policy.util.TestUtils; @SuppressWarnings("deprecation") diff --git a/src/test/java/org/nhindirect/policy/PolicyFilter_textConversionToIntegerComplianceTest.java b/src/test/java/org/nhindirect/policy/PolicyFilter_textConversionToIntegerComplianceTest.java index 5656855..9876438 100644 --- a/src/test/java/org/nhindirect/policy/PolicyFilter_textConversionToIntegerComplianceTest.java +++ b/src/test/java/org/nhindirect/policy/PolicyFilter_textConversionToIntegerComplianceTest.java @@ -1,12 +1,13 @@ package org.nhindirect.policy; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.io.InputStream; import java.security.cert.X509Certificate; import org.apache.commons.io.IOUtils; -import org.junit.Test; import org.nhindirect.policy.util.TestUtils; diff --git a/src/test/java/org/nhindirect/policy/PolicyLexiconParserFactory_getInstanceTest.java b/src/test/java/org/nhindirect/policy/PolicyLexiconParserFactory_getInstanceTest.java index 869c5f1..2144345 100644 --- a/src/test/java/org/nhindirect/policy/PolicyLexiconParserFactory_getInstanceTest.java +++ b/src/test/java/org/nhindirect/policy/PolicyLexiconParserFactory_getInstanceTest.java @@ -1,8 +1,9 @@ package org.nhindirect.policy; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; -import org.junit.Test; import org.nhindirect.policy.impl.JavaSerializedObjectLexiconPolicyParser; import org.nhindirect.policy.impl.XMLLexiconPolicyParser; diff --git a/src/test/java/org/nhindirect/policy/PolicyLexicon_getParserClassTest.java b/src/test/java/org/nhindirect/policy/PolicyLexicon_getParserClassTest.java index 7b4d543..378db29 100644 --- a/src/test/java/org/nhindirect/policy/PolicyLexicon_getParserClassTest.java +++ b/src/test/java/org/nhindirect/policy/PolicyLexicon_getParserClassTest.java @@ -1,8 +1,9 @@ package org.nhindirect.policy; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; -import org.junit.Test; import org.nhindirect.policy.impl.JavaSerializedObjectLexiconPolicyParser; import org.nhindirect.policy.impl.XMLLexiconPolicyParser; diff --git a/src/test/java/org/nhindirect/policy/PolicyOperator_getEnumAttributesTest.java b/src/test/java/org/nhindirect/policy/PolicyOperator_getEnumAttributesTest.java index 6b1bf47..f15d3e4 100644 --- a/src/test/java/org/nhindirect/policy/PolicyOperator_getEnumAttributesTest.java +++ b/src/test/java/org/nhindirect/policy/PolicyOperator_getEnumAttributesTest.java @@ -1,8 +1,9 @@ package org.nhindirect.policy; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; -import org.junit.Test; import org.nhindirect.policy.impl.BinaryBooleanPolicyOperatorExecutor; public class PolicyOperator_getEnumAttributesTest diff --git a/src/test/java/org/nhindirect/policy/PolicyValueFactory_getInstanceTest.java b/src/test/java/org/nhindirect/policy/PolicyValueFactory_getInstanceTest.java index baeed75..5827d45 100644 --- a/src/test/java/org/nhindirect/policy/PolicyValueFactory_getInstanceTest.java +++ b/src/test/java/org/nhindirect/policy/PolicyValueFactory_getInstanceTest.java @@ -1,10 +1,10 @@ package org.nhindirect.policy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PolicyValueFactory_getInstanceTest { @@ -20,12 +20,11 @@ public void testGetInstance_assertValue() assertFalse(value.equals(null)); - assertTrue(value.equals(12345)); + assertTrue(value.getPolicyValue().equals(12345)); assertTrue(value.equals(PolicyValueFactory.getInstance(12345))); - assertTrue(value.equals(12345)); - assertFalse(value.equals("12345")); + assertTrue(value.getPolicyValue().equals(12345)); } } diff --git a/src/test/java/org/nhindirect/policy/impl/BinaryBooleanPolicyOperatorExecutor_constructTest.java b/src/test/java/org/nhindirect/policy/impl/BinaryBooleanPolicyOperatorExecutor_constructTest.java index 932fe4b..a0c99c5 100644 --- a/src/test/java/org/nhindirect/policy/impl/BinaryBooleanPolicyOperatorExecutor_constructTest.java +++ b/src/test/java/org/nhindirect/policy/impl/BinaryBooleanPolicyOperatorExecutor_constructTest.java @@ -1,10 +1,11 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; -import org.junit.Test; import org.nhindirect.policy.PolicyOperator; import org.nhindirect.policy.PolicyValue; import org.nhindirect.policy.PolicyValueFactory; diff --git a/src/test/java/org/nhindirect/policy/impl/BinaryBooleanPolicyOperatorExecutor_executeTest.java b/src/test/java/org/nhindirect/policy/impl/BinaryBooleanPolicyOperatorExecutor_executeTest.java index 74b02b1..e9646d8 100644 --- a/src/test/java/org/nhindirect/policy/impl/BinaryBooleanPolicyOperatorExecutor_executeTest.java +++ b/src/test/java/org/nhindirect/policy/impl/BinaryBooleanPolicyOperatorExecutor_executeTest.java @@ -1,12 +1,13 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import org.junit.Test; import org.nhindirect.policy.PolicyOperator; import org.nhindirect.policy.PolicyValue; import org.nhindirect.policy.PolicyValueFactory; diff --git a/src/test/java/org/nhindirect/policy/impl/BinaryCollectionPolicyOperatorExecutor_constructTest.java b/src/test/java/org/nhindirect/policy/impl/BinaryCollectionPolicyOperatorExecutor_constructTest.java index 133f2b3..cfc4603 100644 --- a/src/test/java/org/nhindirect/policy/impl/BinaryCollectionPolicyOperatorExecutor_constructTest.java +++ b/src/test/java/org/nhindirect/policy/impl/BinaryCollectionPolicyOperatorExecutor_constructTest.java @@ -1,13 +1,14 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import org.junit.Test; import org.nhindirect.policy.PolicyOperator; import org.nhindirect.policy.PolicyValue; import org.nhindirect.policy.PolicyValueFactory; diff --git a/src/test/java/org/nhindirect/policy/impl/BinaryCollectionPolicyOperatorExecutor_executeTest.java b/src/test/java/org/nhindirect/policy/impl/BinaryCollectionPolicyOperatorExecutor_executeTest.java index 22988b0..dcd37b7 100644 --- a/src/test/java/org/nhindirect/policy/impl/BinaryCollectionPolicyOperatorExecutor_executeTest.java +++ b/src/test/java/org/nhindirect/policy/impl/BinaryCollectionPolicyOperatorExecutor_executeTest.java @@ -1,13 +1,14 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.junit.Test; import org.nhindirect.policy.PolicyOperator; import org.nhindirect.policy.PolicyValue; import org.nhindirect.policy.PolicyValueFactory; diff --git a/src/test/java/org/nhindirect/policy/impl/BinaryIntegerPolicyOperatorExecutor_constructTest.java b/src/test/java/org/nhindirect/policy/impl/BinaryIntegerPolicyOperatorExecutor_constructTest.java index 307927e..52560ff 100644 --- a/src/test/java/org/nhindirect/policy/impl/BinaryIntegerPolicyOperatorExecutor_constructTest.java +++ b/src/test/java/org/nhindirect/policy/impl/BinaryIntegerPolicyOperatorExecutor_constructTest.java @@ -1,10 +1,11 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; -import org.junit.Test; import org.nhindirect.policy.PolicyOperator; import org.nhindirect.policy.PolicyValue; import org.nhindirect.policy.PolicyValueFactory; diff --git a/src/test/java/org/nhindirect/policy/impl/BinaryIntegerPolicyOperatorExecutor_executeTest.java b/src/test/java/org/nhindirect/policy/impl/BinaryIntegerPolicyOperatorExecutor_executeTest.java index 75ff56e..7e93b6f 100644 --- a/src/test/java/org/nhindirect/policy/impl/BinaryIntegerPolicyOperatorExecutor_executeTest.java +++ b/src/test/java/org/nhindirect/policy/impl/BinaryIntegerPolicyOperatorExecutor_executeTest.java @@ -1,9 +1,10 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + +import org.junit.jupiter.api.Test; -import org.junit.Test; import org.nhindirect.policy.PolicyOperator; import org.nhindirect.policy.PolicyValue; import org.nhindirect.policy.PolicyValueFactory; diff --git a/src/test/java/org/nhindirect/policy/impl/DefaultPolicyFilter_isCompliantTest.java b/src/test/java/org/nhindirect/policy/impl/DefaultPolicyFilter_isCompliantTest.java index 242e8b9..5a04219 100644 --- a/src/test/java/org/nhindirect/policy/impl/DefaultPolicyFilter_isCompliantTest.java +++ b/src/test/java/org/nhindirect/policy/impl/DefaultPolicyFilter_isCompliantTest.java @@ -1,10 +1,12 @@ package org.nhindirect.policy.impl; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.io.File; import java.io.InputStream; @@ -12,7 +14,6 @@ import java.util.Vector; import org.apache.commons.io.FileUtils; -import org.junit.Test; import org.nhindirect.policy.Compiler; import org.nhindirect.policy.ExecutionEngine; import org.nhindirect.policy.Opcode; @@ -32,7 +33,7 @@ public void testIsCompliant_parse_engineReturnsCompliant_assertTrue() throws Exc final ExecutionEngine engine = mock(ExecutionEngine.class); final X509Certificate cert = mock(X509Certificate.class); - when(engine.evaluate((Vector)any())).thenReturn(true); + when(engine.evaluate((Vector)any())).thenReturn(Boolean.TRUE); final DefaultPolicyFilter filter = new DefaultPolicyFilter(); filter.setCompiler(compiler); @@ -50,7 +51,7 @@ public void testIsCompliant_engineReturnsCompliant_assertTrue() throws Exception final PolicyExpression expression = mock(PolicyExpression.class); final X509Certificate cert = mock(X509Certificate.class); - when(engine.evaluate((Vector)any())).thenReturn(true); + when(engine.evaluate((Vector)any())).thenReturn(Boolean.TRUE); final DefaultPolicyFilter filter = new DefaultPolicyFilter(); filter.setCompiler(compiler); @@ -68,7 +69,7 @@ public void testIsCompliant_engineReturnsNotCompliant_assertFalse() throws Excep final PolicyExpression expression = mock(PolicyExpression.class); final X509Certificate cert = mock(X509Certificate.class); - when(engine.evaluate((Vector)any())).thenReturn(false); + when(engine.evaluate((Vector)any())).thenReturn(Boolean.FALSE); final DefaultPolicyFilter filter = new DefaultPolicyFilter(); filter.setCompiler(compiler); diff --git a/src/test/java/org/nhindirect/policy/impl/JavaSerializedObjectLexiconPolicyParser_serializeTest.java b/src/test/java/org/nhindirect/policy/impl/JavaSerializedObjectLexiconPolicyParser_serializeTest.java index d5c671b..3714b3a 100644 --- a/src/test/java/org/nhindirect/policy/impl/JavaSerializedObjectLexiconPolicyParser_serializeTest.java +++ b/src/test/java/org/nhindirect/policy/impl/JavaSerializedObjectLexiconPolicyParser_serializeTest.java @@ -1,16 +1,17 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Vector; import org.bouncycastle.asn1.x509.KeyUsage; -import org.junit.Test; import org.nhindirect.policy.LiteralPolicyExpression; import org.nhindirect.policy.LiteralPolicyExpressionFactory; import org.nhindirect.policy.OperationPolicyExpression; diff --git a/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_buildExpressionTest.java b/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_buildExpressionTest.java index 94d9cef..13d03b0 100644 --- a/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_buildExpressionTest.java +++ b/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_buildExpressionTest.java @@ -1,8 +1,10 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.io.File; import java.io.InputStream; @@ -10,7 +12,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.junit.Test; + import org.nhindirect.policy.LiteralPolicyExpression; import org.nhindirect.policy.OperationPolicyExpression; import org.nhindirect.policy.PolicyExpression; diff --git a/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_buildExtensionFieldTest.java b/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_buildExtensionFieldTest.java index d19e5d2..666ad6b 100644 --- a/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_buildExtensionFieldTest.java +++ b/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_buildExtensionFieldTest.java @@ -1,11 +1,11 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.nhindirect.policy.PolicyParseException; import org.nhindirect.policy.x509.AuthorityInfoAccessExtentionField; import org.nhindirect.policy.x509.AuthorityInfoAccessOCSPLocExtentionField; diff --git a/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_buildTBSFieldTest.java b/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_buildTBSFieldTest.java index d20516a..a4b0d92 100644 --- a/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_buildTBSFieldTest.java +++ b/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_buildTBSFieldTest.java @@ -1,12 +1,13 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; -import org.junit.Test; import org.nhindirect.policy.PolicyParseException; import org.nhindirect.policy.x509.IssuerAttributeField; import org.nhindirect.policy.x509.RDNAttributeIdentifier; diff --git a/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_buildX509FieldTest.java b/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_buildX509FieldTest.java index fc100be..b339f4a 100644 --- a/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_buildX509FieldTest.java +++ b/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_buildX509FieldTest.java @@ -1,10 +1,11 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; -import org.junit.Test; import org.nhindirect.policy.PolicyParseException; import org.nhindirect.policy.x509.SignatureAlgorithmField; import org.nhindirect.policy.x509.X509Field; diff --git a/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_parseTest.java b/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_parseTest.java index 4dfb8cf..2a96ac0 100644 --- a/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_parseTest.java +++ b/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_parseTest.java @@ -1,14 +1,15 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.io.File; import java.io.InputStream; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.junit.Test; import org.nhindirect.policy.PolicyExpression; import org.nhindirect.policy.PolicyGrammarException; diff --git a/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_parseToTokensTest.java b/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_parseToTokensTest.java index d71d3ab..1bcda92 100644 --- a/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_parseToTokensTest.java +++ b/src/test/java/org/nhindirect/policy/impl/SimpleTextV1LexiconPolicyParser_parseToTokensTest.java @@ -1,6 +1,8 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; import java.io.File; import java.io.InputStream; @@ -8,7 +10,6 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.junit.Test; public class SimpleTextV1LexiconPolicyParser_parseToTokensTest { diff --git a/src/test/java/org/nhindirect/policy/impl/UnaryBooleanPolicyOperatorExecutor_constructTest.java b/src/test/java/org/nhindirect/policy/impl/UnaryBooleanPolicyOperatorExecutor_constructTest.java index 2e47eab..b3159d1 100644 --- a/src/test/java/org/nhindirect/policy/impl/UnaryBooleanPolicyOperatorExecutor_constructTest.java +++ b/src/test/java/org/nhindirect/policy/impl/UnaryBooleanPolicyOperatorExecutor_constructTest.java @@ -1,10 +1,11 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; -import org.junit.Test; import org.nhindirect.policy.PolicyOperator; import org.nhindirect.policy.PolicyValue; import org.nhindirect.policy.PolicyValueFactory; diff --git a/src/test/java/org/nhindirect/policy/impl/UnaryBooleanPolicyOperatorExecutor_executeTest.java b/src/test/java/org/nhindirect/policy/impl/UnaryBooleanPolicyOperatorExecutor_executeTest.java index 73833f4..1b4273b 100644 --- a/src/test/java/org/nhindirect/policy/impl/UnaryBooleanPolicyOperatorExecutor_executeTest.java +++ b/src/test/java/org/nhindirect/policy/impl/UnaryBooleanPolicyOperatorExecutor_executeTest.java @@ -1,12 +1,13 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import org.junit.Test; import org.nhindirect.policy.PolicyOperator; import org.nhindirect.policy.PolicyValue; import org.nhindirect.policy.PolicyValueFactory; diff --git a/src/test/java/org/nhindirect/policy/impl/UnaryIntegerPolicyOperatorExecutor_constructTest.java b/src/test/java/org/nhindirect/policy/impl/UnaryIntegerPolicyOperatorExecutor_constructTest.java index dd05c6e..a5e02a1 100644 --- a/src/test/java/org/nhindirect/policy/impl/UnaryIntegerPolicyOperatorExecutor_constructTest.java +++ b/src/test/java/org/nhindirect/policy/impl/UnaryIntegerPolicyOperatorExecutor_constructTest.java @@ -1,10 +1,11 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; -import org.junit.Test; import org.nhindirect.policy.PolicyOperator; import org.nhindirect.policy.PolicyValue; import org.nhindirect.policy.PolicyValueFactory; diff --git a/src/test/java/org/nhindirect/policy/impl/UnaryIntegerPolicyOperatorExecutor_executeTest.java b/src/test/java/org/nhindirect/policy/impl/UnaryIntegerPolicyOperatorExecutor_executeTest.java index 1164d3a..becd027 100644 --- a/src/test/java/org/nhindirect/policy/impl/UnaryIntegerPolicyOperatorExecutor_executeTest.java +++ b/src/test/java/org/nhindirect/policy/impl/UnaryIntegerPolicyOperatorExecutor_executeTest.java @@ -1,11 +1,12 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import org.junit.Test; import org.nhindirect.policy.PolicyOperator; import org.nhindirect.policy.PolicyValue; import org.nhindirect.policy.PolicyValueFactory; diff --git a/src/test/java/org/nhindirect/policy/impl/XMLLexiconPolicyParser_serializeTest.java b/src/test/java/org/nhindirect/policy/impl/XMLLexiconPolicyParser_serializeTest.java index 9761225..8299371 100644 --- a/src/test/java/org/nhindirect/policy/impl/XMLLexiconPolicyParser_serializeTest.java +++ b/src/test/java/org/nhindirect/policy/impl/XMLLexiconPolicyParser_serializeTest.java @@ -1,16 +1,17 @@ package org.nhindirect.policy.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Vector; import org.bouncycastle.asn1.x509.KeyUsage; -import org.junit.Test; import org.nhindirect.policy.LiteralPolicyExpression; import org.nhindirect.policy.LiteralPolicyExpressionFactory; import org.nhindirect.policy.OperationPolicyExpression; @@ -21,7 +22,6 @@ import org.nhindirect.policy.PolicyParseException; import org.nhindirect.policy.PolicyValue; import org.nhindirect.policy.PolicyValueFactory; -import org.nhindirect.policy.impl.XMLLexiconPolicyParser; import org.nhindirect.policy.x509.ExtendedKeyUsageExtensionField; import org.nhindirect.policy.x509.ExtendedKeyUsageIdentifier; import org.nhindirect.policy.x509.KeyUsageBit; diff --git a/src/test/java/org/nhindirect/policy/impl/machine/StackMachineCompiler_compileTest.java b/src/test/java/org/nhindirect/policy/impl/machine/StackMachineCompiler_compileTest.java index b7a656f..3f9bbbc 100644 --- a/src/test/java/org/nhindirect/policy/impl/machine/StackMachineCompiler_compileTest.java +++ b/src/test/java/org/nhindirect/policy/impl/machine/StackMachineCompiler_compileTest.java @@ -1,14 +1,15 @@ package org.nhindirect.policy.impl.machine; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; import java.util.Vector; import org.bouncycastle.asn1.x509.KeyUsage; -import org.junit.Test; import org.nhindirect.policy.LiteralPolicyExpression; import org.nhindirect.policy.LiteralPolicyExpressionFactory; import org.nhindirect.policy.Opcode; @@ -18,9 +19,6 @@ import org.nhindirect.policy.PolicyOperator; import org.nhindirect.policy.PolicyValue; import org.nhindirect.policy.PolicyValueFactory; -import org.nhindirect.policy.impl.machine.StackMachine; -import org.nhindirect.policy.impl.machine.StackMachineCompiler; -import org.nhindirect.policy.impl.machine.StackMachineEntry; import org.nhindirect.policy.util.TestUtils; import org.nhindirect.policy.x509.ExtendedKeyUsageExtensionField; import org.nhindirect.policy.x509.ExtendedKeyUsageIdentifier; diff --git a/src/test/java/org/nhindirect/policy/impl/machine/StackMachineEntry_toStringTest.java b/src/test/java/org/nhindirect/policy/impl/machine/StackMachineEntry_toStringTest.java index 8e86534..9421e57 100644 --- a/src/test/java/org/nhindirect/policy/impl/machine/StackMachineEntry_toStringTest.java +++ b/src/test/java/org/nhindirect/policy/impl/machine/StackMachineEntry_toStringTest.java @@ -1,8 +1,9 @@ package org.nhindirect.policy.impl.machine; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; -import org.junit.Test; import org.nhindirect.policy.PolicyOperator; import org.nhindirect.policy.PolicyValueFactory; diff --git a/src/test/java/org/nhindirect/policy/impl/machine/StackMachine_createOperatorExecutorTest.java b/src/test/java/org/nhindirect/policy/impl/machine/StackMachine_createOperatorExecutorTest.java index d012bed..6e1c17b 100644 --- a/src/test/java/org/nhindirect/policy/impl/machine/StackMachine_createOperatorExecutorTest.java +++ b/src/test/java/org/nhindirect/policy/impl/machine/StackMachine_createOperatorExecutorTest.java @@ -1,16 +1,15 @@ package org.nhindirect.policy.impl.machine; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; -import org.junit.Test; import org.nhindirect.policy.PolicyOperator; import org.nhindirect.policy.PolicyProcessException; import org.nhindirect.policy.PolicyValueFactory; import org.nhindirect.policy.impl.BinaryBooleanPolicyOperatorExecutor; import org.nhindirect.policy.impl.BinaryIntegerPolicyOperatorExecutor; -import org.nhindirect.policy.impl.machine.StackMachine; public class StackMachine_createOperatorExecutorTest diff --git a/src/test/java/org/nhindirect/policy/impl/machine/StackMachine_evaluateTest.java b/src/test/java/org/nhindirect/policy/impl/machine/StackMachine_evaluateTest.java index 3d889af..4143aa0 100644 --- a/src/test/java/org/nhindirect/policy/impl/machine/StackMachine_evaluateTest.java +++ b/src/test/java/org/nhindirect/policy/impl/machine/StackMachine_evaluateTest.java @@ -1,18 +1,17 @@ package org.nhindirect.policy.impl.machine; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; import java.util.Vector; -import org.junit.Test; import org.nhindirect.policy.Opcode; import org.nhindirect.policy.PolicyOperator; import org.nhindirect.policy.PolicyValueFactory; -import org.nhindirect.policy.impl.machine.StackMachine; -import org.nhindirect.policy.impl.machine.StackMachineEntry; import org.nhindirect.policy.mock.SpringBaseTest; public class StackMachine_evaluateTest extends SpringBaseTest diff --git a/src/test/java/org/nhindirect/policy/impl/machine/StackMachine_getCompilationReportTest.java b/src/test/java/org/nhindirect/policy/impl/machine/StackMachine_getCompilationReportTest.java index e44e6a6..4607739 100644 --- a/src/test/java/org/nhindirect/policy/impl/machine/StackMachine_getCompilationReportTest.java +++ b/src/test/java/org/nhindirect/policy/impl/machine/StackMachine_getCompilationReportTest.java @@ -1,12 +1,13 @@ package org.nhindirect.policy.impl.machine; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; -import org.junit.Test; import org.nhindirect.policy.PolicyRequiredException; import org.nhindirect.policy.util.TestUtils; import org.nhindirect.policy.x509.KeyUsageExtensionField; diff --git a/src/test/java/org/nhindirect/policy/mock/MockCPSResource.java b/src/test/java/org/nhindirect/policy/mock/MockCPSResource.java index 7b08801..6ea0cb5 100644 --- a/src/test/java/org/nhindirect/policy/mock/MockCPSResource.java +++ b/src/test/java/org/nhindirect/policy/mock/MockCPSResource.java @@ -1,29 +1,21 @@ package org.nhindirect.policy.mock; -import org.springframework.http.CacheControl; -import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import reactor.core.publisher.Mono; @RestController @RequestMapping("cps") public class MockCPSResource { - protected static final CacheControl noCache; - - static - { - noCache = CacheControl.noCache(); - } @GetMapping(produces = MediaType.TEXT_HTML_VALUE) - public ResponseEntity getCPS() + public Mono getCPS() { - return ResponseEntity.status(HttpStatus.OK).cacheControl(noCache).body("Hello"); + return Mono.just("Hello"); } } diff --git a/src/test/java/org/nhindirect/policy/mock/SpringBaseTest.java b/src/test/java/org/nhindirect/policy/mock/SpringBaseTest.java index 2bc1db8..9744a50 100644 --- a/src/test/java/org/nhindirect/policy/mock/SpringBaseTest.java +++ b/src/test/java/org/nhindirect/policy/mock/SpringBaseTest.java @@ -1,13 +1,13 @@ package org.nhindirect.policy.mock; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(classes = TestApplication.class, webEnvironment = WebEnvironment.DEFINED_PORT) @DirtiesContext @TestPropertySource("classpath:bootstrap.properties") diff --git a/src/test/java/org/nhindirect/policy/scenarios/RealWorldScenarioPolicyTests.java b/src/test/java/org/nhindirect/policy/scenarios/RealWorldScenarioPolicyTests.java index 58e46d2..a05b065 100644 --- a/src/test/java/org/nhindirect/policy/scenarios/RealWorldScenarioPolicyTests.java +++ b/src/test/java/org/nhindirect/policy/scenarios/RealWorldScenarioPolicyTests.java @@ -1,13 +1,15 @@ package org.nhindirect.policy.scenarios; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.io.File; import java.io.InputStream; import java.security.cert.X509Certificate; import org.apache.commons.io.FileUtils; -import org.junit.Test; + import org.nhindirect.policy.PolicyExpression; import org.nhindirect.policy.PolicyFilter; import org.nhindirect.policy.PolicyFilterFactory; diff --git a/src/test/java/org/nhindirect/policy/util/TestUtils.java b/src/test/java/org/nhindirect/policy/util/TestUtils.java index 079fc7a..8da6319 100644 --- a/src/test/java/org/nhindirect/policy/util/TestUtils.java +++ b/src/test/java/org/nhindirect/policy/util/TestUtils.java @@ -9,7 +9,6 @@ import org.apache.commons.io.FileUtils; import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.junit.Test; public class TestUtils @@ -23,13 +22,6 @@ public class TestUtils private static final String certBasePath = "src/test/resources/certs/"; - @Test - public void dummy() - { - - } - - public static X509Certificate loadCertificate(String certFileName) throws Exception { File fl = new File(certBasePath + certFileName); diff --git a/src/test/java/org/nhindirect/policy/x509/AbstractExtensionField_getFieldNameTest.java b/src/test/java/org/nhindirect/policy/x509/AbstractExtensionField_getFieldNameTest.java index 1cb43e3..b3fce3c 100644 --- a/src/test/java/org/nhindirect/policy/x509/AbstractExtensionField_getFieldNameTest.java +++ b/src/test/java/org/nhindirect/policy/x509/AbstractExtensionField_getFieldNameTest.java @@ -1,8 +1,8 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AbstractExtensionField_getFieldNameTest { diff --git a/src/test/java/org/nhindirect/policy/x509/AbstractExtensionField_isCriticalTest.java b/src/test/java/org/nhindirect/policy/x509/AbstractExtensionField_isCriticalTest.java index f5a1e4f..0d41d6c 100644 --- a/src/test/java/org/nhindirect/policy/x509/AbstractExtensionField_isCriticalTest.java +++ b/src/test/java/org/nhindirect/policy/x509/AbstractExtensionField_isCriticalTest.java @@ -1,11 +1,11 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import java.security.cert.X509Certificate; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import java.security.cert.X509Certificate; import org.nhindirect.policy.util.TestUtils; diff --git a/src/test/java/org/nhindirect/policy/x509/AbstractTBSField_getX509FieldTypeTest.java b/src/test/java/org/nhindirect/policy/x509/AbstractTBSField_getX509FieldTypeTest.java index 4716945..441da50 100644 --- a/src/test/java/org/nhindirect/policy/x509/AbstractTBSField_getX509FieldTypeTest.java +++ b/src/test/java/org/nhindirect/policy/x509/AbstractTBSField_getX509FieldTypeTest.java @@ -1,8 +1,8 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AbstractTBSField_getX509FieldTypeTest { diff --git a/src/test/java/org/nhindirect/policy/x509/AbstractX509Field_testGetDERObjectTest.java b/src/test/java/org/nhindirect/policy/x509/AbstractX509Field_testGetDERObjectTest.java index 9f6a668..c721a97 100644 --- a/src/test/java/org/nhindirect/policy/x509/AbstractX509Field_testGetDERObjectTest.java +++ b/src/test/java/org/nhindirect/policy/x509/AbstractX509Field_testGetDERObjectTest.java @@ -1,11 +1,12 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; -import org.junit.Test; import org.nhindirect.policy.PolicyProcessException; import org.nhindirect.policy.util.TestUtils; diff --git a/src/test/java/org/nhindirect/policy/x509/AbstractX509Field_testGetObjectTest.java b/src/test/java/org/nhindirect/policy/x509/AbstractX509Field_testGetObjectTest.java index e82cddf..3c61c0c 100644 --- a/src/test/java/org/nhindirect/policy/x509/AbstractX509Field_testGetObjectTest.java +++ b/src/test/java/org/nhindirect/policy/x509/AbstractX509Field_testGetObjectTest.java @@ -1,11 +1,12 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; -import org.junit.Test; import org.nhindirect.policy.PolicyProcessException; import org.nhindirect.policy.util.TestUtils; diff --git a/src/test/java/org/nhindirect/policy/x509/AuthorityInfoAccessExtentionField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/AuthorityInfoAccessExtentionField_injectReferenceValueTest.java index 6cc1465..d93f92b 100644 --- a/src/test/java/org/nhindirect/policy/x509/AuthorityInfoAccessExtentionField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/AuthorityInfoAccessExtentionField_injectReferenceValueTest.java @@ -1,16 +1,15 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; import java.util.Collection; -import org.junit.Test; import org.nhindirect.policy.PolicyRequiredException; import org.nhindirect.policy.util.TestUtils; -import org.nhindirect.policy.x509.AuthorityInfoAccessExtentionField; -import org.nhindirect.policy.x509.AuthorityInfoAccessMethodIdentifier; public class AuthorityInfoAccessExtentionField_injectReferenceValueTest { diff --git a/src/test/java/org/nhindirect/policy/x509/AuthorityInfoAccessMethodIdentifier_getAttributesTest.java b/src/test/java/org/nhindirect/policy/x509/AuthorityInfoAccessMethodIdentifier_getAttributesTest.java index b99e24e..4b0c86d 100644 --- a/src/test/java/org/nhindirect/policy/x509/AuthorityInfoAccessMethodIdentifier_getAttributesTest.java +++ b/src/test/java/org/nhindirect/policy/x509/AuthorityInfoAccessMethodIdentifier_getAttributesTest.java @@ -1,8 +1,8 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class AuthorityInfoAccessMethodIdentifier_getAttributesTest diff --git a/src/test/java/org/nhindirect/policy/x509/AuthorityInfoAccessOCSPLocExtentionField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/AuthorityInfoAccessOCSPLocExtentionField_injectReferenceValueTest.java index 69d0166..8da6dc8 100644 --- a/src/test/java/org/nhindirect/policy/x509/AuthorityInfoAccessOCSPLocExtentionField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/AuthorityInfoAccessOCSPLocExtentionField_injectReferenceValueTest.java @@ -1,15 +1,15 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; import java.util.Collection; import org.nhindirect.policy.util.TestUtils; -import org.junit.Test; import org.nhindirect.policy.PolicyRequiredException; -import org.nhindirect.policy.x509.AuthorityInfoAccessOCSPLocExtentionField; public class AuthorityInfoAccessOCSPLocExtentionField_injectReferenceValueTest { diff --git a/src/test/java/org/nhindirect/policy/x509/AuthorityKeyIdentifierKeyIdExtensionField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/AuthorityKeyIdentifierKeyIdExtensionField_injectReferenceValueTest.java index 3b660a7..f3c84d7 100644 --- a/src/test/java/org/nhindirect/policy/x509/AuthorityKeyIdentifierKeyIdExtensionField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/AuthorityKeyIdentifierKeyIdExtensionField_injectReferenceValueTest.java @@ -1,14 +1,14 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; import org.nhindirect.policy.util.TestUtils; -import org.junit.Test; import org.nhindirect.policy.PolicyRequiredException; -import org.nhindirect.policy.x509.AuthorityKeyIdentifierKeyIdExtensionField; public class AuthorityKeyIdentifierKeyIdExtensionField_injectReferenceValueTest { diff --git a/src/test/java/org/nhindirect/policy/x509/BasicContraintsExtensionField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/BasicContraintsExtensionField_injectReferenceValueTest.java index 741a186..91149c4 100644 --- a/src/test/java/org/nhindirect/policy/x509/BasicContraintsExtensionField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/BasicContraintsExtensionField_injectReferenceValueTest.java @@ -1,14 +1,14 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; import org.nhindirect.policy.util.TestUtils; -import org.junit.Test; import org.nhindirect.policy.PolicyRequiredException; -import org.nhindirect.policy.x509.BasicContraintsExtensionField; public class BasicContraintsExtensionField_injectReferenceValueTest { diff --git a/src/test/java/org/nhindirect/policy/x509/CRLDistributionPointNameExtentionField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/CRLDistributionPointNameExtentionField_injectReferenceValueTest.java index 45d9670..dddc0c6 100644 --- a/src/test/java/org/nhindirect/policy/x509/CRLDistributionPointNameExtentionField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/CRLDistributionPointNameExtentionField_injectReferenceValueTest.java @@ -1,15 +1,15 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; import java.util.Collection; import org.nhindirect.policy.util.TestUtils; -import org.junit.Test; import org.nhindirect.policy.PolicyRequiredException; -import org.nhindirect.policy.x509.CRLDistributionPointNameExtentionField; public class CRLDistributionPointNameExtentionField_injectReferenceValueTest { diff --git a/src/test/java/org/nhindirect/policy/x509/CertificatePolicyCpsUriExtensionField_getExtensionIdentifierTest.java b/src/test/java/org/nhindirect/policy/x509/CertificatePolicyCpsUriExtensionField_getExtensionIdentifierTest.java index 6701bbb..a1036c9 100644 --- a/src/test/java/org/nhindirect/policy/x509/CertificatePolicyCpsUriExtensionField_getExtensionIdentifierTest.java +++ b/src/test/java/org/nhindirect/policy/x509/CertificatePolicyCpsUriExtensionField_getExtensionIdentifierTest.java @@ -1,8 +1,8 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CertificatePolicyCpsUriExtensionField_getExtensionIdentifierTest { diff --git a/src/test/java/org/nhindirect/policy/x509/CertificatePolicyCpsUriExtensionField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/CertificatePolicyCpsUriExtensionField_injectReferenceValueTest.java index da42c05..197c4c7 100644 --- a/src/test/java/org/nhindirect/policy/x509/CertificatePolicyCpsUriExtensionField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/CertificatePolicyCpsUriExtensionField_injectReferenceValueTest.java @@ -1,15 +1,15 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; import java.util.Collection; import org.nhindirect.policy.util.TestUtils; -import org.junit.Test; import org.nhindirect.policy.PolicyRequiredException; -import org.nhindirect.policy.x509.CertificatePolicyCpsUriExtensionField; public class CertificatePolicyCpsUriExtensionField_injectReferenceValueTest { diff --git a/src/test/java/org/nhindirect/policy/x509/CertificatePolicyIndentifierExtensionField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/CertificatePolicyIndentifierExtensionField_injectReferenceValueTest.java index 41e83e1..16970b5 100644 --- a/src/test/java/org/nhindirect/policy/x509/CertificatePolicyIndentifierExtensionField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/CertificatePolicyIndentifierExtensionField_injectReferenceValueTest.java @@ -1,16 +1,15 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; import java.util.Collection; import org.nhindirect.policy.util.TestUtils; -import org.junit.Test; import org.nhindirect.policy.PolicyRequiredException; -import org.nhindirect.policy.x509.CertificatePolicyIndentifierExtensionField; - public class CertificatePolicyIndentifierExtensionField_injectReferenceValueTest { diff --git a/src/test/java/org/nhindirect/policy/x509/ExtendedKeyUsageExtensionField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/ExtendedKeyUsageExtensionField_injectReferenceValueTest.java index c082798..746b204 100644 --- a/src/test/java/org/nhindirect/policy/x509/ExtendedKeyUsageExtensionField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/ExtendedKeyUsageExtensionField_injectReferenceValueTest.java @@ -1,16 +1,15 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; import java.util.Collection; import org.nhindirect.policy.util.TestUtils; -import org.junit.Test; import org.nhindirect.policy.PolicyRequiredException; -import org.nhindirect.policy.x509.ExtendedKeyUsageExtensionField; -import org.nhindirect.policy.x509.ExtendedKeyUsageIdentifier; public class ExtendedKeyUsageExtensionField_injectReferenceValueTest { diff --git a/src/test/java/org/nhindirect/policy/x509/ExtentionIdentifier_getAttributesTest.java b/src/test/java/org/nhindirect/policy/x509/ExtentionIdentifier_getAttributesTest.java index b3d4b27..76af720 100644 --- a/src/test/java/org/nhindirect/policy/x509/ExtentionIdentifier_getAttributesTest.java +++ b/src/test/java/org/nhindirect/policy/x509/ExtentionIdentifier_getAttributesTest.java @@ -1,8 +1,8 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ExtentionIdentifier_getAttributesTest diff --git a/src/test/java/org/nhindirect/policy/x509/IssuerAttributeField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/IssuerAttributeField_injectReferenceValueTest.java index 70e23e1..8028d50 100644 --- a/src/test/java/org/nhindirect/policy/x509/IssuerAttributeField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/IssuerAttributeField_injectReferenceValueTest.java @@ -1,17 +1,16 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; import java.util.Collection; import java.util.Iterator; import org.nhindirect.policy.util.TestUtils; -import org.junit.Test; import org.nhindirect.policy.PolicyRequiredException; -import org.nhindirect.policy.x509.IssuerAttributeField; -import org.nhindirect.policy.x509.RDNAttributeIdentifier; public class IssuerAttributeField_injectReferenceValueTest { diff --git a/src/test/java/org/nhindirect/policy/x509/KeyBitUsage_getAttributesTest.java b/src/test/java/org/nhindirect/policy/x509/KeyBitUsage_getAttributesTest.java index 80336a8..12d0ddc 100644 --- a/src/test/java/org/nhindirect/policy/x509/KeyBitUsage_getAttributesTest.java +++ b/src/test/java/org/nhindirect/policy/x509/KeyBitUsage_getAttributesTest.java @@ -1,8 +1,8 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class KeyBitUsage_getAttributesTest { diff --git a/src/test/java/org/nhindirect/policy/x509/KeyUsageExtensionField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/KeyUsageExtensionField_injectReferenceValueTest.java index 55c8398..d3e73f2 100644 --- a/src/test/java/org/nhindirect/policy/x509/KeyUsageExtensionField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/KeyUsageExtensionField_injectReferenceValueTest.java @@ -1,15 +1,15 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; import org.bouncycastle.asn1.x509.KeyUsage; -import org.junit.Test; import org.nhindirect.policy.util.TestUtils; import org.nhindirect.policy.PolicyRequiredException; -import org.nhindirect.policy.x509.KeyUsageExtensionField; public class KeyUsageExtensionField_injectReferenceValueTest { diff --git a/src/test/java/org/nhindirect/policy/x509/PublicKeyAlgorithmIdentifier_getAttributesTest.java b/src/test/java/org/nhindirect/policy/x509/PublicKeyAlgorithmIdentifier_getAttributesTest.java index 70d7eff..ccf1e5d 100644 --- a/src/test/java/org/nhindirect/policy/x509/PublicKeyAlgorithmIdentifier_getAttributesTest.java +++ b/src/test/java/org/nhindirect/policy/x509/PublicKeyAlgorithmIdentifier_getAttributesTest.java @@ -1,8 +1,8 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PublicKeyAlgorithmIdentifier_getAttributesTest diff --git a/src/test/java/org/nhindirect/policy/x509/RDNAttributeIdentifier_getAttributesTest.java b/src/test/java/org/nhindirect/policy/x509/RDNAttributeIdentifier_getAttributesTest.java index a51c574..95967d5 100644 --- a/src/test/java/org/nhindirect/policy/x509/RDNAttributeIdentifier_getAttributesTest.java +++ b/src/test/java/org/nhindirect/policy/x509/RDNAttributeIdentifier_getAttributesTest.java @@ -1,10 +1,9 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import org.junit.jupiter.api.Test; public class RDNAttributeIdentifier_getAttributesTest { @Test diff --git a/src/test/java/org/nhindirect/policy/x509/SerialNumberAttributeField_getTBSFieldNameTest.java b/src/test/java/org/nhindirect/policy/x509/SerialNumberAttributeField_getTBSFieldNameTest.java index 5c34f57..3c885e7 100644 --- a/src/test/java/org/nhindirect/policy/x509/SerialNumberAttributeField_getTBSFieldNameTest.java +++ b/src/test/java/org/nhindirect/policy/x509/SerialNumberAttributeField_getTBSFieldNameTest.java @@ -1,8 +1,8 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SerialNumberAttributeField_getTBSFieldNameTest { diff --git a/src/test/java/org/nhindirect/policy/x509/SerialNumberAttributeField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/SerialNumberAttributeField_injectReferenceValueTest.java index 3ce6ff4..27f69e2 100644 --- a/src/test/java/org/nhindirect/policy/x509/SerialNumberAttributeField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/SerialNumberAttributeField_injectReferenceValueTest.java @@ -1,11 +1,12 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; -import org.junit.Test; import org.nhindirect.policy.util.TestUtils; public class SerialNumberAttributeField_injectReferenceValueTest diff --git a/src/test/java/org/nhindirect/policy/x509/SignatureAlgorithmField_getX509FieldTypeTest.java b/src/test/java/org/nhindirect/policy/x509/SignatureAlgorithmField_getX509FieldTypeTest.java index 9397f3f..03f0195 100644 --- a/src/test/java/org/nhindirect/policy/x509/SignatureAlgorithmField_getX509FieldTypeTest.java +++ b/src/test/java/org/nhindirect/policy/x509/SignatureAlgorithmField_getX509FieldTypeTest.java @@ -1,8 +1,8 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SignatureAlgorithmField_getX509FieldTypeTest { diff --git a/src/test/java/org/nhindirect/policy/x509/SignatureAlgorithmField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/SignatureAlgorithmField_injectReferenceValueTest.java index 39144a1..a20f153 100644 --- a/src/test/java/org/nhindirect/policy/x509/SignatureAlgorithmField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/SignatureAlgorithmField_injectReferenceValueTest.java @@ -1,14 +1,13 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; -import org.junit.Test; import org.nhindirect.policy.util.TestUtils; -import org.nhindirect.policy.x509.SignatureAlgorithmField; -import org.nhindirect.policy.x509.SignatureAlgorithmIdentifier; public class SignatureAlgorithmField_injectReferenceValueTest { diff --git a/src/test/java/org/nhindirect/policy/x509/SignatureAlgorithmIdentifier_getAttributestTest.java b/src/test/java/org/nhindirect/policy/x509/SignatureAlgorithmIdentifier_getAttributestTest.java index df0af84..81a70f0 100644 --- a/src/test/java/org/nhindirect/policy/x509/SignatureAlgorithmIdentifier_getAttributestTest.java +++ b/src/test/java/org/nhindirect/policy/x509/SignatureAlgorithmIdentifier_getAttributestTest.java @@ -1,8 +1,8 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SignatureAlgorithmIdentifier_getAttributestTest { diff --git a/src/test/java/org/nhindirect/policy/x509/SubjectAltNameExtensionField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/SubjectAltNameExtensionField_injectReferenceValueTest.java index 9a80657..43f9e0e 100644 --- a/src/test/java/org/nhindirect/policy/x509/SubjectAltNameExtensionField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/SubjectAltNameExtensionField_injectReferenceValueTest.java @@ -1,12 +1,13 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; import java.util.Collection; -import org.junit.Test; import org.nhindirect.policy.PolicyRequiredException; import org.nhindirect.policy.util.TestUtils; diff --git a/src/test/java/org/nhindirect/policy/x509/SubjectAttributeField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/SubjectAttributeField_injectReferenceValueTest.java index 7a953a0..e0bc9e0 100644 --- a/src/test/java/org/nhindirect/policy/x509/SubjectAttributeField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/SubjectAttributeField_injectReferenceValueTest.java @@ -1,17 +1,16 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; import java.util.Collection; import java.util.Iterator; import org.nhindirect.policy.util.TestUtils; -import org.junit.Test; import org.nhindirect.policy.PolicyRequiredException; -import org.nhindirect.policy.x509.RDNAttributeIdentifier; -import org.nhindirect.policy.x509.SubjectAttributeField; public class SubjectAttributeField_injectReferenceValueTest { diff --git a/src/test/java/org/nhindirect/policy/x509/SubjectKeyIdentifierExtensionField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/SubjectKeyIdentifierExtensionField_injectReferenceValueTest.java index 87a412a..7488dd6 100644 --- a/src/test/java/org/nhindirect/policy/x509/SubjectKeyIdentifierExtensionField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/SubjectKeyIdentifierExtensionField_injectReferenceValueTest.java @@ -1,14 +1,14 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; import org.nhindirect.policy.util.TestUtils; -import org.junit.Test; import org.nhindirect.policy.PolicyRequiredException; -import org.nhindirect.policy.x509.SubjectKeyIdentifierExtensionField; public class SubjectKeyIdentifierExtensionField_injectReferenceValueTest { diff --git a/src/test/java/org/nhindirect/policy/x509/SubjectPublicKeyAlgorithmField_getFieldNameTest.java b/src/test/java/org/nhindirect/policy/x509/SubjectPublicKeyAlgorithmField_getFieldNameTest.java index cfbddd0..01749e5 100644 --- a/src/test/java/org/nhindirect/policy/x509/SubjectPublicKeyAlgorithmField_getFieldNameTest.java +++ b/src/test/java/org/nhindirect/policy/x509/SubjectPublicKeyAlgorithmField_getFieldNameTest.java @@ -1,8 +1,8 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SubjectPublicKeyAlgorithmField_getFieldNameTest { diff --git a/src/test/java/org/nhindirect/policy/x509/SubjectPublicKeyAlgorithmField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/SubjectPublicKeyAlgorithmField_injectReferenceValueTest.java index bf0f617..b3c53c3 100644 --- a/src/test/java/org/nhindirect/policy/x509/SubjectPublicKeyAlgorithmField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/SubjectPublicKeyAlgorithmField_injectReferenceValueTest.java @@ -1,14 +1,13 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; -import org.junit.Test; import org.nhindirect.policy.util.TestUtils; -import org.nhindirect.policy.x509.PublicKeyAlgorithmIdentifier; -import org.nhindirect.policy.x509.SubjectPublicKeyAlgorithmField; public class SubjectPublicKeyAlgorithmField_injectReferenceValueTest { diff --git a/src/test/java/org/nhindirect/policy/x509/SubjectPublicKeySizeField_getFieldNameTest.java b/src/test/java/org/nhindirect/policy/x509/SubjectPublicKeySizeField_getFieldNameTest.java index 7fd2823..9743331 100644 --- a/src/test/java/org/nhindirect/policy/x509/SubjectPublicKeySizeField_getFieldNameTest.java +++ b/src/test/java/org/nhindirect/policy/x509/SubjectPublicKeySizeField_getFieldNameTest.java @@ -1,8 +1,8 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SubjectPublicKeySizeField_getFieldNameTest { diff --git a/src/test/java/org/nhindirect/policy/x509/SubjectPublicKeySizeField_injectReferenceValueTest.java b/src/test/java/org/nhindirect/policy/x509/SubjectPublicKeySizeField_injectReferenceValueTest.java index 4881481..79f7b28 100644 --- a/src/test/java/org/nhindirect/policy/x509/SubjectPublicKeySizeField_injectReferenceValueTest.java +++ b/src/test/java/org/nhindirect/policy/x509/SubjectPublicKeySizeField_injectReferenceValueTest.java @@ -1,14 +1,13 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; import java.security.cert.X509Certificate; -import org.junit.Test; import org.nhindirect.policy.util.TestUtils; -import org.nhindirect.policy.x509.SubjectPublicKeyAlgorithmField; -import org.nhindirect.policy.x509.SubjectPublicKeySizeField; public class SubjectPublicKeySizeField_injectReferenceValueTest { diff --git a/src/test/java/org/nhindirect/policy/x509/TBSFieldName_getAttributesTest.java b/src/test/java/org/nhindirect/policy/x509/TBSFieldName_getAttributesTest.java index be3b9ce..9d59cb5 100644 --- a/src/test/java/org/nhindirect/policy/x509/TBSFieldName_getAttributesTest.java +++ b/src/test/java/org/nhindirect/policy/x509/TBSFieldName_getAttributesTest.java @@ -1,8 +1,8 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TBSFieldName_getAttributesTest { diff --git a/src/test/java/org/nhindirect/policy/x509/X509FieldType_getAttributesTest.java b/src/test/java/org/nhindirect/policy/x509/X509FieldType_getAttributesTest.java index 82a49ae..02f699b 100644 --- a/src/test/java/org/nhindirect/policy/x509/X509FieldType_getAttributesTest.java +++ b/src/test/java/org/nhindirect/policy/x509/X509FieldType_getAttributesTest.java @@ -1,8 +1,8 @@ package org.nhindirect.policy.x509; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class X509FieldType_getAttributesTest {