Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Enno Rehling 2018-11-25 09:26:05 +01:00
parent ed17b10287 b7275e40f3
commit aef271fe39
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renumber.c
View File

@ -164,7 +164,7 @@ int renumber_cmd(unit * u, order * ord)
break;
}
s = gettoken(token, sizeof(token));
if (*s == 0) {
if (s == NULL || *s == 0) {
i = newcontainerid();
}
else {

9
src/renumber.test.c
View File

@ -100,7 +100,12 @@ static void test_renumber_building(CuTest *tc) {
no = u->building->no;
uno = (no > 1) ? no - 1 : no + 1;
lang = u->faction->locale;
u->thisorder = create_order(K_NUMBER, lang, "%s %s", LOC(lang, parameters[P_BUILDING]), itoa36(uno));
u->thisorder = create_order(K_NUMBER, lang, LOC(lang, parameters[P_BUILDING]));
renumber_cmd(u, u->thisorder);
CuAssertTrue(tc, no != u->building->no);
free_order(u->thisorder);
u->thisorder = create_order(K_NUMBER, lang, "%s %i", LOC(lang, parameters[P_BUILDING]), uno);
renumber_cmd(u, u->thisorder);
CuAssertIntEquals(tc, uno, u->building->no);
test_teardown();
@ -119,7 +124,7 @@ static void test_renumber_building_duplicate(CuTest *tc) {
u->building = test_create_building(u->region, NULL);
no = u->building->no;
lang = f->locale;
u->thisorder = create_order(K_NUMBER, lang, "%s %s", LOC(lang, parameters[P_BUILDING]), itoa36(uno));
u->thisorder = create_order(K_NUMBER, lang, "%s %i", LOC(lang, parameters[P_BUILDING]), uno);
renumber_cmd(u, u->thisorder);
CuAssertPtrNotNull(tc, test_find_messagetype(f->msgs, "error115"));
CuAssertIntEquals(tc, no, u->building->no);