cleaned up tests

Author: dghgit

test/src/test/java/org/bouncycastle/test/est/TestCACertsFetch.java

@@ -52,19 +52,19 @@
 
 
 public class TestCACertsFetch
-    extends SimpleTest
+//    extends SimpleTest
 {
 
     public String getName()
     {
         return "TestCACertsFetch";
     }
 
-    public void performTest()
-        throws Exception
-    {
-        ESTTestUtils.runJUnit(TestCACertsFetch.class);
-    }
+//    public void performTest()
+//        throws Exception
+//    {
+//        ESTTestUtils.runJUnit(TestCACertsFetch.class);
+//    }
 
     private ESTServerUtils.ServerInstance startDefaultServer()
         throws Exception
@@ -1778,12 +1778,12 @@ public void testCertResponseWithLabelApplication()
         res.getFinished().await(5, TimeUnit.SECONDS);
 
     }
-
-
-    public static void main(String[] args)
-        throws Exception
-    {
-        ESTTestUtils.ensureProvider();
-        runTest(new TestCACertsFetch());
-    }
+//
+//
+//    public static void main(String[] args)
+//        throws Exception
+//    {
+//        ESTTestUtils.ensureProvider();
+//        runTest(new TestCACertsFetch());
+//    }
 }

test/src/test/java/org/bouncycastle/test/est/TestESTServiceFails.java

@@ -25,18 +25,18 @@
  * Test illegal state exceptions are thrown when expected.
  */
 public class TestESTServiceFails
-    extends SimpleTest
+//    extends SimpleTest
 {
     public String getName()
     {
         return "ESTServiceFails";
     }
 
-    public void performTest()
-        throws Exception
-    {
-        ESTTestUtils.runJUnit(TestESTServiceFails.class);
-    }
+//    public void performTest()
+//        throws Exception
+//    {
+//        ESTTestUtils.runJUnit(TestESTServiceFails.class);
+//    }
 
 
     @Test(expected = NullPointerException.class)

test/src/test/java/org/bouncycastle/test/est/TestEnroll.java

@@ -55,19 +55,20 @@
 import org.junit.Test;
 
 public class TestEnroll
-    extends SimpleTest
+//    extends SimpleTest
 {
 
     public String getName()
     {
         return "TestEnroll";
     }
 
-    public void performTest()
-        throws Exception
-    {
-        ESTTestUtils.runJUnit(TestEnroll.class);
-    }
+
+//    public void performTest()
+//        throws Exception
+//    {
+//        ESTTestUtils.runJUnit(TestEnroll.class);
+//    }
 
 
     // Start a server instance that uses basic auth.
@@ -2323,8 +2324,8 @@ public static void main(String[] args)
 //            }
 //        }
 
-        ESTTestUtils.ensureProvider();
-        runTest(new TestEnroll());
+//        ESTTestUtils.ensureProvider();
+//        runTest(new TestEnroll());
     }
 
 }

test/src/test/java/org/bouncycastle/test/est/TestGetCSRAttrs.java

@@ -23,7 +23,7 @@
 
 
 public class TestGetCSRAttrs
-    extends SimpleTest
+//    extends SimpleTest
 {
 
     public String getName()
@@ -54,12 +54,11 @@ private ESTServerUtils.ServerInstance startDefaultServer()
 
     }
 
-
-    public void performTest()
-        throws Exception
-    {
-        ESTTestUtils.runJUnit(TestGetCSRAttrs.class);
-    }
+//    public void performTest()
+//        throws Exception
+//    {
+//        ESTTestUtils.runJUnit(TestGetCSRAttrs.class);
+//    }
 
 
     /**
@@ -750,10 +749,10 @@ public void testFetchCSRWithLabel()
     }
 
 
-    public static void main(String[] args)
-        throws Exception
-    {
-        ESTTestUtils.ensureProvider();
-        runTest(new TestGetCSRAttrs());
-    }
+//    public static void main(String[] args)
+//        throws Exception
+//    {
+//        ESTTestUtils.ensureProvider();
+//        runTest(new TestGetCSRAttrs());
+//    }
 }

test/src/test/java/org/bouncycastle/test/est/TestIllegalPathSegments.java

@@ -8,18 +8,18 @@
 import org.junit.Test;
 
 public class TestIllegalPathSegments
-    extends SimpleTest
+//    extends SimpleTest
 {
     public String getName()
     {
         return "TestIllegalPathSegments";
     }
 
-    public void performTest()
-        throws Exception
-    {
-        ESTTestUtils.runJUnit(TestIllegalPathSegments.class);
-    }
+//    public void performTest()
+//        throws Exception
+//    {
+//        ESTTestUtils.runJUnit(TestIllegalPathSegments.class);
+//    }
 
     @Test(expected = IllegalArgumentException.class)
     public void testPathSegment_4800()

test/src/test/java/org/bouncycastle/test/est/TestKeyUsage.java

@@ -28,7 +28,7 @@
 
 
 public class TestKeyUsage
-    extends SimpleTest
+//    extends SimpleTest
 {
     private static int[] keyUsage = new int[]{
         KeyUsage.digitalSignature,
@@ -75,11 +75,11 @@ public String getName()
         return "TestKeyUsage";
     }
 
-    public void performTest()
-        throws Exception
-    {
-        ESTTestUtils.runJUnit(TestKeyUsage.class);
-    }
+//    public void performTest()
+//        throws Exception
+//    {
+//        ESTTestUtils.runJUnit(TestKeyUsage.class);
+//    }
 
 
     public static void matrix()

test/src/test/java/org/bouncycastle/test/est/TestServerKeyGeneration.java

@@ -21,12 +21,13 @@
 import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder;
 import org.bouncycastle.util.io.Streams;
 import org.bouncycastle.util.test.SimpleTest;
+import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
 public class TestServerKeyGeneration
-    extends SimpleTest
+//    extends SimpleTest
 {
 
 
@@ -41,11 +42,12 @@ public String getName()
         return "test against globalsign est server";
     }
 
-    public void performTest()
-        throws Exception
-    {
-        testServerGenWithoutEncryption();
-    }
+
+//    public void performTest()
+//        throws Exception
+//    {
+//        testServerGenWithoutEncryption();
+//    }
 
 
     @Test
@@ -103,13 +105,13 @@ public void testServerGenWithoutEncryption()
             //
             if (pki == null)
             {
-                fail("expecting pki");
+                Assert.fail("expecting pki");
             }
 
             X509CertificateHolder enrolledAsHolder = ESTService.storeToArray(enr.getStore())[0];
             if (enrolledAsHolder == null)
             {
-                fail("expecting certificate");
+                Assert.fail("expecting certificate");
             }
         }
         catch (ESTException estException)
@@ -122,11 +124,11 @@ public void testServerGenWithoutEncryption()
     }
 
 
-    public static void main(String[] args)
-        throws Exception
-    {
-        ESTTestUtils.ensureProvider();
-        runTest(new TestServerKeyGeneration());
-    }
+//    public static void main(String[] args)
+//        throws Exception
+//    {
+//        ESTTestUtils.ensureProvider();
+//        runTest(new TestServerKeyGeneration());
+//    }
 
 }