Merged revisions 275021 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Fri, 9 Jul 2010 15:35:53 +0000 (15:35 +0000)
committerRussell Bryant <russell@russellbryant.com>
Fri, 9 Jul 2010 15:35:53 +0000 (15:35 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r275021 | russell | 2010-07-09 10:33:08 -0500 (Fri, 09 Jul 2010) | 4 lines

  Document that a leading and trailing slash is expected for test categories.

  Also, emit a warning if a test is registered without one of these.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@275022 65c4cc65-6c06-0410-ace0-fbb531ad65f3

include/asterisk/test.h
main/test.c

index f97df80..57e05b4 100644 (file)
@@ -154,7 +154,12 @@ struct ast_test;
 struct ast_test_info {
        /*! \brief name of test, unique to category */
        const char *name;
-       /*! \brief test category */
+       /*!
+        * \brief test category
+        *
+        * Tests are categorized in a directory tree style hierarchy.  It is expected that
+        * this string have both a leading and trailing forward slash ('/').
+        */
        const char *category;
        /*! \brief optional short summary of test */
        const char *summary;
index 3427bf2..f35dbdb 100644 (file)
@@ -547,6 +547,11 @@ static struct ast_test *test_alloc(ast_test_cb_t *cb)
                return test_free(test);
        }
 
+       if (test->info.category[0] != '/' || test->info.category[strlen(test->info.category) - 1] != '/') {
+               ast_log(LOG_WARNING, "Test category is missing a leading or trailing backslash for test %s%s",
+                               test->info.category, test->info.name);
+       }
+
        if (ast_strlen_zero(test->info.summary)) {
                ast_log(LOG_WARNING, "Test %s/%s has no summary, test registration refused.\n",
                                test->info.category, test->info.name);