Migrated OER tests into new regression test.

dghgit · dghgit · commit 64e9f158e8b5 · 2022-02-04T15:17:49.000+11:00
diff --git a/util/src/test/java/org/bouncycastle/asn1/util/test/RegressionTest.java b/util/src/test/java/org/bouncycastle/asn1/util/test/RegressionTest.java
@@ -60,8 +60,6 @@
 import org.bouncycastle.asn1.isismtt.test.ProcurationSyntaxUnitTest;
 import org.bouncycastle.asn1.isismtt.test.RequestedCertificateUnitTest;
 import org.bouncycastle.asn1.isismtt.test.RestrictionUnitTest;
-import org.bouncycastle.oer.test.ExpansionTest;
-import org.bouncycastle.oer.test.ExtensionTest;
 import org.bouncycastle.asn1.smime.test.SMIMETest;
 import org.bouncycastle.util.test.SimpleTest;
 import org.bouncycastle.util.test.Test;
@@ -132,8 +130,6 @@ public class RegressionTest
         new RequestedCertificateUnitTest(),
         new RestrictionUnitTest(),
         new SMIMETest(),
-        new ExpansionTest(),
-        new ExtensionTest(),
     };
 
     public static void main(String[] args)
diff --git a/util/src/test/java/org/bouncycastle/oer/test/AllTests.java b/util/src/test/java/org/bouncycastle/oer/test/AllTests.java
@@ -0,0 +1,59 @@
+package org.bouncycastle.oer.test;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.bouncycastle.util.test.SimpleTestResult;
+
+public class AllTests
+    extends TestCase
+{
+    public void testASN1()
+    {   
+        org.bouncycastle.util.test.Test[] tests = RegressionTest.tests;
+        
+        for (int i = 0; i != tests.length; i++)
+        {
+            SimpleTestResult  result = (SimpleTestResult)tests[i].perform();
+            
+            if (!result.isSuccessful())
+            {
+                fail(result.toString());
+            }
+        }
+    }
+    
+    public static void main (String[] args)
+    {
+        junit.textui.TestRunner.run(suite());
+    }
+    
+    public static Test suite()
+    {
+        TestSuite suite = new TestSuite("ASN.1 Tests");
+        
+        suite.addTestSuite(AllTests.class);
+        
+        return new BCTestSetup(suite);
+    }
+
+    static class BCTestSetup
+        extends TestSetup
+    {
+        public BCTestSetup(Test test)
+        {
+            super(test);
+        }
+
+        protected void setUp()
+        {
+
+        }
+
+        protected void tearDown()
+        {
+
+        }
+    }
+}
diff --git a/util/src/test/java/org/bouncycastle/oer/test/RegressionTest.java b/util/src/test/java/org/bouncycastle/oer/test/RegressionTest.java
@@ -0,0 +1,17 @@
+package org.bouncycastle.oer.test;
+
+import org.bouncycastle.util.test.SimpleTest;
+import org.bouncycastle.util.test.Test;
+
+public class RegressionTest
+{
+    public static Test[] tests = {
+        new ExpansionTest(),
+        new ExtensionTest(),
+    };
+
+    public static void main(String[] args)
+    {
+        SimpleTest.runTests(tests);
+    }
+}
