Reorder and renumber tests appropriately

It appears that a patch did not apply properly when adding tests 12 and
13 and test 11 was duplicated.  These tests have been reordered and
renumbered such that they make sense.

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

diff --git a/channels/sip/config_parser.c b/channels/sip/config_parser.c
index 239346bf4d0d55a5a218848bf6f9a1dd64ff74af..0093a23795839b013063854bc01355be34a24acd 100644 (file)
--- a/channels/sip/config_parser.c
+++ b/channels/sip/config_parser.c
@@ -530,7 +530,48 @@ AST_TEST_DEFINE(sip_parse_register_line_test)
        ast_string_field_free_memory(reg);
        ast_free(reg);
 
-       /* ---Test reg12, add domain port --- */
+       /* ---Test reg 9, missing domain, expected to fail --- */
+       if (!(reg = ast_calloc_with_stringfields(1, struct sip_registry, 256))) {
+               goto alloc_fail;
+       } else if (!sip_parse_register_line(reg, default_expiry, reg9, 1)) {
+               ast_test_status_update(test,
+                               "Test 9, missing domain, expected to fail but did not.\n");
+               res = AST_TEST_FAIL;
+       }
+       ast_string_field_free_memory(reg);
+       ast_free(reg);
+
+       /* ---Test reg 10,  missing user, expected to fail --- */
+       if (!(reg = ast_calloc_with_stringfields(1, struct sip_registry, 256))) {
+               goto alloc_fail;
+       } else if (!sip_parse_register_line(reg, default_expiry, reg10, 1)) {
+               ast_test_status_update(test,
+                               "Test 10, missing user expected to fail but did not\n");
+               res = AST_TEST_FAIL;
+       }
+       ast_string_field_free_memory(reg);
+       ast_free(reg);
+
+       /* ---Test reg 11, no registry object, expected to fail--- */
+       if (!sip_parse_register_line(NULL, default_expiry, reg1, 1)) {
+               ast_test_status_update(test,
+                               "Test 11, no registry object, expected to fail but did not.\n");
+               res = AST_TEST_FAIL;
+       }
+
+       /* ---Test reg 12,  no registry line, expected to fail --- */
+       if (!(reg = ast_calloc_with_stringfields(1, struct sip_registry, 256))) {
+               goto alloc_fail;
+       } else if (!sip_parse_register_line(reg, default_expiry, NULL, 1)) {
+
+               ast_test_status_update(test,
+                               "Test 12, NULL register line expected to fail but did not.\n");
+               res = AST_TEST_FAIL;
+       }
+       ast_string_field_free_memory(reg);
+       ast_free(reg);
+
+       /* ---Test reg13, add domain port --- */
        if (!(reg = ast_calloc_with_stringfields(1, struct sip_registry, 256))) {
                goto alloc_fail;
        } else if (
@@ -553,13 +594,13 @@ AST_TEST_DEFINE(sip_parse_register_line_test)
                reg->callid_valid != FALSE          ||
                reg->ocseq != INITIAL_CSEQ) {
 
-               ast_test_status_update(test, "Test 12, add domain port failed.\n");
+               ast_test_status_update(test, "Test 13, add domain port failed.\n");
                res = AST_TEST_FAIL;
        }
        ast_string_field_free_memory(reg);
        ast_free(reg);
 
-       /* ---Test reg13, domain port without secret --- */
+       /* ---Test reg14, domain port without secret --- */
        if (!(reg = ast_calloc_with_stringfields(1, struct sip_registry, 256))) {
                goto alloc_fail;
        } else if (
@@ -582,48 +623,7 @@ AST_TEST_DEFINE(sip_parse_register_line_test)
                reg->callid_valid != FALSE          ||
                reg->ocseq != INITIAL_CSEQ) {
 
-               ast_test_status_update(test, "Test 13, domain port without secret failed.\n");
-               res = AST_TEST_FAIL;
-       }
-       ast_string_field_free_memory(reg);
-       ast_free(reg);
-
-       /* ---Test reg 9, missing domain, expected to fail --- */
-       if (!(reg = ast_calloc_with_stringfields(1, struct sip_registry, 256))) {
-               goto alloc_fail;
-       } else if (!sip_parse_register_line(reg, default_expiry, reg9, 1)) {
-               ast_test_status_update(test,
-                               "Test 9, missing domain, expected to fail but did not.\n");
-               res = AST_TEST_FAIL;
-       }
-       ast_string_field_free_memory(reg);
-       ast_free(reg);
-
-       /* ---Test reg 10,  missing user, expected to fail --- */
-       if (!(reg = ast_calloc_with_stringfields(1, struct sip_registry, 256))) {
-               goto alloc_fail;
-       } else if (!sip_parse_register_line(reg, default_expiry, reg10, 1)) {
-               ast_test_status_update(test,
-                               "Test 10, missing user expected to fail but did not\n");
-               res = AST_TEST_FAIL;
-       }
-       ast_string_field_free_memory(reg);
-       ast_free(reg);
-
-       /* ---Test reg 11, no registry object, expected to fail--- */
-       if (!sip_parse_register_line(NULL, default_expiry, reg1, 1)) {
-               ast_test_status_update(test,
-                               "Test 11, no registry object, expected to fail but did not.\n");
-               res = AST_TEST_FAIL;
-       }
-
-       /* ---Test reg 11,  no registry line, expected to fail --- */
-       if (!(reg = ast_calloc_with_stringfields(1, struct sip_registry, 256))) {
-               goto alloc_fail;
-       } else if (!sip_parse_register_line(reg, default_expiry, NULL, 1)) {
-
-               ast_test_status_update(test,
-                               "Test 11, NULL register line expected to fail but did not.\n");
+               ast_test_status_update(test, "Test 14, domain port without secret failed.\n");
                res = AST_TEST_FAIL;
        }
        ast_string_field_free_memory(reg);