Skip to content

Commit 0c454ca

Browse files
expand daemon/planet test coverage
1 parent 22de456 commit 0c454ca

File tree

2 files changed

+26
-3
lines changed

2 files changed

+26
-3
lines changed

lib/daemon/planet.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,19 @@ int create_planet (string name, mapping config) {
7171
}
7272
config["name"] = name;
7373
__Planet = config;
74-
return save_object(path);
74+
return !!save_object(path);
7575
}
7676

7777
int adjust_planet (string name, mapping config) {
7878
string path = "/save/planet/" + lower_case(name[0..0]) + "/" + name + ".o";
79-
if (file_size(path) == 0) {
79+
if (file_size(path) == -1) {
8080
return 0;
8181
}
8282
__Planet = ([ ]);
8383
map_delete(config, "name");
8484
restore_object(path);
8585
__Planet += config;
86-
return save_object(path);
86+
return !!save_object(path);
8787
}
8888

8989
/* ----- noise ----- */

lib/daemon/planet.test.c

+23
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,27 @@ void test_querying_planets () {
108108
assert_equal(testOb->query_planet("Terra")["name"], "Terra"),
109109
assert_equal(testOb->query_planet_size("Terra"), 500),
110110
}) :));
111+
}
112+
113+
void test_creating_and_adjusting_planet () {
114+
string testPlanet = "test_" + time();
115+
116+
expect("create_planet behaves", (: ({
117+
// planet doesn't exist yet
118+
assert_equal(testOb->query_planet($(testPlanet)), ([ ])),
119+
// create test planet
120+
assert_equal(testOb->create_planet($(testPlanet), ([ "size": 123 ])), 1),
121+
// planet exists
122+
assert_equal(testOb->query_planet($(testPlanet)), ([ "name": $(testPlanet), "size": 123 ])),
123+
// planet was already created
124+
assert_equal(testOb->create_planet($(testPlanet), ([ ])), 0),
125+
}) :));
126+
expect("adjust_planet behaves", (: ({
127+
// adjust planet size
128+
assert_equal(testOb->adjust_planet($(testPlanet), ([ "size": 321 ])), 1),
129+
// can't adjust non-existant planet
130+
assert_equal(testOb->adjust_planet($(testPlanet+"-bad"), ([ "size": 321 ])), 0),
131+
}) :));
132+
133+
rm("/save/planet/t/"+testPlanet+".o");
111134
}

0 commit comments

Comments
 (0)