Merge branch 'master' into master

1 files changed, 17 insertions, 18 deletions

diff --git a/src/unittest/test_areastore.cpp b/src/unittest/test_areastore.cpp
index 96a83cf25..691cd69d2 100644
--- a/src/unittest/test_areastore.cpp
+++ b/src/unittest/test_areastore.cpp
@@ -21,8 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "util/areastore.h"
 
-class TestAreaStore : public TestBase
-{
+class TestAreaStore : public TestBase {
 public:
 	TestAreaStore() { TestManager::registerTestModule(this); }
 	const char *getName() { return "TestAreaStore"; }
@@ -140,22 +139,21 @@ void TestAreaStore::testSerialization()
 	store.serialize(os);
 	std::string str = os.str();
 
-	std::string str_wanted(
-			"\x00"			      // Version
-			"\x00\x02"		      // Count
-			"\xFF\xFF\x00\x00\x00\x01"    // Area A min edge
-			"\x00\x00\x00\x01\x00\x02"    // Area A max edge
-			"\x00\x07"		      // Area A data length
-			"Area AA"		      // Area A data
-			"\x00\x7B\x00\x64\x00\x0A"    // Area B min edge (last two swapped
-						      // with max edge for sorting)
-			"\x7D\x00\x01\xC8\x03\x15"    // Area B max edge (^)
-			"\x00\x07"		      // Area B data length
-			"Area BB"		      // Area B data
-			"\x00\x00\x00\x00"	      // ID A = 0
-			"\x00\x00\x00\x01",	      // ID B = 1
-			1 + 2 + (6 + 6 + 2 + 7) * 2 + // min/max edge, length, data
-					2 * 4);	      // Area IDs
+	std::string str_wanted("\x00"  // Version
+			"\x00\x02"  // Count
+			"\xFF\xFF\x00\x00\x00\x01"  // Area A min edge
+			"\x00\x00\x00\x01\x00\x02"  // Area A max edge
+			"\x00\x07"  // Area A data length
+			"Area AA"   // Area A data
+			"\x00\x7B\x00\x64\x00\x0A"  // Area B min edge (last two swapped with max edge for sorting)
+			"\x7D\x00\x01\xC8\x03\x15"  // Area B max edge (^)
+			"\x00\x07"  // Area B data length
+			"Area BB"   // Area B data
+			"\x00\x00\x00\x00"  // ID A = 0
+			"\x00\x00\x00\x01", // ID B = 1
+			1 + 2 +
+			(6 + 6 + 2 + 7) * 2 + // min/max edge, length, data
+			2 * 4); // Area IDs
 
 	UASSERTEQ(const std::string &, str, str_wanted);
 
@@ -172,3 +170,4 @@ void TestAreaStore::testSerialization()
 
 	UASSERTEQ(u32, c.id, 2);
 }
+