forked from github/server
Merge branch 'develop' of github.com:ennorehling/eressea into develop
This commit is contained in:
commit
530a6d067f
|
@ -10,7 +10,7 @@
|
||||||
static void test_init_directions(CuTest *tc) {
|
static void test_init_directions(CuTest *tc) {
|
||||||
struct locale *lang;
|
struct locale *lang;
|
||||||
|
|
||||||
test_cleanup();
|
test_setup();
|
||||||
lang = get_or_create_locale("de");
|
lang = get_or_create_locale("de");
|
||||||
locale_setstring(lang, "dir_nw", "NW");
|
locale_setstring(lang, "dir_nw", "NW");
|
||||||
init_directions(lang);
|
init_directions(lang);
|
||||||
|
@ -20,19 +20,23 @@ static void test_init_directions(CuTest *tc) {
|
||||||
|
|
||||||
static void test_init_direction(CuTest *tc) {
|
static void test_init_direction(CuTest *tc) {
|
||||||
struct locale *lang;
|
struct locale *lang;
|
||||||
test_cleanup();
|
test_setup();
|
||||||
|
|
||||||
lang = get_or_create_locale("de");
|
lang = get_or_create_locale("de");
|
||||||
init_direction(lang, D_NORTHWEST, "NW");
|
init_direction(lang, D_NORTHWEST, "NW");
|
||||||
|
init_direction(lang, D_NORTHWEST, "northwest");
|
||||||
init_direction(lang, D_EAST, "OST");
|
init_direction(lang, D_EAST, "OST");
|
||||||
|
init_direction(lang, D_EAST, "O");
|
||||||
CuAssertIntEquals(tc, D_NORTHWEST, get_direction("nw", lang));
|
CuAssertIntEquals(tc, D_NORTHWEST, get_direction("nw", lang));
|
||||||
|
CuAssertIntEquals(tc, D_NORTHWEST, get_direction("northwest", lang));
|
||||||
CuAssertIntEquals(tc, D_EAST, get_direction("ost", lang));
|
CuAssertIntEquals(tc, D_EAST, get_direction("ost", lang));
|
||||||
|
CuAssertIntEquals(tc, D_EAST, get_direction("O", lang));
|
||||||
CuAssertIntEquals(tc, NODIRECTION, get_direction("east", lang));
|
CuAssertIntEquals(tc, NODIRECTION, get_direction("east", lang));
|
||||||
test_cleanup();
|
test_cleanup();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void test_finddirection(CuTest *tc) {
|
static void test_finddirection(CuTest *tc) {
|
||||||
test_cleanup();
|
test_setup();
|
||||||
CuAssertIntEquals(tc, D_SOUTHWEST, finddirection("southwest"));
|
CuAssertIntEquals(tc, D_SOUTHWEST, finddirection("southwest"));
|
||||||
CuAssertIntEquals(tc, D_SOUTHEAST, finddirection("southeast"));
|
CuAssertIntEquals(tc, D_SOUTHEAST, finddirection("southeast"));
|
||||||
CuAssertIntEquals(tc, D_NORTHWEST, finddirection("northwest"));
|
CuAssertIntEquals(tc, D_NORTHWEST, finddirection("northwest"));
|
||||||
|
@ -42,6 +46,7 @@ static void test_finddirection(CuTest *tc) {
|
||||||
CuAssertIntEquals(tc, D_PAUSE, finddirection("pause"));
|
CuAssertIntEquals(tc, D_PAUSE, finddirection("pause"));
|
||||||
CuAssertIntEquals(tc, NODIRECTION, finddirection(""));
|
CuAssertIntEquals(tc, NODIRECTION, finddirection(""));
|
||||||
CuAssertIntEquals(tc, NODIRECTION, finddirection("potato"));
|
CuAssertIntEquals(tc, NODIRECTION, finddirection("potato"));
|
||||||
|
test_cleanup();
|
||||||
}
|
}
|
||||||
|
|
||||||
CuSuite *get_direction_suite(void)
|
CuSuite *get_direction_suite(void)
|
||||||
|
|
Loading…
Reference in New Issue