/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
*
- * Licensed under the OpenSSL license (the "License"). You may not use
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
#include <openssl/x509.h>
#include <openssl/x509v3.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"
/**********************************************************************
*
*
***/
-static SIMPLE_FIXTURE setup_standard_exts(const char *const test_case_name)
-{
- SIMPLE_FIXTURE fixture;
- fixture.test_case_name = test_case_name;
- return fixture;
-}
+#include "../crypto/x509/ext_dat.h"
+#include "../crypto/x509/standard_exts.h"
-#include "../crypto/x509v3/ext_dat.h"
-#include "../crypto/x509v3/standard_exts.h"
-
-static int execute_standard_exts(SIMPLE_FIXTURE fixture)
+static int test_standard_exts(void)
{
size_t i;
int prev = -1, good = 1;
}
if (!good) {
tmp = standard_exts;
- fprintf(stderr, "Extensions out of order!\n");
+ TEST_error("Extensions out of order!");
for (i = 0; i < STANDARD_EXTENSION_COUNT; i++, tmp++)
- fprintf(stderr, "%d : %s\n", (*tmp)->ext_nid,
- OBJ_nid2sn((*tmp)->ext_nid));
- } else {
- fprintf(stderr, "Order OK\n");
+ TEST_note("%d : %s", (*tmp)->ext_nid, OBJ_nid2sn((*tmp)->ext_nid));
}
-
return good;
}
-static void teardown_standard_exts(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[] = {
- {"standard_exts", setup_standard_exts, execute_standard_exts,
- teardown_standard_exts},
-};
-
-static int drive_tests(int idx)
-{
- 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)
+int setup_tests(void)
{
- ADD_ALL_TESTS(drive_tests, OSSL_NELEM(tests));
-
- return run_tests(argv[0]);
+ ADD_TEST(test_standard_exts);
+ return 1;
}