Return a fatal error if application data is encountered during shutdown

[openssl.git] / test / asn1_internal_test.c

diff --git a/test/asn1_internal_test.c b/test/asn1_internal_test.c
index fc0ac202b4154a644c41e3161d12860b6a8c7df7..ab4dc353c4eff34f4d1d8f9668eb76f76faa3781 100644 (file)
--- a/test/asn1_internal_test.c
+++ b/test/asn1_internal_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -16,12 +16,7 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include "testutil.h"
-#include "e_os.h"
-
-typedef struct {
-    const char *test_case_name;
-    const char *test_section;
-} SIMPLE_FIXTURE;
+#include "internal/nelem.h"
 
 /**********************************************************************
  *
@@ -29,16 +24,9 @@ typedef struct {
  *
  ***/
 
-static SIMPLE_FIXTURE setup_tbl_standard(const char *const test_case_name)
-{
-    SIMPLE_FIXTURE fixture;
-    fixture.test_case_name = test_case_name;
-    return fixture;
-}
-
 #include "../crypto/asn1/tbl_standard.h"
 
-static int execute_tbl_standard(SIMPLE_FIXTURE fixture)
+static int test_tbl_standard(void)
 {
     const ASN1_STRING_TABLE *tmp;
     int last_nid = -1;
@@ -52,40 +40,29 @@ static int execute_tbl_standard(SIMPLE_FIXTURE fixture)
         last_nid = tmp->nid;
     }
 
-    if (last_nid != 0) {
-        fprintf(stderr, "%s: Table order OK\n", fixture.test_section);
+    if (TEST_int_ne(last_nid, 0)) {
+        TEST_info("asn1 tbl_standard: Table order OK");
         return 1;
     }
 
+    TEST_info("asn1 tbl_standard: out of order");
     for (tmp = tbl_standard, i = 0; i < OSSL_NELEM(tbl_standard); i++, tmp++)
-        fprintf(stderr, "%s: Index %" OSSLzu ", NID %d, Name=%s\n",
-               fixture.test_section, i, tmp->nid, OBJ_nid2ln(tmp->nid));
+        TEST_note("asn1 tbl_standard: Index %zu, NID %d, Name=%s",
+                  i, tmp->nid, OBJ_nid2ln(tmp->nid));
 
     return 0;
 }
 
-static void teardown_tbl_standard(SIMPLE_FIXTURE fixture)
-{
-    ERR_print_errors_fp(stderr);
-}
-
 /**********************************************************************
  *
  * Test of ameth_lib's standard_methods
  *
  ***/
 
-static SIMPLE_FIXTURE setup_standard_methods(const char *const test_case_name)
-{
-    SIMPLE_FIXTURE fixture;
-    fixture.test_case_name = test_case_name;
-    return fixture;
-}
-
 #include "internal/asn1_int.h"
 #include "../crypto/asn1/standard_methods.h"
 
-static int execute_standard_methods(SIMPLE_FIXTURE fixture)
+static int test_standard_methods(void)
 {
     const EVP_PKEY_ASN1_METHOD **tmp;
     int last_pkey_id = -1;
@@ -100,53 +77,23 @@ static int execute_standard_methods(SIMPLE_FIXTURE fixture)
         last_pkey_id = (*tmp)->pkey_id;
     }
 
-    if (last_pkey_id != 0) {
-        fprintf(stderr, "%s: Table order OK\n", fixture.test_section);
+    if (TEST_int_ne(last_pkey_id, 0)) {
+        TEST_info("asn1 standard methods: Table order OK");
         return 1;
     }
 
+    TEST_note("asn1 standard methods: out of order");
     for (tmp = standard_methods, i = 0; i < OSSL_NELEM(standard_methods);
          i++, tmp++)
-        fprintf(stderr, "%s: Index %" OSSLzu ", pkey ID %d, Name=%s\n",
-               fixture.test_section, i, (*tmp)->pkey_id,
-               OBJ_nid2sn((*tmp)->pkey_id));
+        TEST_note("asn1 standard methods: Index %zu, pkey ID %d, Name=%s",
+                  i, (*tmp)->pkey_id, OBJ_nid2sn((*tmp)->pkey_id));
 
     return 0;
 }
 
-static void teardown_standard_methods(SIMPLE_FIXTURE fixture)
-{
-    ERR_print_errors_fp(stderr);
-}
-
-/**********************************************************************
- *
- * Test driver
- *
- ***/
-
-static struct {
-    const char *section;
-    SIMPLE_FIXTURE (*setup)(const char *const test_case_name);
-    int (*execute)(SIMPLE_FIXTURE);
-    void (*teardown)(SIMPLE_FIXTURE);
-} tests[] = {
-    {"asn1 tlb_standard", setup_tbl_standard, execute_tbl_standard,
-     teardown_tbl_standard},
-    {"asn1 standard_methods", setup_standard_methods, execute_standard_methods,
-     teardown_standard_methods}
-};
-
-static int drive_tests(int idx)
+int setup_tests(void)
 {
-    SETUP_TEST_FIXTURE(SIMPLE_FIXTURE, tests[idx].setup);
-    fixture.test_section = tests[idx].section;
-    EXECUTE_TEST(tests[idx].execute, tests[idx].teardown);
-}
-
-int main(int argc, char **argv)
-{
-    ADD_ALL_TESTS(drive_tests, OSSL_NELEM(tests));
-
-    return run_tests(argv[0]);
+    ADD_TEST(test_tbl_standard);
+    ADD_TEST(test_standard_methods);
+    return 1;
 }