X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Funittest%2Ftest_schematic.cpp;h=da4ce50d2c39035882c2a681a8af34862ba397a7;hb=d4b8075c3576688d94dad302cf97c4afc5fc41a5;hp=4801244280f14214f625d64ac49ca9ca5d0c9008;hpb=11a96e4901ce54c4646e47866f7a66cd9034c16b;p=dragonfireclient.git

diff --git a/src/unittest/test_schematic.cpp b/src/unittest/test_schematic.cpp
index 480124428..da4ce50d2 100644
--- a/src/unittest/test_schematic.cpp
+++ b/src/unittest/test_schematic.cpp
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "test.h"
 
-#include "mg_schematic.h"
+#include "mapgen/mg_schematic.h"
 #include "gamedef.h"
 #include "nodedef.h"
 
@@ -30,9 +30,9 @@ class TestSchematic : public TestBase {
 
 	void runTests(IGameDef *gamedef);
 
-	void testMtsSerializeDeserialize(INodeDefManager *ndef);
-	void testLuaTableSerialize(INodeDefManager *ndef);
-	void testFileSerializeDeserialize(INodeDefManager *ndef);
+	void testMtsSerializeDeserialize(const NodeDefManager *ndef);
+	void testLuaTableSerialize(const NodeDefManager *ndef);
+	void testFileSerializeDeserialize(const NodeDefManager *ndef);
 
 	static const content_t test_schem1_data[7 * 6 * 4];
 	static const content_t test_schem2_data[3 * 3 * 3];
@@ -44,8 +44,8 @@ static TestSchematic g_test_instance;
 
 void TestSchematic::runTests(IGameDef *gamedef)
 {
-	IWritableNodeDefManager *ndef =
-		(IWritableNodeDefManager *)gamedef->getNodeDefManager();
+	NodeDefManager *ndef =
+		(NodeDefManager *)gamedef->getNodeDefManager();
 
 	ndef->setNodeRegistrationStatus(true);
 
@@ -58,7 +58,7 @@ void TestSchematic::runTests(IGameDef *gamedef)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-void TestSchematic::testMtsSerializeDeserialize(INodeDefManager *ndef)
+void TestSchematic::testMtsSerializeDeserialize(const NodeDefManager *ndef)
 {
 	static const v3s16 size(7, 6, 4);
 	static const u32 volume = size.X * size.Y * size.Z;
@@ -67,10 +67,10 @@ void TestSchematic::testMtsSerializeDeserialize(INodeDefManager *ndef)
 		std::ios_base::in | std::ios_base::out);
 
 	std::vector<std::string> names;
-	names.push_back("foo");
-	names.push_back("bar");
-	names.push_back("baz");
-	names.push_back("qux");
+	names.emplace_back("foo");
+	names.emplace_back("bar");
+	names.emplace_back("baz");
+	names.emplace_back("qux");
 
 	Schematic schem, schem2;
 
@@ -104,7 +104,7 @@ void TestSchematic::testMtsSerializeDeserialize(INodeDefManager *ndef)
 }
 
 
-void TestSchematic::testLuaTableSerialize(INodeDefManager *ndef)
+void TestSchematic::testLuaTableSerialize(const NodeDefManager *ndef)
 {
 	static const v3s16 size(3, 3, 3);
 	static const u32 volume = size.X * size.Y * size.Z;
@@ -121,9 +121,9 @@ void TestSchematic::testLuaTableSerialize(INodeDefManager *ndef)
 		schem.slice_probs[y] = MTSCHEM_PROB_ALWAYS;
 
 	std::vector<std::string> names;
-	names.push_back("air");
-	names.push_back("default:lava_source");
-	names.push_back("default:glass");
+	names.emplace_back("air");
+	names.emplace_back("default:lava_source");
+	names.emplace_back("default:glass");
 
 	std::ostringstream ss(std::ios_base::binary);
 
@@ -132,7 +132,7 @@ void TestSchematic::testLuaTableSerialize(INodeDefManager *ndef)
 }
 
 
-void TestSchematic::testFileSerializeDeserialize(INodeDefManager *ndef)
+void TestSchematic::testFileSerializeDeserialize(const NodeDefManager *ndef)
 {
 	static const v3s16 size(3, 3, 3);
 	static const u32 volume = size.X * size.Y * size.Z;