projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mapgens: Rename m_emerge to prevent name collisions
[oweals/minetest.git]
/
src
/
test.cpp
diff --git
a/src/test.cpp
b/src/test.cpp
index 63d8219a9ab7ff68e1e55629a00fc30fbfe243ab..072bda8ef79ab63bd5abae70662328667918db68 100644
(file)
--- a/
src/test.cpp
+++ b/
src/test.cpp
@@
-440,7
+440,7
@@
struct TestPath: public TestBase
"some multiline text\n" \
" with leading whitespace!\n" \
"\"\"\"\n" \
"some multiline text\n" \
" with leading whitespace!\n" \
"\"\"\"\n" \
- "np_terrain = 5, 40, (250, 250, 250), 1234
5, 5, 0.7
\n" \
+ "np_terrain = 5, 40, (250, 250, 250), 1234
1, 5, 0.7, 2.4
\n" \
"zoop = true"
#define TEST_CONFIG_TEXT_AFTER \
"zoop = true"
#define TEST_CONFIG_TEXT_AFTER \
@@
-467,12
+467,12
@@
struct TestPath: public TestBase
"\"\"\"\n" \
"np_terrain = {\n" \
" flags = defaults\n" \
"\"\"\"\n" \
"np_terrain = {\n" \
" flags = defaults\n" \
- " lacunarity = 2
\n"
\
+ " lacunarity = 2
.4\n"
\
" octaves = 6\n" \
" offset = 3.5\n" \
" persistence = 0.7\n" \
" scale = 40\n" \
" octaves = 6\n" \
" offset = 3.5\n" \
" persistence = 0.7\n" \
" scale = 40\n" \
- " seed = 1234
5
\n" \
+ " seed = 1234
1
\n" \
" spread = (250,250,250)\n" \
"}\n" \
"zoop = true\n" \
" spread = (250,250,250)\n" \
"}\n" \
"zoop = true\n" \
@@
-533,6
+533,11
@@
struct TestSettings: public TestBase
group2->set("animals", "cute"); //destroys group 3
s.setGroup("groupy_thing", group2);
group2->set("animals", "cute"); //destroys group 3
s.setGroup("groupy_thing", group2);
+ // Test set failure conditions
+ UASSERT(s.set("Zoop = Poop\nsome_other_setting", "false") == false);
+ UASSERT(s.set("sneaky", "\"\"\"\njabberwocky = false") == false);
+ UASSERT(s.set("hehe", "asdfasdf\n\"\"\"\nsomething = false") == false);
+
// Test multiline settings
UASSERT(group->get("ccc") == "testy\n testa ");
// Test multiline settings
UASSERT(group->get("ccc") == "testy\n testa ");
@@
-550,7
+555,7
@@
struct TestSettings: public TestBase
UASSERT(fabs(np.spread.X - 250) < 0.001);
UASSERT(fabs(np.spread.Y - 250) < 0.001);
UASSERT(fabs(np.spread.Z - 250) < 0.001);
UASSERT(fabs(np.spread.X - 250) < 0.001);
UASSERT(fabs(np.spread.Y - 250) < 0.001);
UASSERT(fabs(np.spread.Z - 250) < 0.001);
- UASSERT(np.seed == 1234
5
);
+ UASSERT(np.seed == 1234
1
);
UASSERT(np.octaves == 5);
UASSERT(fabs(np.persist - 0.7) < 0.001);
UASSERT(np.octaves == 5);
UASSERT(fabs(np.persist - 0.7) < 0.001);