tests: renaming common.h to common-url.h

18 files changed, 30 insertions, 32 deletions

diff --git a/tests/common-dict.c b/tests/common-dict.c
index 9a6e499..f3f149c 100644
--- a/tests/common-dict.c
+++ b/tests/common-dict.c
@@ -43,8 +43,6 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "common.h"
-
 
 ///////////////////
 //               //
@@ -324,7 +322,7 @@ our_dict_initialize(
    };
 
    // load builtin/default dictionary objects
-   if ((opts & TRAD_TEST_DFLT_DICT))
+   if ((opts & TEST_OPT_DFLT_DICT))
    {
       trutils_verbose(opts, "loading default dictionary ...");
       if ((rc = tinyrad_dict_defaults(*dictp, &errs, 0)) != TRAD_SUCCESS)
diff --git a/tests/common-dict.h b/tests/common-dict.h
index 84d258b..4b5ef17 100644
--- a/tests/common-dict.h
+++ b/tests/common-dict.h
@@ -49,6 +49,8 @@
 ///////////////////
 #pragma mark - Definitions
 
+#define TEST_OPT_DFLT_DICT   0x0040UL
+
 
 /////////////////
 //             //
diff --git a/tests/common.c b/tests/common-url.c
index 2c0f288..310775a 100644
--- a/tests/common.c
+++ b/tests/common-url.c
@@ -28,8 +28,8 @@
  *  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  *  SUCH DAMAGE.
  */
-#define _TESTS_COMMON_C 1
-#include "common.h"
+#define _TESTS_COMMON_URL_C 1
+#include "common-url.h"
 
 
 ///////////////
diff --git a/tests/common.h b/tests/common-url.h
index 05f9784..ec63c68 100644
--- a/tests/common.h
+++ b/tests/common-url.h
@@ -28,8 +28,8 @@
  *  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  *  SUCH DAMAGE.
  */
-#ifndef _TESTS_COMMON_H
-#define _TESTS_COMMON_H 1
+#ifndef _TESTS_COMMON_URL_H
+#define _TESTS_COMMON_URL_H 1
 
 
 ///////////////
@@ -39,14 +39,6 @@
 ///////////////
 #pragma mark - Headers
 
-#include <tinyrad_compat.h>
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <tinyrad.h>
-#include <tinyrad_internal.h>
 #include <tinyrad_utils.h>
 
 
diff --git a/tests/test-array-queue.c b/tests/test-array-queue.c
index e014088..3f06021 100644
--- a/tests/test-array-queue.c
+++ b/tests/test-array-queue.c
@@ -38,7 +38,7 @@
 ///////////////
 #pragma mark - Headers
 
-#include "common.h"
+#include <tinyrad_utils.h>
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/tests/test-array-sorted.c b/tests/test-array-sorted.c
index ef86c12..445f240 100644
--- a/tests/test-array-sorted.c
+++ b/tests/test-array-sorted.c
@@ -38,7 +38,7 @@
 ///////////////
 #pragma mark - Headers
 
-#include "common.h"
+#include <tinyrad_utils.h>
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/tests/test-array-stack.c b/tests/test-array-stack.c
index 7912878..9d94da6 100644
--- a/tests/test-array-stack.c
+++ b/tests/test-array-stack.c
@@ -38,7 +38,7 @@
 ///////////////
 #pragma mark - Headers
 
-#include "common.h"
+#include <tinyrad_utils.h>
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/tests/test-assertions.c b/tests/test-assertions.c
index f4aa426..fd88e75 100644
--- a/tests/test-assertions.c
+++ b/tests/test-assertions.c
@@ -40,7 +40,7 @@
 
 #undef NDEBUG
 
-#include "common.h"
+#include <tinyrad_utils.h>
 
 #include <stdio.h>
 #include <getopt.h>
diff --git a/tests/test-assumptions.c b/tests/test-assumptions.c
index dfd6364..7d16837 100644
--- a/tests/test-assumptions.c
+++ b/tests/test-assumptions.c
@@ -40,7 +40,7 @@
 
 #undef NDEBUG
 
-#include "common.h"
+#include <tinyrad_utils.h>
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/tests/test-dict-attrs.c b/tests/test-dict-attrs.c
index 448b95a..6bf5970 100644
--- a/tests/test-dict-attrs.c
+++ b/tests/test-dict-attrs.c
@@ -38,7 +38,7 @@
 ///////////////
 #pragma mark - Headers
 
-#include "common.h"
+#include <tinyrad_utils.h>
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -120,7 +120,7 @@ main(
 
    trutils_initialize(PROGRAM_NAME);
 
-   opts  = TRAD_TEST_DFLT_DICT;
+   opts  = TEST_OPT_DFLT_DICT;
 
    while((c = getopt_long(argc, argv, short_opt, long_opt, &opt_index)) != -1)
    {
diff --git a/tests/test-dict-values.c b/tests/test-dict-values.c
index 8f54d52..ba32364 100644
--- a/tests/test-dict-values.c
+++ b/tests/test-dict-values.c
@@ -38,7 +38,7 @@
 ///////////////
 #pragma mark - Headers
 
-#include "common.h"
+#include <tinyrad_utils.h>
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -122,7 +122,7 @@ main(
 
    trutils_initialize(PROGRAM_NAME);
 
-   opts  = TRAD_TEST_DFLT_DICT;
+   opts  = TEST_OPT_DFLT_DICT;
 
    while((c = getopt_long(argc, argv, short_opt, long_opt, &opt_index)) != -1)
    {
diff --git a/tests/test-dict-vendors.c b/tests/test-dict-vendors.c
index 21a2a1a..258a729 100644
--- a/tests/test-dict-vendors.c
+++ b/tests/test-dict-vendors.c
@@ -38,7 +38,7 @@
 ///////////////
 #pragma mark - Headers
 
-#include "common.h"
+#include <tinyrad_utils.h>
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -120,7 +120,7 @@ main(
 
    trutils_initialize(PROGRAM_NAME);
 
-   opts  = TRAD_TEST_DFLT_DICT;
+   opts  = TEST_OPT_DFLT_DICT;
 
    while((c = getopt_long(argc, argv, short_opt, long_opt, &opt_index)) != -1)
    {
diff --git a/tests/test-oid-str.c b/tests/test-oid-str.c
index 9e79ebb..9561180 100644
--- a/tests/test-oid-str.c
+++ b/tests/test-oid-str.c
@@ -37,7 +37,7 @@
 ///////////////
 #pragma mark - Headers
 
-#include "common.h"
+#include <tinyrad_utils.h>
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/tests/test-options.c b/tests/test-options.c
index 8ad7cfc..fd9e3f2 100644
--- a/tests/test-options.c
+++ b/tests/test-options.c
@@ -38,7 +38,7 @@
 ///////////////
 #pragma mark - Headers
 
-#include "common.h"
+#include <tinyrad_utils.h>
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/tests/test-pckt-byte-order.c b/tests/test-pckt-byte-order.c
index 85b3ad5..66ea158 100644
--- a/tests/test-pckt-byte-order.c
+++ b/tests/test-pckt-byte-order.c
@@ -37,7 +37,7 @@
 ///////////////
 #pragma mark - Headers
 
-#include "common.h"
+#include <tinyrad_utils.h>
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/tests/test-url-desc2str.c b/tests/test-url-desc2str.c
index a566e95..446b23d 100644
--- a/tests/test-url-desc2str.c
+++ b/tests/test-url-desc2str.c
@@ -38,7 +38,7 @@
 ///////////////
 #pragma mark - Headers
 
-#include "common.h"
+#include <tinyrad_utils.h>
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -50,6 +50,8 @@
 
 #include <tinyrad.h>
 
+#include "common-url.h"
+
 
 ///////////////////
 //               //
diff --git a/tests/test-url-parse.c b/tests/test-url-parse.c
index 4d6a1dd..cc7b267 100644
--- a/tests/test-url-parse.c
+++ b/tests/test-url-parse.c
@@ -38,7 +38,7 @@
 ///////////////
 #pragma mark - Headers
 
-#include "common.h"
+#include <tinyrad_utils.h>
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -50,6 +50,8 @@
 
 #include <tinyrad.h>
 
+#include "common-url.h"
+
 
 ///////////////////
 //               //
diff --git a/tests/test-url-resolve.c b/tests/test-url-resolve.c
index 3027eed..8cf2539 100644
--- a/tests/test-url-resolve.c
+++ b/tests/test-url-resolve.c
@@ -38,7 +38,7 @@
 ///////////////
 #pragma mark - Headers
 
-#include "common.h"
+#include <tinyrad_utils.h>
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -50,6 +50,8 @@
 
 #include <tinyrad.h>
 
+#include "common-url.h"
+
 
 ///////////////////
 //               //