1 files changed, 25 insertions, 22 deletions

diff --git a/src/unittest/test_noderesolver.cpp b/src/unittest/test_noderesolver.cpp
index b8ef758f0..28da43620 100644
--- a/src/unittest/test_noderesolver.cpp
+++ b/src/unittest/test_noderesolver.cpp
@@ -26,8 +26,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <algorithm>
 
-class TestNodeResolver : public TestBase
-{
+
+class TestNodeResolver : public TestBase {
 public:
 	TestNodeResolver() { TestManager::registerTestModule(this); }
 	const char *getName() { return "TestNodeResolver"; }
@@ -44,7 +44,8 @@ static TestNodeResolver g_test_instance;
 
 void TestNodeResolver::runTests(IGameDef *gamedef)
 {
-	NodeDefManager *ndef = (NodeDefManager *)gamedef->getNodeDefManager();
+	NodeDefManager *ndef =
+		(NodeDefManager *)gamedef->getNodeDefManager();
 
 	ndef->resetNodeResolveState();
 	TEST(testNodeResolving, ndef);
@@ -53,8 +54,7 @@ void TestNodeResolver::runTests(IGameDef *gamedef)
 	TEST(testPendingResolveCancellation, ndef);
 }
 
-class Foobar : public NodeResolver
-{
+class Foobar : public NodeResolver {
 public:
 	void resolveNodeNames();
 
@@ -69,8 +69,7 @@ public:
 	std::vector<content_t> test_nr_list_empty;
 };
 
-class Foobaz : public NodeResolver
-{
+class Foobaz : public NodeResolver {
 public:
 	void resolveNodeNames();
 
@@ -85,23 +84,26 @@ void Foobar::resolveNodeNames()
 	UASSERT(getIdFromNrBacklog(&test_nr_node1, "", CONTENT_IGNORE) == true);
 	UASSERT(getIdsFromNrBacklog(&test_nr_list) == true);
 	UASSERT(getIdsFromNrBacklog(&test_nr_list_group) == true);
-	UASSERT(getIdsFromNrBacklog(&test_nr_list_required, true, CONTENT_AIR) == false);
+	UASSERT(getIdsFromNrBacklog(&test_nr_list_required,
+		true, CONTENT_AIR) == false);
 	UASSERT(getIdsFromNrBacklog(&test_nr_list_empty) == true);
 
 	UASSERT(getIdFromNrBacklog(&test_nr_node2, "", CONTENT_IGNORE) == true);
-	UASSERT(getIdFromNrBacklog(&test_nr_node3, "default:brick", CONTENT_IGNORE) ==
-			true);
-	UASSERT(getIdFromNrBacklog(&test_nr_node4, "default:gobbledygook", CONTENT_AIR) ==
-			false);
+	UASSERT(getIdFromNrBacklog(&test_nr_node3,
+		"default:brick", CONTENT_IGNORE) == true);
+	UASSERT(getIdFromNrBacklog(&test_nr_node4,
+		"default:gobbledygook", CONTENT_AIR) == false);
 	UASSERT(getIdFromNrBacklog(&test_nr_node5, "", CONTENT_IGNORE) == false);
 }
 
+
 void Foobaz::resolveNodeNames()
 {
 	UASSERT(getIdFromNrBacklog(&test_content1, "", CONTENT_IGNORE) == true);
 	UASSERT(getIdFromNrBacklog(&test_content2, "", CONTENT_IGNORE) == false);
 }
 
+
 void TestNodeResolver::testNodeResolving(NodeDefManager *ndef)
 {
 	Foobar foobar;
@@ -145,9 +147,9 @@ void TestNodeResolver::testNodeResolving(NodeDefManager *ndef)
 
 	// Check that we read all the regular list items
 	static const content_t expected_test_nr_list[] = {
-			t_CONTENT_GRASS,
-			t_CONTENT_WATER,
-			t_CONTENT_STONE,
+		t_CONTENT_GRASS,
+		t_CONTENT_WATER,
+		t_CONTENT_STONE,
 	};
 	UASSERTEQ(size_t, foobar.test_nr_list.size(), 3);
 	for (i = 0; i != foobar.test_nr_list.size(); i++)
@@ -155,30 +157,31 @@ void TestNodeResolver::testNodeResolving(NodeDefManager *ndef)
 
 	// Check that we read all the list items that were from a group entry
 	static const content_t expected_test_nr_list_group[] = {
-			t_CONTENT_WATER,
-			t_CONTENT_LAVA,
+		t_CONTENT_WATER,
+		t_CONTENT_LAVA,
 	};
 	UASSERTEQ(size_t, foobar.test_nr_list_group.size(), 2);
 	for (i = 0; i != foobar.test_nr_list_group.size(); i++) {
 		UASSERT(CONTAINS(foobar.test_nr_list_group,
-				expected_test_nr_list_group[i]));
+			expected_test_nr_list_group[i]));
 	}
 
 	// Check that we read all the items we're able to in a required list
 	static const content_t expected_test_nr_list_required[] = {
-			CONTENT_AIR,
-			t_CONTENT_STONE,
-			CONTENT_AIR,
+		CONTENT_AIR,
+		t_CONTENT_STONE,
+		CONTENT_AIR,
 	};
 	UASSERTEQ(size_t, foobar.test_nr_list_required.size(), 3);
 	for (i = 0; i != foobar.test_nr_list_required.size(); i++)
 		UASSERTEQ(content_t, foobar.test_nr_list_required[i],
-				expected_test_nr_list_required[i]);
+			expected_test_nr_list_required[i]);
 
 	// Check that the edge case of 0 is successful
 	UASSERTEQ(size_t, foobar.test_nr_list_empty.size(), 0);
 }
 
+
 void TestNodeResolver::testPendingResolveCancellation(NodeDefManager *ndef)
 {
 	Foobaz foobaz1;