Skip to content

Commit

Permalink
Merge pull request #36 from chu11/fixtests
Browse files Browse the repository at this point in the history 
Fix testsuite for nodes that do not have a default genders file
  • Loading branch information
@BenCasses
BenCasses authored Nov 25, 2019
2 parents 7994d32 + 9104ba2 commit 7d35a20
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 50 deletions.
38 changes: 24 additions & 14 deletions src/testsuite/libgenders/genders_test_corner_case.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,16 +206,18 @@ genders_load_data_corner_case(int verbose)
int errcount = 0;
genders_load_data_corner_case_t *tests = &genders_load_data_corner_case_tests[0];

/* Special case for test #3. It depends on if the default genders file
/* Special case tests. It depends on if the default genders file
* exists on the system and the tester has access to it.
*/
{
struct stat buf;

if (stat(GENDERS_DEFAULT_FILE, &buf) < 0)
{
tests[3].expected_return_value = -1;
tests[3].expected_errnum = GENDERS_ERR_OPEN;
tests[4].expected_return_value = -1;
tests[4].expected_errnum = GENDERS_ERR_OPEN;
tests[5].expected_return_value = -1;
tests[5].expected_errnum = GENDERS_ERR_OPEN;
}
}

Expand Down Expand Up @@ -1629,23 +1631,31 @@ genders_parse_corner_case(int verbose)
int stderr_save;
int dev_null;

/* Special case for tests 6,7,18,19. It depends on if the default
* genders file exists on the system and the tester has access to
* it.
/* Special case for tests. It depends on if the default genders
* file exists on the system and the tester has access to it.
*/
{
struct stat buf;

if (stat(GENDERS_DEFAULT_FILE, &buf) < 0)
{
tests[6].expected_return_value = -1;
tests[6].expected_errnum = GENDERS_ERR_OPEN;
tests[7].expected_return_value = -1;
tests[7].expected_errnum = GENDERS_ERR_OPEN;
tests[18].expected_return_value = -1;
tests[18].expected_errnum = GENDERS_ERR_OPEN;
tests[19].expected_return_value = -1;
tests[19].expected_errnum = GENDERS_ERR_OPEN;
tests[8].expected_return_value = -1;
tests[8].expected_errnum = GENDERS_ERR_OPEN;
tests[9].expected_return_value = -1;
tests[9].expected_errnum = GENDERS_ERR_OPEN;
tests[10].expected_return_value = -1;
tests[10].expected_errnum = GENDERS_ERR_OPEN;
tests[11].expected_return_value = -1;
tests[11].expected_errnum = GENDERS_ERR_OPEN;

tests[24].expected_return_value = -1;
tests[24].expected_errnum = GENDERS_ERR_OPEN;
tests[25].expected_return_value = -1;
tests[25].expected_errnum = GENDERS_ERR_OPEN;
tests[26].expected_return_value = -1;
tests[26].expected_errnum = GENDERS_ERR_OPEN;
tests[27].expected_return_value = -1;
tests[27].expected_errnum = GENDERS_ERR_OPEN;
}
}

Expand Down
72 changes: 36 additions & 36 deletions src/testsuite/libgenders/genders_test_corner_case_tests.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1831,42 +1831,42 @@ genders_parse_corner_case_t genders_parse_corner_case_tests[] = {
{1, GENDERS_HANDLE_NULL, GENDERS_FILENAME_NULL, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_NULLHANDLE},
{2, GENDERS_HANDLE_NULL, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NULL, -1, GENDERS_ERR_NULLHANDLE},
{3, GENDERS_HANDLE_NULL, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_NULLHANDLE},
{5, GENDERS_HANDLE_NULL, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NULL, -1, GENDERS_ERR_NULLHANDLE},
{6, GENDERS_HANDLE_NULL, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_NULLHANDLE},
{7, GENDERS_HANDLE_NULL, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NULL, -1, GENDERS_ERR_NULLHANDLE},
{8, GENDERS_HANDLE_NULL, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_NULLHANDLE},
{9, GENDERS_HANDLE_UNLOADED, GENDERS_FILENAME_NULL, GENDERS_POINTER_NULL, 0, GENDERS_ERR_SUCCESS },
{10, GENDERS_HANDLE_UNLOADED, GENDERS_FILENAME_NULL, GENDERS_POINTER_NON_NULL, 0, GENDERS_ERR_SUCCESS },
{11, GENDERS_HANDLE_UNLOADED, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NULL, 0, GENDERS_ERR_SUCCESS },
{12, GENDERS_HANDLE_UNLOADED, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NON_NULL, 0, GENDERS_ERR_SUCCESS },
{13, GENDERS_HANDLE_UNLOADED, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NULL, 0, GENDERS_ERR_SUCCESS },
{14, GENDERS_HANDLE_UNLOADED, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NON_NULL, 0, GENDERS_ERR_SUCCESS },
{15, GENDERS_HANDLE_UNLOADED, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NULL, -1, GENDERS_ERR_OPEN },
{16, GENDERS_HANDLE_UNLOADED, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_OPEN },
{17, GENDERS_HANDLE_UNLOADED_DESTROYED, GENDERS_FILENAME_NULL, GENDERS_POINTER_NULL, -1, GENDERS_ERR_MAGIC },
{18, GENDERS_HANDLE_UNLOADED_DESTROYED, GENDERS_FILENAME_NULL, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_MAGIC },
{19, GENDERS_HANDLE_UNLOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NULL, -1, GENDERS_ERR_MAGIC },
{20, GENDERS_HANDLE_UNLOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_MAGIC },
{21, GENDERS_HANDLE_UNLOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NULL, -1, GENDERS_ERR_MAGIC },
{22, GENDERS_HANDLE_UNLOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_MAGIC },
{23, GENDERS_HANDLE_UNLOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NULL, -1, GENDERS_ERR_MAGIC },
{24, GENDERS_HANDLE_UNLOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_MAGIC },
{25, GENDERS_HANDLE_LOADED, GENDERS_FILENAME_NULL, GENDERS_POINTER_NULL, 0, GENDERS_ERR_SUCCESS },
{26, GENDERS_HANDLE_LOADED, GENDERS_FILENAME_NULL, GENDERS_POINTER_NON_NULL, 0, GENDERS_ERR_SUCCESS },
{27, GENDERS_HANDLE_LOADED, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NULL, 0, GENDERS_ERR_SUCCESS },
{28, GENDERS_HANDLE_LOADED, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NON_NULL, 0, GENDERS_ERR_SUCCESS },
{29, GENDERS_HANDLE_LOADED, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NULL, 0, GENDERS_ERR_SUCCESS },
{30, GENDERS_HANDLE_LOADED, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NON_NULL, 0, GENDERS_ERR_SUCCESS },
{31, GENDERS_HANDLE_LOADED, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NULL, -1, GENDERS_ERR_OPEN },
{32, GENDERS_HANDLE_LOADED, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_OPEN },
{33, GENDERS_HANDLE_LOADED_DESTROYED, GENDERS_FILENAME_NULL, GENDERS_POINTER_NULL, -1, GENDERS_ERR_MAGIC },
{34, GENDERS_HANDLE_LOADED_DESTROYED, GENDERS_FILENAME_NULL, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_MAGIC },
{35, GENDERS_HANDLE_LOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NULL, -1, GENDERS_ERR_MAGIC },
{36, GENDERS_HANDLE_LOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_MAGIC },
{37, GENDERS_HANDLE_LOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NULL, -1, GENDERS_ERR_MAGIC },
{38, GENDERS_HANDLE_LOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_MAGIC },
{39, GENDERS_HANDLE_LOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NULL, -1, GENDERS_ERR_MAGIC },
{40, GENDERS_HANDLE_LOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_MAGIC },
{4, GENDERS_HANDLE_NULL, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NULL, -1, GENDERS_ERR_NULLHANDLE},
{5, GENDERS_HANDLE_NULL, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_NULLHANDLE},
{6, GENDERS_HANDLE_NULL, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NULL, -1, GENDERS_ERR_NULLHANDLE},
{7, GENDERS_HANDLE_NULL, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_NULLHANDLE},
{8, GENDERS_HANDLE_UNLOADED, GENDERS_FILENAME_NULL, GENDERS_POINTER_NULL, 0, GENDERS_ERR_SUCCESS },
{9, GENDERS_HANDLE_UNLOADED, GENDERS_FILENAME_NULL, GENDERS_POINTER_NON_NULL, 0, GENDERS_ERR_SUCCESS },
{10, GENDERS_HANDLE_UNLOADED, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NULL, 0, GENDERS_ERR_SUCCESS },
{11, GENDERS_HANDLE_UNLOADED, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NON_NULL, 0, GENDERS_ERR_SUCCESS },
{12, GENDERS_HANDLE_UNLOADED, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NULL, 0, GENDERS_ERR_SUCCESS },
{13, GENDERS_HANDLE_UNLOADED, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NON_NULL, 0, GENDERS_ERR_SUCCESS },
{14, GENDERS_HANDLE_UNLOADED, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NULL, -1, GENDERS_ERR_OPEN },
{15, GENDERS_HANDLE_UNLOADED, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_OPEN },
{16, GENDERS_HANDLE_UNLOADED_DESTROYED, GENDERS_FILENAME_NULL, GENDERS_POINTER_NULL, -1, GENDERS_ERR_MAGIC },
{17, GENDERS_HANDLE_UNLOADED_DESTROYED, GENDERS_FILENAME_NULL, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_MAGIC },
{18, GENDERS_HANDLE_UNLOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NULL, -1, GENDERS_ERR_MAGIC },
{19, GENDERS_HANDLE_UNLOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_MAGIC },
{20, GENDERS_HANDLE_UNLOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NULL, -1, GENDERS_ERR_MAGIC },
{21, GENDERS_HANDLE_UNLOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_MAGIC },
{22, GENDERS_HANDLE_UNLOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NULL, -1, GENDERS_ERR_MAGIC },
{23, GENDERS_HANDLE_UNLOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_MAGIC },
{24, GENDERS_HANDLE_LOADED, GENDERS_FILENAME_NULL, GENDERS_POINTER_NULL, 0, GENDERS_ERR_SUCCESS },
{25, GENDERS_HANDLE_LOADED, GENDERS_FILENAME_NULL, GENDERS_POINTER_NON_NULL, 0, GENDERS_ERR_SUCCESS },
{26, GENDERS_HANDLE_LOADED, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NULL, 0, GENDERS_ERR_SUCCESS },
{27, GENDERS_HANDLE_LOADED, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NON_NULL, 0, GENDERS_ERR_SUCCESS },
{28, GENDERS_HANDLE_LOADED, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NULL, 0, GENDERS_ERR_SUCCESS },
{29, GENDERS_HANDLE_LOADED, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NON_NULL, 0, GENDERS_ERR_SUCCESS },
{30, GENDERS_HANDLE_LOADED, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NULL, -1, GENDERS_ERR_OPEN },
{31, GENDERS_HANDLE_LOADED, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_OPEN },
{32, GENDERS_HANDLE_LOADED_DESTROYED, GENDERS_FILENAME_NULL, GENDERS_POINTER_NULL, -1, GENDERS_ERR_MAGIC },
{33, GENDERS_HANDLE_LOADED_DESTROYED, GENDERS_FILENAME_NULL, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_MAGIC },
{34, GENDERS_HANDLE_LOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NULL, -1, GENDERS_ERR_MAGIC },
{35, GENDERS_HANDLE_LOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_EMPTY, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_MAGIC },
{36, GENDERS_HANDLE_LOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NULL, -1, GENDERS_ERR_MAGIC },
{37, GENDERS_HANDLE_LOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_EXIST, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_MAGIC },
{38, GENDERS_HANDLE_LOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NULL, -1, GENDERS_ERR_MAGIC },
{39, GENDERS_HANDLE_LOADED_DESTROYED, GENDERS_FILENAME_NON_NULL_NOT_EXIST, GENDERS_POINTER_NON_NULL, -1, GENDERS_ERR_MAGIC },
{-1, -1, -1, -1, -1},
};

Expand Down

0 comments on commit 7d35a20

Please sign in to comment.