Fix some memory leaks on packet sending.
[oweals/minetest.git] / src / test.cpp
index ecced33c341c6d7d8523f6ef540ba4a4fc4e3074..3b7c75c6e2bdac3090bdc71c6909ffccbceeebfd 100644 (file)
@@ -1,33 +1,33 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "test.h"
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "debug.h"
 #include "map.h"
 #include "player.h"
 #include "main.h"
 #include "socket.h"
-#include "connection.h"
-#include "utility.h"
+#include "network/connection.h"
 #include "serialization.h"
 #include "voxel.h"
+#include "collision.h"
 #include <sstream>
 #include "porting.h"
 #include "content_mapnode.h"
@@ -35,8 +35,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapsector.h"
 #include "settings.h"
 #include "log.h"
-#include "utility_string.h"
+#include "util/string.h"
+#include "filesys.h"
 #include "voxelalgorithms.h"
+#include "inventory.h"
+#include "util/numeric.h"
+#include "util/serialize.h"
+#include "noise.h" // PseudoRandom used for random data for compression
+#include "network/networkprotocol.h" // LATEST_PROTOCOL_VERSION
+#include <algorithm>
 
 /*
        Asserts that the exception occurs
@@ -46,26 +53,35 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        bool exception_thrown = false;\
        try{ code; }\
        catch(EType &e) { exception_thrown = true; }\
-       assert(exception_thrown);\
+       UASSERT(exception_thrown);\
 }
 
+#define UTEST(x, fmt, ...)\
+{\
+       if(!(x)){\
+               dstream << "Test (" #x ") failed: " fmt << std::endl; \
+               test_failed = true;\
+       }\
+}
+
+#define UASSERT(x) UTEST(x, "UASSERT")
+
 /*
        A few item and node definitions for those tests that need them
 */
 
-#define CONTENT_STONE 0
-#define CONTENT_GRASS 0x800
+static content_t CONTENT_STONE;
+static content_t CONTENT_GRASS;
+static content_t CONTENT_TORCH;
 
 void define_some_nodes(IWritableItemDefManager *idef, IWritableNodeDefManager *ndef)
 {
-       content_t i;
        ItemDefinition itemdef;
        ContentFeatures f;
 
        /*
                Stone
        */
-       i = CONTENT_STONE;
        itemdef = ItemDefinition();
        itemdef.type = ITEM_NODE;
        itemdef.name = "default:stone";
@@ -78,15 +94,14 @@ void define_some_nodes(IWritableItemDefManager *idef, IWritableNodeDefManager *n
        f = ContentFeatures();
        f.name = itemdef.name;
        for(int i = 0; i < 6; i++)
-               f.tname_tiles[i] = "default_stone.png";
+               f.tiledef[i].name = "default_stone.png";
        f.is_ground_content = true;
        idef->registerItem(itemdef);
-       ndef->set(i, f);
+       CONTENT_STONE = ndef->set(f.name, f);
 
        /*
                Grass
        */
-       i = CONTENT_GRASS;
        itemdef = ItemDefinition();
        itemdef.type = ITEM_NODE;
        itemdef.name = "default:dirt_with_grass";
@@ -98,71 +113,474 @@ void define_some_nodes(IWritableItemDefManager *idef, IWritableNodeDefManager *n
                "{default_dirt.png&default_grass_side.png";
        f = ContentFeatures();
        f.name = itemdef.name;
-       f.tname_tiles[0] = "default_grass.png";
-       f.tname_tiles[1] = "default_dirt.png";
+       f.tiledef[0].name = "default_grass.png";
+       f.tiledef[1].name = "default_dirt.png";
        for(int i = 2; i < 6; i++)
-               f.tname_tiles[i] = "default_dirt.png^default_grass_side.png";
+               f.tiledef[i].name = "default_dirt.png^default_grass_side.png";
        f.is_ground_content = true;
        idef->registerItem(itemdef);
-       ndef->set(i, f);
+       CONTENT_GRASS = ndef->set(f.name, f);
+
+       /*
+               Torch (minimal definition for lighting tests)
+       */
+       itemdef = ItemDefinition();
+       itemdef.type = ITEM_NODE;
+       itemdef.name = "default:torch";
+       f = ContentFeatures();
+       f.name = itemdef.name;
+       f.param_type = CPT_LIGHT;
+       f.light_propagates = true;
+       f.sunlight_propagates = true;
+       f.light_source = LIGHT_MAX-1;
+       idef->registerItem(itemdef);
+       CONTENT_TORCH = ndef->set(f.name, f);
 }
 
-struct TestUtilities
+struct TestBase
+{
+       bool test_failed;
+       TestBase():
+               test_failed(false)
+       {}
+};
+
+struct TestUtilities: public TestBase
 {
        void Run()
        {
                /*infostream<<"wrapDegrees(100.0) = "<<wrapDegrees(100.0)<<std::endl;
                infostream<<"wrapDegrees(720.5) = "<<wrapDegrees(720.5)<<std::endl;
                infostream<<"wrapDegrees(-0.5) = "<<wrapDegrees(-0.5)<<std::endl;*/
-               assert(fabs(wrapDegrees(100.0) - 100.0) < 0.001);
-               assert(fabs(wrapDegrees(720.5) - 0.5) < 0.001);
-               assert(fabs(wrapDegrees(-0.5) - (-0.5)) < 0.001);
-               assert(fabs(wrapDegrees(-365.5) - (-5.5)) < 0.001);
-               assert(lowercase("Foo bAR") == "foo bar");
-               assert(is_yes("YeS") == true);
-               assert(is_yes("") == false);
-               assert(is_yes("FAlse") == false);
-               const char *ends[] = {"abc", "c", "bc", NULL};
-               assert(removeStringEnd("abc", ends) == "");
-               assert(removeStringEnd("bc", ends) == "b");
-               assert(removeStringEnd("12c", ends) == "12");
-               assert(removeStringEnd("foo", ends) == "");
+               UASSERT(fabs(wrapDegrees(100.0) - 100.0) < 0.001);
+               UASSERT(fabs(wrapDegrees(720.5) - 0.5) < 0.001);
+               UASSERT(fabs(wrapDegrees(-0.5) - (-0.5)) < 0.001);
+               UASSERT(fabs(wrapDegrees(-365.5) - (-5.5)) < 0.001);
+               UASSERT(lowercase("Foo bAR") == "foo bar");
+               UASSERT(trim("\n \t\r  Foo bAR  \r\n\t\t  ") == "Foo bAR");
+               UASSERT(trim("\n \t\r    \r\n\t\t  ") == "");
+               UASSERT(is_yes("YeS") == true);
+               UASSERT(is_yes("") == false);
+               UASSERT(is_yes("FAlse") == false);
+               UASSERT(is_yes("-1") == true);
+               UASSERT(is_yes("0") == false);
+               UASSERT(is_yes("1") == true);
+               UASSERT(is_yes("2") == true);
+               const char *ends[] = {"abc", "c", "bc", "", NULL};
+               UASSERT(removeStringEnd("abc", ends) == "");
+               UASSERT(removeStringEnd("bc", ends) == "b");
+               UASSERT(removeStringEnd("12c", ends) == "12");
+               UASSERT(removeStringEnd("foo", ends) == "");
+               UASSERT(urlencode("\"Aardvarks lurk, OK?\"")
+                               == "%22Aardvarks%20lurk%2C%20OK%3F%22");
+               UASSERT(urldecode("%22Aardvarks%20lurk%2C%20OK%3F%22")
+                               == "\"Aardvarks lurk, OK?\"");
+               UASSERT(padStringRight("hello", 8) == "hello   ");
+               UASSERT(str_equal(narrow_to_wide("abc"), narrow_to_wide("abc")));
+               UASSERT(str_equal(narrow_to_wide("ABC"), narrow_to_wide("abc"), true));
+               UASSERT(trim("  a") == "a");
+               UASSERT(trim("   a  ") == "a");
+               UASSERT(trim("a   ") == "a");
+               UASSERT(trim("") == "");
+               UASSERT(mystoi("123", 0, 1000) == 123);
+               UASSERT(mystoi("123", 0, 10) == 10);
+               std::string test_str;
+               test_str = "Hello there";
+               str_replace(test_str, "there", "world");
+               UASSERT(test_str == "Hello world");
+               test_str = "ThisAisAaAtest";
+               str_replace(test_str, 'A', ' ');
+               UASSERT(test_str == "This is a test");
+               UASSERT(string_allowed("hello", "abcdefghijklmno") == true);
+               UASSERT(string_allowed("123", "abcdefghijklmno") == false);
+               UASSERT(string_allowed_blacklist("hello", "123") == true);
+               UASSERT(string_allowed_blacklist("hello123", "123") == false);
+               UASSERT(wrap_rows("12345678",4) == "1234\n5678");
+               UASSERT(is_number("123") == true);
+               UASSERT(is_number("") == false);
+               UASSERT(is_number("123a") == false);
+               UASSERT(is_power_of_two(0) == false);
+               UASSERT(is_power_of_two(1) == true);
+               UASSERT(is_power_of_two(2) == true);
+               UASSERT(is_power_of_two(3) == false);
+               for (int exponent = 2; exponent <= 31; ++exponent) {
+                       UASSERT(is_power_of_two((1 << exponent) - 1) == false);
+                       UASSERT(is_power_of_two((1 << exponent)) == true);
+                       UASSERT(is_power_of_two((1 << exponent) + 1) == false);
+               }
+               UASSERT(is_power_of_two((u32)-1) == false);
        }
 };
 
-struct TestSettings
+struct TestPath: public TestBase
 {
+       // adjusts a POSIX path to system-specific conventions
+       // -> changes '/' to DIR_DELIM
+       // -> absolute paths start with "C:\\" on windows
+       std::string p(std::string path)
+       {
+               for(size_t i = 0; i < path.size(); ++i){
+                       if(path[i] == '/'){
+                               path.replace(i, 1, DIR_DELIM);
+                               i += std::string(DIR_DELIM).size() - 1; // generally a no-op
+                       }
+               }
+
+               #ifdef _WIN32
+               if(path[0] == '\\')
+                       path = "C:" + path;
+               #endif
+
+               return path;
+       }
+
        void Run()
        {
+               std::string path, result, removed;
+
+               /*
+                       Test fs::IsDirDelimiter
+               */
+               UASSERT(fs::IsDirDelimiter('/') == true);
+               UASSERT(fs::IsDirDelimiter('A') == false);
+               UASSERT(fs::IsDirDelimiter(0) == false);
+               #ifdef _WIN32
+               UASSERT(fs::IsDirDelimiter('\\') == true);
+               #else
+               UASSERT(fs::IsDirDelimiter('\\') == false);
+               #endif
+
+               /*
+                       Test fs::PathStartsWith
+               */
+               {
+                       const int numpaths = 12;
+                       std::string paths[numpaths] = {
+                               "",
+                               p("/"),
+                               p("/home/user/minetest"),
+                               p("/home/user/minetest/bin"),
+                               p("/home/user/.minetest"),
+                               p("/tmp/dir/file"),
+                               p("/tmp/file/"),
+                               p("/tmP/file"),
+                               p("/tmp"),
+                               p("/tmp/dir"),
+                               p("/home/user2/minetest/worlds"),
+                               p("/home/user2/minetest/world"),
+                       };
+                       /*
+                               expected fs::PathStartsWith results
+                               0 = returns false
+                               1 = returns true
+                               2 = returns false on windows, true elsewhere
+                               3 = returns true on windows, false elsewhere
+                               4 = returns true if and only if
+                                   FILESYS_CASE_INSENSITIVE is true
+                       */
+                       int expected_results[numpaths][numpaths] = {
+                               {1,2,0,0,0,0,0,0,0,0,0,0},
+                               {1,1,0,0,0,0,0,0,0,0,0,0},
+                               {1,1,1,0,0,0,0,0,0,0,0,0},
+                               {1,1,1,1,0,0,0,0,0,0,0,0},
+                               {1,1,0,0,1,0,0,0,0,0,0,0},
+                               {1,1,0,0,0,1,0,0,1,1,0,0},
+                               {1,1,0,0,0,0,1,4,1,0,0,0},
+                               {1,1,0,0,0,0,4,1,4,0,0,0},
+                               {1,1,0,0,0,0,0,0,1,0,0,0},
+                               {1,1,0,0,0,0,0,0,1,1,0,0},
+                               {1,1,0,0,0,0,0,0,0,0,1,0},
+                               {1,1,0,0,0,0,0,0,0,0,0,1},
+                       };
+
+                       for (int i = 0; i < numpaths; i++)
+                       for (int j = 0; j < numpaths; j++){
+                               /*verbosestream<<"testing fs::PathStartsWith(\""
+                                       <<paths[i]<<"\", \""
+                                       <<paths[j]<<"\")"<<std::endl;*/
+                               bool starts = fs::PathStartsWith(paths[i], paths[j]);
+                               int expected = expected_results[i][j];
+                               if(expected == 0){
+                                       UASSERT(starts == false);
+                               }
+                               else if(expected == 1){
+                                       UASSERT(starts == true);
+                               }
+                               #ifdef _WIN32
+                               else if(expected == 2){
+                                       UASSERT(starts == false);
+                               }
+                               else if(expected == 3){
+                                       UASSERT(starts == true);
+                               }
+                               #else
+                               else if(expected == 2){
+                                       UASSERT(starts == true);
+                               }
+                               else if(expected == 3){
+                                       UASSERT(starts == false);
+                               }
+                               #endif
+                               else if(expected == 4){
+                                       UASSERT(starts == (bool)FILESYS_CASE_INSENSITIVE);
+                               }
+                       }
+               }
+
+               /*
+                       Test fs::RemoveLastPathComponent
+               */
+               UASSERT(fs::RemoveLastPathComponent("") == "");
+               path = p("/home/user/minetest/bin/..//worlds/world1");
+               result = fs::RemoveLastPathComponent(path, &removed, 0);
+               UASSERT(result == path);
+               UASSERT(removed == "");
+               result = fs::RemoveLastPathComponent(path, &removed, 1);
+               UASSERT(result == p("/home/user/minetest/bin/..//worlds"));
+               UASSERT(removed == p("world1"));
+               result = fs::RemoveLastPathComponent(path, &removed, 2);
+               UASSERT(result == p("/home/user/minetest/bin/.."));
+               UASSERT(removed == p("worlds/world1"));
+               result = fs::RemoveLastPathComponent(path, &removed, 3);
+               UASSERT(result == p("/home/user/minetest/bin"));
+               UASSERT(removed == p("../worlds/world1"));
+               result = fs::RemoveLastPathComponent(path, &removed, 4);
+               UASSERT(result == p("/home/user/minetest"));
+               UASSERT(removed == p("bin/../worlds/world1"));
+               result = fs::RemoveLastPathComponent(path, &removed, 5);
+               UASSERT(result == p("/home/user"));
+               UASSERT(removed == p("minetest/bin/../worlds/world1"));
+               result = fs::RemoveLastPathComponent(path, &removed, 6);
+               UASSERT(result == p("/home"));
+               UASSERT(removed == p("user/minetest/bin/../worlds/world1"));
+               result = fs::RemoveLastPathComponent(path, &removed, 7);
+               #ifdef _WIN32
+               UASSERT(result == "C:");
+               #else
+               UASSERT(result == "");
+               #endif
+               UASSERT(removed == p("home/user/minetest/bin/../worlds/world1"));
+
+               /*
+                       Now repeat the test with a trailing delimiter
+               */
+               path = p("/home/user/minetest/bin/..//worlds/world1/");
+               result = fs::RemoveLastPathComponent(path, &removed, 0);
+               UASSERT(result == path);
+               UASSERT(removed == "");
+               result = fs::RemoveLastPathComponent(path, &removed, 1);
+               UASSERT(result == p("/home/user/minetest/bin/..//worlds"));
+               UASSERT(removed == p("world1"));
+               result = fs::RemoveLastPathComponent(path, &removed, 2);
+               UASSERT(result == p("/home/user/minetest/bin/.."));
+               UASSERT(removed == p("worlds/world1"));
+               result = fs::RemoveLastPathComponent(path, &removed, 3);
+               UASSERT(result == p("/home/user/minetest/bin"));
+               UASSERT(removed == p("../worlds/world1"));
+               result = fs::RemoveLastPathComponent(path, &removed, 4);
+               UASSERT(result == p("/home/user/minetest"));
+               UASSERT(removed == p("bin/../worlds/world1"));
+               result = fs::RemoveLastPathComponent(path, &removed, 5);
+               UASSERT(result == p("/home/user"));
+               UASSERT(removed == p("minetest/bin/../worlds/world1"));
+               result = fs::RemoveLastPathComponent(path, &removed, 6);
+               UASSERT(result == p("/home"));
+               UASSERT(removed == p("user/minetest/bin/../worlds/world1"));
+               result = fs::RemoveLastPathComponent(path, &removed, 7);
+               #ifdef _WIN32
+               UASSERT(result == "C:");
+               #else
+               UASSERT(result == "");
+               #endif
+               UASSERT(removed == p("home/user/minetest/bin/../worlds/world1"));
+
+               /*
+                       Test fs::RemoveRelativePathComponent
+               */
+               path = p("/home/user/minetest/bin");
+               result = fs::RemoveRelativePathComponents(path);
+               UASSERT(result == path);
+               path = p("/home/user/minetest/bin/../worlds/world1");
+               result = fs::RemoveRelativePathComponents(path);
+               UASSERT(result == p("/home/user/minetest/worlds/world1"));
+               path = p("/home/user/minetest/bin/../worlds/world1/");
+               result = fs::RemoveRelativePathComponents(path);
+               UASSERT(result == p("/home/user/minetest/worlds/world1"));
+               path = p(".");
+               result = fs::RemoveRelativePathComponents(path);
+               UASSERT(result == "");
+               path = p("./subdir/../..");
+               result = fs::RemoveRelativePathComponents(path);
+               UASSERT(result == "");
+               path = p("/a/b/c/.././../d/../e/f/g/../h/i/j/../../../..");
+               result = fs::RemoveRelativePathComponents(path);
+               UASSERT(result == p("/a/e"));
+       }
+};
+
+#define TEST_CONFIG_TEXT_BEFORE               \
+       "leet = 1337\n"                           \
+       "leetleet = 13371337\n"                   \
+       "leetleet_neg = -13371337\n"              \
+       "floaty_thing = 1.1\n"                    \
+       "stringy_thing = asd /( Â¤%&(/\" BLÖÄRP\n" \
+       "coord = (1, 2, 4.5)\n"                   \
+       "      # this is just a comment\n"        \
+       "this is an invalid line\n"               \
+       "asdf = {\n"                              \
+       "       a   = 5\n"                            \
+       "       bb  = 2.5\n"                          \
+       "       ccc = \"\"\"\n"                       \
+       "testy\n"                                 \
+       "   testa   \n"                           \
+       "\"\"\"\n"                                \
+       "\n"                                      \
+       "}\n"                                     \
+       "blarg = \"\"\" \n"                       \
+       "some multiline text\n"                   \
+       "     with leading whitespace!\n"         \
+       "\"\"\"\n"                                \
+       "np_terrain = 5, 40, (250, 250, 250), 12341, 5, 0.7, 2.4\n" \
+       "zoop = true"
+
+#define TEST_CONFIG_TEXT_AFTER                \
+       "leet = 1337\n"                           \
+       "leetleet = 13371337\n"                   \
+       "leetleet_neg = -13371337\n"              \
+       "floaty_thing = 1.1\n"                    \
+       "stringy_thing = asd /( Â¤%&(/\" BLÖÄRP\n" \
+       "coord = (1, 2, 4.5)\n"                   \
+       "      # this is just a comment\n"        \
+       "this is an invalid line\n"               \
+       "asdf = {\n"                              \
+       "       a   = 5\n"                            \
+       "       bb  = 2.5\n"                          \
+       "       ccc = \"\"\"\n"                       \
+       "testy\n"                                 \
+       "   testa   \n"                           \
+       "\"\"\"\n"                                \
+       "\n"                                      \
+       "}\n"                                     \
+       "blarg = \"\"\" \n"                       \
+       "some multiline text\n"                   \
+       "     with leading whitespace!\n"         \
+       "\"\"\"\n"                                \
+       "np_terrain = {\n"                        \
+       "       flags = defaults\n"                   \
+       "       lacunarity = 2.4\n"                   \
+       "       octaves = 6\n"                        \
+       "       offset = 3.5\n"                       \
+       "       persistence = 0.7\n"                  \
+       "       scale = 40\n"                         \
+       "       seed = 12341\n"                       \
+       "       spread = (250,250,250)\n"             \
+       "}\n"                                     \
+       "zoop = true\n"                           \
+       "coord2 = (1,2,3.3)\n"                    \
+       "floaty_thing_2 = 1.2\n"                  \
+       "groupy_thing = {\n"                      \
+       "       animals = cute\n"                     \
+       "       num_apples = 4\n"                     \
+       "       num_oranges = 53\n"                   \
+       "}\n"
+
+struct TestSettings: public TestBase
+{
+       void Run()
+       {
+               try {
                Settings s;
+
                // Test reading of settings
-               s.parseConfigLine("leet = 1337");
-               s.parseConfigLine("leetleet = 13371337");
-               s.parseConfigLine("leetleet_neg = -13371337");
-               s.parseConfigLine("floaty_thing = 1.1");
-               s.parseConfigLine("stringy_thing = asd /( Â¤%&(/\" BLÖÄRP");
-               s.parseConfigLine("coord = (1, 2, 4.5)");
-               assert(s.getS32("leet") == 1337);
-               assert(s.getS16("leetleet") == 32767);
-               assert(s.getS16("leetleet_neg") == -32768);
+               std::istringstream is(TEST_CONFIG_TEXT_BEFORE);
+               s.parseConfigLines(is);
+
+               UASSERT(s.getS32("leet") == 1337);
+               UASSERT(s.getS16("leetleet") == 32767);
+               UASSERT(s.getS16("leetleet_neg") == -32768);
+
                // Not sure if 1.1 is an exact value as a float, but doesn't matter
-               assert(fabs(s.getFloat("floaty_thing") - 1.1) < 0.001);
-               assert(s.get("stringy_thing") == "asd /( Â¤%&(/\" BLÖÄRP");
-               assert(fabs(s.getV3F("coord").X - 1.0) < 0.001);
-               assert(fabs(s.getV3F("coord").Y - 2.0) < 0.001);
-               assert(fabs(s.getV3F("coord").Z - 4.5) < 0.001);
+               UASSERT(fabs(s.getFloat("floaty_thing") - 1.1) < 0.001);
+               UASSERT(s.get("stringy_thing") == "asd /( Â¤%&(/\" BLÖÄRP");
+               UASSERT(fabs(s.getV3F("coord").X - 1.0) < 0.001);
+               UASSERT(fabs(s.getV3F("coord").Y - 2.0) < 0.001);
+               UASSERT(fabs(s.getV3F("coord").Z - 4.5) < 0.001);
+
                // Test the setting of settings too
                s.setFloat("floaty_thing_2", 1.2);
                s.setV3F("coord2", v3f(1, 2, 3.3));
-               assert(s.get("floaty_thing_2").substr(0,3) == "1.2");
-               assert(fabs(s.getFloat("floaty_thing_2") - 1.2) < 0.001);
-               assert(fabs(s.getV3F("coord2").X - 1.0) < 0.001);
-               assert(fabs(s.getV3F("coord2").Y - 2.0) < 0.001);
-               assert(fabs(s.getV3F("coord2").Z - 3.3) < 0.001);
+               UASSERT(s.get("floaty_thing_2").substr(0,3) == "1.2");
+               UASSERT(fabs(s.getFloat("floaty_thing_2") - 1.2) < 0.001);
+               UASSERT(fabs(s.getV3F("coord2").X - 1.0) < 0.001);
+               UASSERT(fabs(s.getV3F("coord2").Y - 2.0) < 0.001);
+               UASSERT(fabs(s.getV3F("coord2").Z - 3.3) < 0.001);
+
+               // Test settings groups
+               Settings *group = s.getGroup("asdf");
+               UASSERT(group != NULL);
+               UASSERT(s.getGroupNoEx("zoop", group) == false);
+               UASSERT(group->getS16("a") == 5);
+               UASSERT(fabs(group->getFloat("bb") - 2.5) < 0.001);
+
+               Settings *group3 = new Settings;
+               group3->set("cat", "meow");
+               group3->set("dog", "woof");
+
+               Settings *group2 = new Settings;
+               group2->setS16("num_apples", 4);
+               group2->setS16("num_oranges", 53);
+               group2->setGroup("animals", group3);
+               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   ");
+
+               UASSERT(s.get("blarg") ==
+                       "some multiline text\n"
+                       "     with leading whitespace!");
+
+               // Test NoiseParams
+               UASSERT(s.getEntry("np_terrain").is_group == false);
+
+               NoiseParams np;
+               UASSERT(s.getNoiseParams("np_terrain", np) == true);
+               UASSERT(fabs(np.offset - 5) < 0.001);
+               UASSERT(fabs(np.scale - 40) < 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 == 12341);
+               UASSERT(np.octaves == 5);
+               UASSERT(fabs(np.persist - 0.7) < 0.001);
+
+               np.offset  = 3.5;
+               np.octaves = 6;
+               s.setNoiseParams("np_terrain", np);
+
+               UASSERT(s.getEntry("np_terrain").is_group == true);
+
+               // Test writing
+               std::ostringstream os(std::ios_base::binary);
+               is.clear();
+               is.seekg(0);
+
+               UASSERT(s.updateConfigObject(is, os, "", 0) == true);
+               //printf(">>>> expected config:\n%s\n", TEST_CONFIG_TEXT_AFTER);
+               //printf(">>>> actual config:\n%s\n", os.str().c_str());
+               UASSERT(os.str() == TEST_CONFIG_TEXT_AFTER);
+               } catch (SettingNotFoundException &e) {
+                       UASSERT(!"Setting not found!");
+               }
        }
 };
 
-struct TestSerialization
+struct TestSerialization: public TestBase
 {
        // To be used like this:
        //   mkstr("Some\0string\0with\0embedded\0nuls")
@@ -176,19 +594,19 @@ struct TestSerialization
        {
                // Tests some serialization primitives
 
-               assert(serializeString("") == mkstr("\0\0"));
-               assert(serializeWideString(L"") == mkstr("\0\0"));
-               assert(serializeLongString("") == mkstr("\0\0\0\0"));
-               assert(serializeJsonString("") == "\"\"");
-               
+               UASSERT(serializeString("") == mkstr("\0\0"));
+               UASSERT(serializeWideString(L"") == mkstr("\0\0"));
+               UASSERT(serializeLongString("") == mkstr("\0\0\0\0"));
+               UASSERT(serializeJsonString("") == "\"\"");
+
                std::string teststring = "Hello world!";
-               assert(serializeString(teststring) ==
+               UASSERT(serializeString(teststring) ==
                        mkstr("\0\14Hello world!"));
-               assert(serializeWideString(narrow_to_wide(teststring)) ==
+               UASSERT(serializeWideString(narrow_to_wide(teststring)) ==
                        mkstr("\0\14\0H\0e\0l\0l\0o\0 \0w\0o\0r\0l\0d\0!"));
-               assert(serializeLongString(teststring) ==
+               UASSERT(serializeLongString(teststring) ==
                        mkstr("\0\0\0\14Hello world!"));
-               assert(serializeJsonString(teststring) ==
+               UASSERT(serializeJsonString(teststring) ==
                        "\"Hello world!\"");
 
                std::string teststring2;
@@ -208,15 +626,15 @@ struct TestSerialization
                        teststring2_w = tmp_os_w.str();
                        teststring2_w_encoded = tmp_os_w_encoded.str();
                }
-               assert(serializeString(teststring2) ==
+               UASSERT(serializeString(teststring2) ==
                        mkstr("\1\0") + teststring2);
-               assert(serializeWideString(teststring2_w) ==
+               UASSERT(serializeWideString(teststring2_w) ==
                        mkstr("\1\0") + teststring2_w_encoded);
-               assert(serializeLongString(teststring2) ==
+               UASSERT(serializeLongString(teststring2) ==
                        mkstr("\0\0\1\0") + teststring2);
                // MSVC fails when directly using "\\\\"
                std::string backslash = "\\";
-               assert(serializeJsonString(teststring2) ==
+               UASSERT(serializeJsonString(teststring2) ==
                        mkstr("\"") +
                        "\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007" +
                        "\\b\\t\\n\\u000b\\f\\r\\u000e\\u000f" +
@@ -245,37 +663,57 @@ struct TestSerialization
 
                {
                        std::istringstream is(serializeString(teststring2), std::ios::binary);
-                       assert(deSerializeString(is) == teststring2);
-                       assert(!is.eof());
+                       UASSERT(deSerializeString(is) == teststring2);
+                       UASSERT(!is.eof());
                        is.get();
-                       assert(is.eof());
+                       UASSERT(is.eof());
                }
                {
                        std::istringstream is(serializeWideString(teststring2_w), std::ios::binary);
-                       assert(deSerializeWideString(is) == teststring2_w);
-                       assert(!is.eof());
+                       UASSERT(deSerializeWideString(is) == teststring2_w);
+                       UASSERT(!is.eof());
                        is.get();
-                       assert(is.eof());
+                       UASSERT(is.eof());
                }
                {
                        std::istringstream is(serializeLongString(teststring2), std::ios::binary);
-                       assert(deSerializeLongString(is) == teststring2);
-                       assert(!is.eof());
+                       UASSERT(deSerializeLongString(is) == teststring2);
+                       UASSERT(!is.eof());
                        is.get();
-                       assert(is.eof());
+                       UASSERT(is.eof());
                }
                {
                        std::istringstream is(serializeJsonString(teststring2), std::ios::binary);
                        //dstream<<serializeJsonString(deSerializeJsonString(is));
-                       assert(deSerializeJsonString(is) == teststring2);
-                       assert(!is.eof());
+                       UASSERT(deSerializeJsonString(is) == teststring2);
+                       UASSERT(!is.eof());
                        is.get();
-                       assert(is.eof());
+                       UASSERT(is.eof());
                }
        }
 };
 
-struct TestCompress
+struct TestNodedefSerialization: public TestBase
+{
+       void Run()
+       {
+               ContentFeatures f;
+               f.name = "default:stone";
+               for(int i = 0; i < 6; i++)
+                       f.tiledef[i].name = "default_stone.png";
+               f.is_ground_content = true;
+               std::ostringstream os(std::ios::binary);
+               f.serialize(os, LATEST_PROTOCOL_VERSION);
+               verbosestream<<"Test ContentFeatures size: "<<os.str().size()<<std::endl;
+               std::istringstream is(os.str(), std::ios::binary);
+               ContentFeatures f2;
+               f2.deSerialize(is);
+               UASSERT(f.walkable == f2.walkable);
+               UASSERT(f.node_box.type == f2.node_box.type);
+       }
+};
+
+struct TestCompress: public TestBase
 {
        void Run()
        {
@@ -286,12 +724,12 @@ struct TestCompress
                fromdata[1]=5;
                fromdata[2]=5;
                fromdata[3]=1;
-               
+
                std::ostringstream os(std::ios_base::binary);
                compress(fromdata, os, 0);
 
                std::string str_out = os.str();
-               
+
                infostream<<"str_out.size()="<<str_out.size()<<std::endl;
                infostream<<"TestCompress: 1,5,5,1 -> ";
                for(u32 i=0; i<str_out.size(); i++)
@@ -300,18 +738,18 @@ struct TestCompress
                }
                infostream<<std::endl;
 
-               assert(str_out.size() == 10);
+               UASSERT(str_out.size() == 10);
 
-               assert(str_out[0] == 0);
-               assert(str_out[1] == 0);
-               assert(str_out[2] == 0);
-               assert(str_out[3] == 4);
-               assert(str_out[4] == 0);
-               assert(str_out[5] == 1);
-               assert(str_out[6] == 1);
-               assert(str_out[7] == 5);
-               assert(str_out[8] == 0);
-               assert(str_out[9] == 1);
+               UASSERT(str_out[0] == 0);
+               UASSERT(str_out[1] == 0);
+               UASSERT(str_out[2] == 0);
+               UASSERT(str_out[3] == 4);
+               UASSERT(str_out[4] == 0);
+               UASSERT(str_out[5] == 1);
+               UASSERT(str_out[6] == 1);
+               UASSERT(str_out[7] == 5);
+               UASSERT(str_out[8] == 0);
+               UASSERT(str_out[9] == 1);
 
                std::istringstream is(str_out, std::ios_base::binary);
                std::ostringstream os2(std::ios_base::binary);
@@ -326,11 +764,11 @@ struct TestCompress
                }
                infostream<<std::endl;
 
-               assert(str_out2.size() == fromdata.getSize());
+               UASSERT(str_out2.size() == fromdata.getSize());
 
                for(u32 i=0; i<str_out2.size(); i++)
                {
-                       assert(str_out2[i] == fromdata[i]);
+                       UASSERT(str_out2[i] == fromdata[i]);
                }
 
                }
@@ -342,12 +780,12 @@ struct TestCompress
                fromdata[1]=5;
                fromdata[2]=5;
                fromdata[3]=1;
-               
+
                std::ostringstream os(std::ios_base::binary);
-               compress(fromdata, os, SER_FMT_VER_HIGHEST);
+               compress(fromdata, os, SER_FMT_VER_HIGHEST_READ);
 
                std::string str_out = os.str();
-               
+
                infostream<<"str_out.size()="<<str_out.size()<<std::endl;
                infostream<<"TestCompress: 1,5,5,1 -> ";
                for(u32 i=0; i<str_out.size(); i++)
@@ -356,23 +794,10 @@ struct TestCompress
                }
                infostream<<std::endl;
 
-               /*assert(str_out.size() == 10);
-
-               assert(str_out[0] == 0);
-               assert(str_out[1] == 0);
-               assert(str_out[2] == 0);
-               assert(str_out[3] == 4);
-               assert(str_out[4] == 0);
-               assert(str_out[5] == 1);
-               assert(str_out[6] == 1);
-               assert(str_out[7] == 5);
-               assert(str_out[8] == 0);
-               assert(str_out[9] == 1);*/
-
                std::istringstream is(str_out, std::ios_base::binary);
                std::ostringstream os2(std::ios_base::binary);
 
-               decompress(is, os2, SER_FMT_VER_HIGHEST);
+               decompress(is, os2, SER_FMT_VER_HIGHEST_READ);
                std::string str_out2 = os2.str();
 
                infostream<<"decompress: ";
@@ -382,37 +807,69 @@ struct TestCompress
                }
                infostream<<std::endl;
 
-               assert(str_out2.size() == fromdata.getSize());
+               UASSERT(str_out2.size() == fromdata.getSize());
 
                for(u32 i=0; i<str_out2.size(); i++)
                {
-                       assert(str_out2[i] == fromdata[i]);
+                       UASSERT(str_out2[i] == fromdata[i]);
                }
 
                }
+
+               // Test zlib wrapper with large amounts of data (larger than its
+               // internal buffers)
+               {
+                       infostream<<"Test: Testing zlib wrappers with a large amount "
+                                       <<"of pseudorandom data"<<std::endl;
+                       u32 size = 50000;
+                       infostream<<"Test: Input size of large compressZlib is "
+                                       <<size<<std::endl;
+                       std::string data_in;
+                       data_in.resize(size);
+                       PseudoRandom pseudorandom(9420);
+                       for(u32 i=0; i<size; i++)
+                               data_in[i] = pseudorandom.range(0,255);
+                       std::ostringstream os_compressed(std::ios::binary);
+                       compressZlib(data_in, os_compressed);
+                       infostream<<"Test: Output size of large compressZlib is "
+                                       <<os_compressed.str().size()<<std::endl;
+                       std::istringstream is_compressed(os_compressed.str(), std::ios::binary);
+                       std::ostringstream os_decompressed(std::ios::binary);
+                       decompressZlib(is_compressed, os_decompressed);
+                       infostream<<"Test: Output size of large decompressZlib is "
+                                       <<os_decompressed.str().size()<<std::endl;
+                       std::string str_decompressed = os_decompressed.str();
+                       UTEST(str_decompressed.size() == data_in.size(), "Output size not"
+                                       " equal (output: %u, input: %u)",
+                                       (unsigned int)str_decompressed.size(), (unsigned int)data_in.size());
+                       for(u32 i=0; i<size && i<str_decompressed.size(); i++){
+                               UTEST(str_decompressed[i] == data_in[i],
+                                               "index out[%i]=%i differs from in[%i]=%i",
+                                               i, str_decompressed[i], i, data_in[i]);
+                       }
+               }
        }
 };
 
-struct TestMapNode
+struct TestMapNode: public TestBase
 {
        void Run(INodeDefManager *nodedef)
        {
-               MapNode n;
+               MapNode n(CONTENT_AIR);
+
+               UASSERT(n.getContent() == CONTENT_AIR);
+               UASSERT(n.getLight(LIGHTBANK_DAY, nodedef) == 0);
+               UASSERT(n.getLight(LIGHTBANK_NIGHT, nodedef) == 0);
 
-               // Default values
-               assert(n.getContent() == CONTENT_AIR);
-               assert(n.getLight(LIGHTBANK_DAY, nodedef) == 0);
-               assert(n.getLight(LIGHTBANK_NIGHT, nodedef) == 0);
-               
                // Transparency
                n.setContent(CONTENT_AIR);
-               assert(nodedef->get(n).light_propagates == true);
+               UASSERT(nodedef->get(n).light_propagates == true);
                n.setContent(LEGN(nodedef, "CONTENT_STONE"));
-               assert(nodedef->get(n).light_propagates == false);
+               UASSERT(nodedef->get(n).light_propagates == false);
        }
 };
 
-struct TestVoxelManipulator
+struct TestVoxelManipulator: public TestBase
 {
        void Run(INodeDefManager *nodedef)
        {
@@ -421,51 +878,51 @@ struct TestVoxelManipulator
                */
 
                VoxelArea a(v3s16(-1,-1,-1), v3s16(1,1,1));
-               assert(a.index(0,0,0) == 1*3*3 + 1*3 + 1);
-               assert(a.index(-1,-1,-1) == 0);
-               
+               UASSERT(a.index(0,0,0) == 1*3*3 + 1*3 + 1);
+               UASSERT(a.index(-1,-1,-1) == 0);
+
                VoxelArea c(v3s16(-2,-2,-2), v3s16(2,2,2));
                // An area that is 1 bigger in x+ and z-
                VoxelArea d(v3s16(-2,-2,-3), v3s16(3,2,2));
-               
-               core::list<VoxelArea> aa;
+
+               std::list<VoxelArea> aa;
                d.diff(c, aa);
-               
+
                // Correct results
-               core::array<VoxelArea> results;
+               std::vector<VoxelArea> results;
                results.push_back(VoxelArea(v3s16(-2,-2,-3),v3s16(3,2,-3)));
                results.push_back(VoxelArea(v3s16(3,-2,-2),v3s16(3,2,2)));
 
-               assert(aa.size() == results.size());
-               
+               UASSERT(aa.size() == results.size());
+
                infostream<<"Result of diff:"<<std::endl;
-               for(core::list<VoxelArea>::Iterator
-                               i = aa.begin(); i != aa.end(); i++)
+               for(std::list<VoxelArea>::const_iterator
+                               i = aa.begin(); i != aa.end(); ++i)
                {
                        i->print(infostream);
                        infostream<<std::endl;
-                       
-                       s32 j = results.linear_search(*i);
-                       assert(j != -1);
-                       results.erase(j, 1);
+
+                       std::vector<VoxelArea>::iterator j = std::find(results.begin(), results.end(), *i);
+                       UASSERT(j != results.end());
+                       results.erase(j);
                }
 
 
                /*
                        VoxelManipulator
                */
-               
+
                VoxelManipulator v;
 
                v.print(infostream, nodedef);
 
                infostream<<"*** Setting (-1,0,-1)=2 ***"<<std::endl;
-               
+
                v.setNodeNoRef(v3s16(-1,0,-1), MapNode(CONTENT_GRASS));
 
                v.print(infostream, nodedef);
 
-               assert(v.getNode(v3s16(-1,0,-1)).getContent() == CONTENT_GRASS);
+               UASSERT(v.getNode(v3s16(-1,0,-1)).getContent() == CONTENT_GRASS);
 
                infostream<<"*** Reading from inexistent (0,0,-1) ***"<<std::endl;
 
@@ -476,18 +933,21 @@ struct TestVoxelManipulator
                infostream<<"*** Adding area ***"<<std::endl;
 
                v.addArea(a);
-               
+
                v.print(infostream, nodedef);
 
-               assert(v.getNode(v3s16(-1,0,-1)).getContent() == CONTENT_GRASS);
+               UASSERT(v.getNode(v3s16(-1,0,-1)).getContent() == CONTENT_GRASS);
                EXCEPTION_CHECK(InvalidPositionException, v.getNode(v3s16(0,1,1)));
        }
 };
 
-struct TestVoxelAlgorithms
+struct TestVoxelAlgorithms: public TestBase
 {
        void Run(INodeDefManager *ndef)
        {
+               /*
+                       voxalgo::propagateSunlight
+               */
                {
                        VoxelManipulator v;
                        for(u16 z=0; z<3; z++)
@@ -499,51 +959,51 @@ struct TestVoxelAlgorithms
                        }
                        VoxelArea a(v3s16(0,0,0), v3s16(2,2,2));
                        {
-                               core::map<v3s16, bool> light_sources;
+                               std::set<v3s16> light_sources;
                                voxalgo::setLight(v, a, 0, ndef);
                                voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
                                                v, a, true, light_sources, ndef);
                                //v.print(dstream, ndef, VOXELPRINT_LIGHT_DAY);
-                               assert(res.bottom_sunlight_valid == true);
-                               assert(v.getNode(v3s16(1,1,1)).getLight(LIGHTBANK_DAY, ndef)
+                               UASSERT(res.bottom_sunlight_valid == true);
+                               UASSERT(v.getNode(v3s16(1,1,1)).getLight(LIGHTBANK_DAY, ndef)
                                                == LIGHT_SUN);
                        }
                        v.setNodeNoRef(v3s16(0,0,0), MapNode(CONTENT_STONE));
                        {
-                               core::map<v3s16, bool> light_sources;
+                               std::set<v3s16> light_sources;
                                voxalgo::setLight(v, a, 0, ndef);
                                voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
                                                v, a, true, light_sources, ndef);
-                               assert(res.bottom_sunlight_valid == true);
-                               assert(v.getNode(v3s16(1,1,1)).getLight(LIGHTBANK_DAY, ndef)
+                               UASSERT(res.bottom_sunlight_valid == true);
+                               UASSERT(v.getNode(v3s16(1,1,1)).getLight(LIGHTBANK_DAY, ndef)
                                                == LIGHT_SUN);
                        }
                        {
-                               core::map<v3s16, bool> light_sources;
+                               std::set<v3s16> light_sources;
                                voxalgo::setLight(v, a, 0, ndef);
                                voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
                                                v, a, false, light_sources, ndef);
-                               assert(res.bottom_sunlight_valid == true);
-                               assert(v.getNode(v3s16(2,0,2)).getLight(LIGHTBANK_DAY, ndef)
+                               UASSERT(res.bottom_sunlight_valid == true);
+                               UASSERT(v.getNode(v3s16(2,0,2)).getLight(LIGHTBANK_DAY, ndef)
                                                == 0);
                        }
                        v.setNodeNoRef(v3s16(1,3,2), MapNode(CONTENT_STONE));
                        {
-                               core::map<v3s16, bool> light_sources;
+                               std::set<v3s16> light_sources;
                                voxalgo::setLight(v, a, 0, ndef);
                                voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
                                                v, a, true, light_sources, ndef);
-                               assert(res.bottom_sunlight_valid == true);
-                               assert(v.getNode(v3s16(1,1,2)).getLight(LIGHTBANK_DAY, ndef)
+                               UASSERT(res.bottom_sunlight_valid == true);
+                               UASSERT(v.getNode(v3s16(1,1,2)).getLight(LIGHTBANK_DAY, ndef)
                                                == 0);
                        }
                        {
-                               core::map<v3s16, bool> light_sources;
+                               std::set<v3s16> light_sources;
                                voxalgo::setLight(v, a, 0, ndef);
                                voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
                                                v, a, false, light_sources, ndef);
-                               assert(res.bottom_sunlight_valid == true);
-                               assert(v.getNode(v3s16(1,0,2)).getLight(LIGHTBANK_DAY, ndef)
+                               UASSERT(res.bottom_sunlight_valid == true);
+                               UASSERT(v.getNode(v3s16(1,0,2)).getLight(LIGHTBANK_DAY, ndef)
                                                == 0);
                        }
                        {
@@ -552,18 +1012,18 @@ struct TestVoxelAlgorithms
                                v.setNodeNoRef(v3s16(1,-1,2), n);
                        }
                        {
-                               core::map<v3s16, bool> light_sources;
+                               std::set<v3s16> light_sources;
                                voxalgo::setLight(v, a, 0, ndef);
                                voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
                                                v, a, true, light_sources, ndef);
-                               assert(res.bottom_sunlight_valid == true);
+                               UASSERT(res.bottom_sunlight_valid == true);
                        }
                        {
-                               core::map<v3s16, bool> light_sources;
+                               std::set<v3s16> light_sources;
                                voxalgo::setLight(v, a, 0, ndef);
                                voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
                                                v, a, false, light_sources, ndef);
-                               assert(res.bottom_sunlight_valid == true);
+                               UASSERT(res.bottom_sunlight_valid == true);
                        }
                        {
                                MapNode n(CONTENT_AIR);
@@ -571,28 +1031,158 @@ struct TestVoxelAlgorithms
                                v.setNodeNoRef(v3s16(1,-1,2), n);
                        }
                        {
-                               core::map<v3s16, bool> light_sources;
+                               std::set<v3s16> light_sources;
                                voxalgo::setLight(v, a, 0, ndef);
                                voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
                                                v, a, true, light_sources, ndef);
-                               assert(res.bottom_sunlight_valid == false);
+                               UASSERT(res.bottom_sunlight_valid == false);
                        }
                        {
-                               core::map<v3s16, bool> light_sources;
+                               std::set<v3s16> light_sources;
                                voxalgo::setLight(v, a, 0, ndef);
                                voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
                                                v, a, false, light_sources, ndef);
-                               assert(res.bottom_sunlight_valid == false);
+                               UASSERT(res.bottom_sunlight_valid == false);
                        }
                        v.setNodeNoRef(v3s16(1,3,2), MapNode(CONTENT_IGNORE));
                        {
-                               core::map<v3s16, bool> light_sources;
+                               std::set<v3s16> light_sources;
                                voxalgo::setLight(v, a, 0, ndef);
                                voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
                                                v, a, true, light_sources, ndef);
-                               assert(res.bottom_sunlight_valid == true);
+                               UASSERT(res.bottom_sunlight_valid == true);
                        }
                }
+               /*
+                       voxalgo::clearLightAndCollectSources
+               */
+               {
+                       VoxelManipulator v;
+                       for(u16 z=0; z<3; z++)
+                       for(u16 y=0; y<3; y++)
+                       for(u16 x=0; x<3; x++)
+                       {
+                               v3s16 p(x,y,z);
+                               v.setNode(p, MapNode(CONTENT_AIR));
+                       }
+                       VoxelArea a(v3s16(0,0,0), v3s16(2,2,2));
+                       v.setNodeNoRef(v3s16(0,0,0), MapNode(CONTENT_STONE));
+                       v.setNodeNoRef(v3s16(1,1,1), MapNode(CONTENT_TORCH));
+                       {
+                               MapNode n(CONTENT_AIR);
+                               n.setLight(LIGHTBANK_DAY, 1, ndef);
+                               v.setNode(v3s16(1,1,2), n);
+                       }
+                       {
+                               std::set<v3s16> light_sources;
+                               std::map<v3s16, u8> unlight_from;
+                               voxalgo::clearLightAndCollectSources(v, a, LIGHTBANK_DAY,
+                                               ndef, light_sources, unlight_from);
+                               //v.print(dstream, ndef, VOXELPRINT_LIGHT_DAY);
+                               UASSERT(v.getNode(v3s16(0,1,1)).getLight(LIGHTBANK_DAY, ndef)
+                                               == 0);
+                               UASSERT(light_sources.find(v3s16(1,1,1)) != light_sources.end());
+                               UASSERT(light_sources.size() == 1);
+                               UASSERT(unlight_from.find(v3s16(1,1,2)) != unlight_from.end());
+                               UASSERT(unlight_from.size() == 1);
+                       }
+               }
+       }
+};
+
+struct TestInventory: public TestBase
+{
+       void Run(IItemDefManager *idef)
+       {
+               std::string serialized_inventory =
+               "List 0 32\n"
+               "Width 3\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Item default:cobble 61\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Item default:dirt 71\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Item default:dirt 99\n"
+               "Item default:cobble 38\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "EndInventoryList\n"
+               "EndInventory\n";
+
+               std::string serialized_inventory_2 =
+               "List main 32\n"
+               "Width 5\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Item default:cobble 61\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Item default:dirt 71\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Item default:dirt 99\n"
+               "Item default:cobble 38\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "Empty\n"
+               "EndInventoryList\n"
+               "EndInventory\n";
+
+               Inventory inv(idef);
+               std::istringstream is(serialized_inventory, std::ios::binary);
+               inv.deSerialize(is);
+               UASSERT(inv.getList("0"));
+               UASSERT(!inv.getList("main"));
+               inv.getList("0")->setName("main");
+               UASSERT(!inv.getList("0"));
+               UASSERT(inv.getList("main"));
+               UASSERT(inv.getList("main")->getWidth() == 3);
+               inv.getList("main")->setWidth(5);
+               std::ostringstream inv_os(std::ios::binary);
+               inv.serialize(inv_os);
+               UASSERT(inv_os.str() == serialized_inventory_2);
        }
 };
 
@@ -602,7 +1192,7 @@ struct TestVoxelAlgorithms
                  interface for Map (IMap would be fine).
 */
 #if 0
-struct TestMapBlock
+struct TestMapBlock: public TestBase
 {
        class TC : public NodeContainer
        {
@@ -655,37 +1245,37 @@ struct TestMapBlock
        void Run()
        {
                TC parent;
-               
+
                MapBlock b(&parent, v3s16(1,1,1));
                v3s16 relpos(MAP_BLOCKSIZE, MAP_BLOCKSIZE, MAP_BLOCKSIZE);
 
-               assert(b.getPosRelative() == relpos);
-
-               assert(b.getBox().MinEdge.X == MAP_BLOCKSIZE);
-               assert(b.getBox().MaxEdge.X == MAP_BLOCKSIZE*2-1);
-               assert(b.getBox().MinEdge.Y == MAP_BLOCKSIZE);
-               assert(b.getBox().MaxEdge.Y == MAP_BLOCKSIZE*2-1);
-               assert(b.getBox().MinEdge.Z == MAP_BLOCKSIZE);
-               assert(b.getBox().MaxEdge.Z == MAP_BLOCKSIZE*2-1);
-               
-               assert(b.isValidPosition(v3s16(0,0,0)) == true);
-               assert(b.isValidPosition(v3s16(-1,0,0)) == false);
-               assert(b.isValidPosition(v3s16(-1,-142,-2341)) == false);
-               assert(b.isValidPosition(v3s16(-124,142,2341)) == false);
-               assert(b.isValidPosition(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1)) == true);
-               assert(b.isValidPosition(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE,MAP_BLOCKSIZE-1)) == false);
+               UASSERT(b.getPosRelative() == relpos);
+
+               UASSERT(b.getBox().MinEdge.X == MAP_BLOCKSIZE);
+               UASSERT(b.getBox().MaxEdge.X == MAP_BLOCKSIZE*2-1);
+               UASSERT(b.getBox().MinEdge.Y == MAP_BLOCKSIZE);
+               UASSERT(b.getBox().MaxEdge.Y == MAP_BLOCKSIZE*2-1);
+               UASSERT(b.getBox().MinEdge.Z == MAP_BLOCKSIZE);
+               UASSERT(b.getBox().MaxEdge.Z == MAP_BLOCKSIZE*2-1);
+
+               UASSERT(b.isValidPosition(v3s16(0,0,0)) == true);
+               UASSERT(b.isValidPosition(v3s16(-1,0,0)) == false);
+               UASSERT(b.isValidPosition(v3s16(-1,-142,-2341)) == false);
+               UASSERT(b.isValidPosition(v3s16(-124,142,2341)) == false);
+               UASSERT(b.isValidPosition(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1)) == true);
+               UASSERT(b.isValidPosition(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE,MAP_BLOCKSIZE-1)) == false);
 
                /*
                        TODO: this method should probably be removed
                        if the block size isn't going to be set variable
                */
-               /*assert(b.getSizeNodes() == v3s16(MAP_BLOCKSIZE,
+               /*UASSERT(b.getSizeNodes() == v3s16(MAP_BLOCKSIZE,
                                MAP_BLOCKSIZE, MAP_BLOCKSIZE));*/
-               
+
                // Changed flag should be initially set
-               assert(b.getModified() == MOD_STATE_WRITE_NEEDED);
+               UASSERT(b.getModified() == MOD_STATE_WRITE_NEEDED);
                b.resetModified();
-               assert(b.getModified() == MOD_STATE_CLEAN);
+               UASSERT(b.getModified() == MOD_STATE_CLEAN);
 
                // All nodes should have been set to
                // .d=CONTENT_IGNORE and .getLight() = 0
@@ -693,12 +1283,12 @@ struct TestMapBlock
                for(u16 y=0; y<MAP_BLOCKSIZE; y++)
                for(u16 x=0; x<MAP_BLOCKSIZE; x++)
                {
-                       //assert(b.getNode(v3s16(x,y,z)).getContent() == CONTENT_AIR);
-                       assert(b.getNode(v3s16(x,y,z)).getContent() == CONTENT_IGNORE);
-                       assert(b.getNode(v3s16(x,y,z)).getLight(LIGHTBANK_DAY) == 0);
-                       assert(b.getNode(v3s16(x,y,z)).getLight(LIGHTBANK_NIGHT) == 0);
+                       //UASSERT(b.getNode(v3s16(x,y,z)).getContent() == CONTENT_AIR);
+                       UASSERT(b.getNode(v3s16(x,y,z)).getContent() == CONTENT_IGNORE);
+                       UASSERT(b.getNode(v3s16(x,y,z)).getLight(LIGHTBANK_DAY) == 0);
+                       UASSERT(b.getNode(v3s16(x,y,z)).getLight(LIGHTBANK_NIGHT) == 0);
                }
-               
+
                {
                        MapNode n(CONTENT_AIR);
                        for(u16 z=0; z<MAP_BLOCKSIZE; z++)
@@ -708,7 +1298,7 @@ struct TestMapBlock
                                b.setNode(v3s16(x,y,z), n);
                        }
                }
-                       
+
                /*
                        Parent fetch functions
                */
@@ -716,18 +1306,18 @@ struct TestMapBlock
                parent.node.setContent(5);
 
                MapNode n;
-               
+
                // Positions in the block should still be valid
-               assert(b.isValidPositionParent(v3s16(0,0,0)) == true);
-               assert(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1)) == true);
+               UASSERT(b.isValidPositionParent(v3s16(0,0,0)) == true);
+               UASSERT(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1)) == true);
                n = b.getNodeParent(v3s16(0,MAP_BLOCKSIZE-1,0));
-               assert(n.getContent() == CONTENT_AIR);
+               UASSERT(n.getContent() == CONTENT_AIR);
 
                // ...but outside the block they should be invalid
-               assert(b.isValidPositionParent(v3s16(-121,2341,0)) == false);
-               assert(b.isValidPositionParent(v3s16(-1,0,0)) == false);
-               assert(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE)) == false);
-               
+               UASSERT(b.isValidPositionParent(v3s16(-121,2341,0)) == false);
+               UASSERT(b.isValidPositionParent(v3s16(-1,0,0)) == false);
+               UASSERT(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE)) == false);
+
                {
                        bool exception_thrown = false;
                        try{
@@ -738,16 +1328,16 @@ struct TestMapBlock
                        {
                                exception_thrown = true;
                        }
-                       assert(exception_thrown);
+                       UASSERT(exception_thrown);
                }
 
                parent.position_valid = true;
                // Now the positions outside should be valid
-               assert(b.isValidPositionParent(v3s16(-121,2341,0)) == true);
-               assert(b.isValidPositionParent(v3s16(-1,0,0)) == true);
-               assert(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE)) == true);
+               UASSERT(b.isValidPositionParent(v3s16(-121,2341,0)) == true);
+               UASSERT(b.isValidPositionParent(v3s16(-1,0,0)) == true);
+               UASSERT(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE)) == true);
                n = b.getNodeParent(v3s16(0,0,MAP_BLOCKSIZE));
-               assert(n.getContent() == 5);
+               UASSERT(n.getContent() == 5);
 
                /*
                        Set a node
@@ -755,11 +1345,11 @@ struct TestMapBlock
                v3s16 p(1,2,0);
                n.setContent(4);
                b.setNode(p, n);
-               assert(b.getNode(p).getContent() == 4);
+               UASSERT(b.getNode(p).getContent() == 4);
                //TODO: Update to new system
-               /*assert(b.getNodeTile(p) == 4);
-               assert(b.getNodeTile(v3s16(-1,-1,0)) == 5);*/
-               
+               /*UASSERT(b.getNodeTile(p) == 4);
+               UASSERT(b.getNodeTile(v3s16(-1,-1,0)) == 5);*/
+
                /*
                        propagateSunlight()
                */
@@ -785,21 +1375,21 @@ struct TestMapBlock
                        parent.node.setLight(LIGHTBANK_NIGHT, 0);
                        core::map<v3s16, bool> light_sources;
                        // The bottom block is invalid, because we have a shadowing node
-                       assert(b.propagateSunlight(light_sources) == false);
-                       assert(b.getNode(v3s16(1,4,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
-                       assert(b.getNode(v3s16(1,3,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
-                       assert(b.getNode(v3s16(1,2,0)).getLight(LIGHTBANK_DAY) == 0);
-                       assert(b.getNode(v3s16(1,1,0)).getLight(LIGHTBANK_DAY) == 0);
-                       assert(b.getNode(v3s16(1,0,0)).getLight(LIGHTBANK_DAY) == 0);
-                       assert(b.getNode(v3s16(1,2,3)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
-                       assert(b.getFaceLight2(1000, p, v3s16(0,1,0)) == LIGHT_SUN);
-                       assert(b.getFaceLight2(1000, p, v3s16(0,-1,0)) == 0);
-                       assert(b.getFaceLight2(0, p, v3s16(0,-1,0)) == 0);
+                       UASSERT(b.propagateSunlight(light_sources) == false);
+                       UASSERT(b.getNode(v3s16(1,4,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
+                       UASSERT(b.getNode(v3s16(1,3,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
+                       UASSERT(b.getNode(v3s16(1,2,0)).getLight(LIGHTBANK_DAY) == 0);
+                       UASSERT(b.getNode(v3s16(1,1,0)).getLight(LIGHTBANK_DAY) == 0);
+                       UASSERT(b.getNode(v3s16(1,0,0)).getLight(LIGHTBANK_DAY) == 0);
+                       UASSERT(b.getNode(v3s16(1,2,3)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
+                       UASSERT(b.getFaceLight2(1000, p, v3s16(0,1,0)) == LIGHT_SUN);
+                       UASSERT(b.getFaceLight2(1000, p, v3s16(0,-1,0)) == 0);
+                       UASSERT(b.getFaceLight2(0, p, v3s16(0,-1,0)) == 0);
                        // According to MapBlock::getFaceLight,
                        // The face on the z+ side should have double-diminished light
-                       //assert(b.getFaceLight(p, v3s16(0,0,1)) == diminish_light(diminish_light(LIGHT_MAX)));
+                       //UASSERT(b.getFaceLight(p, v3s16(0,0,1)) == diminish_light(diminish_light(LIGHT_MAX)));
                        // The face on the z+ side should have diminished light
-                       assert(b.getFaceLight2(1000, p, v3s16(0,0,1)) == diminish_light(LIGHT_MAX));
+                       UASSERT(b.getFaceLight2(1000, p, v3s16(0,0,1)) == diminish_light(LIGHT_MAX));
                }
                /*
                        Check how the block handles being in between blocks with some non-sunlight
@@ -813,11 +1403,11 @@ struct TestMapBlock
                        core::map<v3s16, bool> light_sources;
                        // The block below should be valid because there shouldn't be
                        // sunlight in there either
-                       assert(b.propagateSunlight(light_sources, true) == true);
+                       UASSERT(b.propagateSunlight(light_sources, true) == true);
                        // Should not touch nodes that are not affected (that is, all of them)
-                       //assert(b.getNode(v3s16(1,2,3)).getLight() == LIGHT_SUN);
+                       //UASSERT(b.getNode(v3s16(1,2,3)).getLight() == LIGHT_SUN);
                        // Should set light of non-sunlighted blocks to 0.
-                       assert(b.getNode(v3s16(1,2,3)).getLight(LIGHTBANK_DAY) == 0);
+                       UASSERT(b.getNode(v3s16(1,2,3)).getLight(LIGHTBANK_DAY) == 0);
                }
                /*
                        Set up a situation where:
@@ -853,12 +1443,12 @@ struct TestMapBlock
                        parent.node.setLight(LIGHTBANK_DAY, LIGHT_MAX/2);
                        core::map<v3s16, bool> light_sources;
                        // Bottom block is not valid
-                       assert(b.propagateSunlight(light_sources) == false);
+                       UASSERT(b.propagateSunlight(light_sources) == false);
                }
        }
 };
 
-struct TestMapSector
+struct TestMapSector: public TestBase
 {
        class TC : public NodeContainer
        {
@@ -889,29 +1479,29 @@ struct TestMapSector
                        if(position_valid == false)
                                throw InvalidPositionException();
                };
-               
+
                virtual u16 nodeContainerId() const
                {
                        return 666;
                }
        };
-       
+
        void Run()
        {
                TC parent;
                parent.position_valid = false;
-               
+
                // Create one with no heightmaps
                ServerMapSector sector(&parent, v2s16(1,1));
-               
-               assert(sector.getBlockNoCreateNoEx(0) == 0);
-               assert(sector.getBlockNoCreateNoEx(1) == 0);
+
+               UASSERT(sector.getBlockNoCreateNoEx(0) == 0);
+               UASSERT(sector.getBlockNoCreateNoEx(1) == 0);
 
                MapBlock * bref = sector.createBlankBlock(-2);
-               
-               assert(sector.getBlockNoCreateNoEx(0) == 0);
-               assert(sector.getBlockNoCreateNoEx(-2) == bref);
-               
+
+               UASSERT(sector.getBlockNoCreateNoEx(0) == 0);
+               UASSERT(sector.getBlockNoCreateNoEx(-2) == bref);
+
                //TODO: Check for AlreadyExistsException
 
                /*bool exception_thrown = false;
@@ -921,41 +1511,266 @@ struct TestMapSector
                catch(InvalidPositionException &e){
                        exception_thrown = true;
                }
-               assert(exception_thrown);*/
+               UASSERT(exception_thrown);*/
 
        }
 };
 #endif
 
-struct TestSocket
+struct TestCollision: public TestBase
+{
+       void Run()
+       {
+               /*
+                       axisAlignedCollision
+               */
+
+               for(s16 bx = -3; bx <= 3; bx++)
+               for(s16 by = -3; by <= 3; by++)
+               for(s16 bz = -3; bz <= 3; bz++)
+               {
+                       // X-
+                       {
+                               aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
+                               aabb3f m(bx-2, by, bz, bx-1, by+1, bz+1);
+                               v3f v(1, 0, 0);
+                               f32 dtime = 0;
+                               UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+                               UASSERT(fabs(dtime - 1.000) < 0.001);
+                       }
+                       {
+                               aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
+                               aabb3f m(bx-2, by, bz, bx-1, by+1, bz+1);
+                               v3f v(-1, 0, 0);
+                               f32 dtime = 0;
+                               UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1);
+                       }
+                       {
+                               aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
+                               aabb3f m(bx-2, by+1.5, bz, bx-1, by+2.5, bz-1);
+                               v3f v(1, 0, 0);
+                               f32 dtime;
+                               UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1);
+                       }
+                       {
+                               aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
+                               aabb3f m(bx-2, by-1.5, bz, bx-1.5, by+0.5, bz+1);
+                               v3f v(0.5, 0.1, 0);
+                               f32 dtime;
+                               UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+                               UASSERT(fabs(dtime - 3.000) < 0.001);
+                       }
+                       {
+                               aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
+                               aabb3f m(bx-2, by-1.5, bz, bx-1.5, by+0.5, bz+1);
+                               v3f v(0.5, 0.1, 0);
+                               f32 dtime;
+                               UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+                               UASSERT(fabs(dtime - 3.000) < 0.001);
+                       }
+
+                       // X+
+                       {
+                               aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
+                               aabb3f m(bx+2, by, bz, bx+3, by+1, bz+1);
+                               v3f v(-1, 0, 0);
+                               f32 dtime;
+                               UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+                               UASSERT(fabs(dtime - 1.000) < 0.001);
+                       }
+                       {
+                               aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
+                               aabb3f m(bx+2, by, bz, bx+3, by+1, bz+1);
+                               v3f v(1, 0, 0);
+                               f32 dtime;
+                               UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1);
+                       }
+                       {
+                               aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
+                               aabb3f m(bx+2, by, bz+1.5, bx+3, by+1, bz+3.5);
+                               v3f v(-1, 0, 0);
+                               f32 dtime;
+                               UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1);
+                       }
+                       {
+                               aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
+                               aabb3f m(bx+2, by-1.5, bz, bx+2.5, by-0.5, bz+1);
+                               v3f v(-0.5, 0.2, 0);
+                               f32 dtime;
+                               UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1);  // Y, not X!
+                               UASSERT(fabs(dtime - 2.500) < 0.001);
+                       }
+                       {
+                               aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
+                               aabb3f m(bx+2, by-1.5, bz, bx+2.5, by-0.5, bz+1);
+                               v3f v(-0.5, 0.3, 0);
+                               f32 dtime;
+                               UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+                               UASSERT(fabs(dtime - 2.000) < 0.001);
+                       }
+
+                       // TODO: Y-, Y+, Z-, Z+
+
+                       // misc
+                       {
+                               aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
+                               aabb3f m(bx+2.3, by+2.29, bz+2.29, bx+4.2, by+4.2, bz+4.2);
+                               v3f v(-1./3, -1./3, -1./3);
+                               f32 dtime;
+                               UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+                               UASSERT(fabs(dtime - 0.9) < 0.001);
+                       }
+                       {
+                               aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
+                               aabb3f m(bx+2.29, by+2.3, bz+2.29, bx+4.2, by+4.2, bz+4.2);
+                               v3f v(-1./3, -1./3, -1./3);
+                               f32 dtime;
+                               UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1);
+                               UASSERT(fabs(dtime - 0.9) < 0.001);
+                       }
+                       {
+                               aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
+                               aabb3f m(bx+2.29, by+2.29, bz+2.3, bx+4.2, by+4.2, bz+4.2);
+                               v3f v(-1./3, -1./3, -1./3);
+                               f32 dtime;
+                               UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 2);
+                               UASSERT(fabs(dtime - 0.9) < 0.001);
+                       }
+                       {
+                               aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
+                               aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.3, by-2.29, bz-2.29);
+                               v3f v(1./7, 1./7, 1./7);
+                               f32 dtime;
+                               UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
+                               UASSERT(fabs(dtime - 16.1) < 0.001);
+                       }
+                       {
+                               aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
+                               aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.29, by-2.3, bz-2.29);
+                               v3f v(1./7, 1./7, 1./7);
+                               f32 dtime;
+                               UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1);
+                               UASSERT(fabs(dtime - 16.1) < 0.001);
+                       }
+                       {
+                               aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
+                               aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.29, by-2.29, bz-2.3);
+                               v3f v(1./7, 1./7, 1./7);
+                               f32 dtime;
+                               UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 2);
+                               UASSERT(fabs(dtime - 16.1) < 0.001);
+                       }
+               }
+       }
+};
+
+struct TestSocket: public TestBase
 {
        void Run()
        {
                const int port = 30003;
-               UDPSocket socket;
-               socket.Bind(port);
+               Address address(0, 0, 0, 0, port);
+               Address bind_addr(0, 0, 0, 0, port);
+               Address address6((IPv6AddressBytes*) NULL, port);
 
-               const char sendbuffer[] = "hello world!";
-               socket.Send(Address(127,0,0,1,port), sendbuffer, sizeof(sendbuffer));
+               /*
+                * Try to use the bind_address for servers with no localhost address
+                * For example: FreeBSD jails
+                */
+               std::string bind_str = g_settings->get("bind_address");
+               try {
+                       bind_addr.Resolve(bind_str.c_str());
+
+                       if (!bind_addr.isIPv6()) {
+                               address = bind_addr;
+                       }
+               } catch (ResolveError &e) {
+               }
 
-               sleep_ms(50);
+               // IPv6 socket test
+               if (g_settings->getBool("enable_ipv6")) {
+                       UDPSocket socket6;
+
+                       if (!socket6.init(true, true)) {
+                               /* Note: Failing to create an IPv6 socket is not technically an
+                                  error because the OS may not support IPv6 or it may
+                                  have been disabled. IPv6 is not /required/ by
+                                  minetest and therefore this should not cause the unit
+                                  test to fail
+                               */
+                               dstream << "WARNING: IPv6 socket creation failed (unit test)"
+                                       << std::endl;
+                       } else {
+                               const char sendbuffer[] = "hello world!";
+                               IPv6AddressBytes bytes;
+                               bytes.bytes[15] = 1;
+
+                               socket6.Bind(address6);
+
+                               try {
+                                       socket6.Send(Address(&bytes, port), sendbuffer, sizeof(sendbuffer));
+
+                                       sleep_ms(50);
+
+                                       char rcvbuffer[256] = { 0 };
+                                       Address sender;
+
+                                       for(;;) {
+                                               if (socket6.Receive(sender, rcvbuffer, sizeof(rcvbuffer )) < 0)
+                                                       break;
+                                       }
+                                       //FIXME: This fails on some systems
+                                       UASSERT(strncmp(sendbuffer, rcvbuffer, sizeof(sendbuffer)) == 0);
+                                       UASSERT(memcmp(sender.getAddress6().sin6_addr.s6_addr,
+                                                       Address(&bytes, 0).getAddress6().sin6_addr.s6_addr, 16) == 0);
+                               }
+                               catch (SendFailedException &e) {
+                                       errorstream << "IPv6 support enabled but not available!"
+                                                   << std::endl;
+                               }
+                       }
+               }
 
-               char rcvbuffer[256];
-               memset(rcvbuffer, 0, sizeof(rcvbuffer));
-               Address sender;
-               for(;;)
+               // IPv4 socket test
                {
-                       int bytes_read = socket.Receive(sender, rcvbuffer, sizeof(rcvbuffer));
-                       if(bytes_read < 0)
-                               break;
+                       UDPSocket socket(false);
+                       socket.Bind(address);
+
+                       const char sendbuffer[] = "hello world!";
+                       /*
+                        * If there is a bind address, use it.
+                        * It's useful in container environments
+                        */
+                       if (address != Address(0, 0, 0, 0, port)) {
+                               socket.Send(address, sendbuffer, sizeof(sendbuffer));
+                       }
+                       else
+                               socket.Send(Address(127, 0, 0 ,1, port), sendbuffer, sizeof(sendbuffer));
+
+                       sleep_ms(50);
+
+                       char rcvbuffer[256] = { 0 };
+                       Address sender;
+                       for(;;) {
+                               if (socket.Receive(sender, rcvbuffer, sizeof(rcvbuffer)) < 0)
+                                       break;
+                       }
+                       //FIXME: This fails on some systems
+                       UASSERT(strncmp(sendbuffer, rcvbuffer, sizeof(sendbuffer)) == 0);
+
+                       if (address != Address(0, 0, 0, 0, port)) {
+                               UASSERT(sender.getAddress().sin_addr.s_addr ==
+                                               address.getAddress().sin_addr.s_addr);
+                       }
+                       else {
+                               UASSERT(sender.getAddress().sin_addr.s_addr ==
+                                               Address(127, 0, 0, 1, 0).getAddress().sin_addr.s_addr);
+                       }
                }
-               //FIXME: This fails on some systems
-               assert(strncmp(sendbuffer, rcvbuffer, sizeof(sendbuffer))==0);
-               assert(sender.getAddress() == Address(127,0,0,1, 0).getAddress());
        }
 };
 
-struct TestConnection
+struct TestConnection: public TestBase
 {
        void TestHelpers()
        {
@@ -970,7 +1785,7 @@ struct TestConnection
                SharedBuffer<u8> data1(1);
                data1[0] = 100;
                Address a(127,0,0,1, 10);
-               u16 seqnum = 34352;
+               const u16 seqnum = 34352;
 
                con::BufferedPacket p1 = con::makePacket(a, data1,
                                proto_id, peer_id, channel);
@@ -983,11 +1798,11 @@ struct TestConnection
                        Data:
                                [7] u8 data1[0]
                */
-               assert(readU32(&p1.data[0]) == proto_id);
-               assert(readU16(&p1.data[4]) == peer_id);
-               assert(readU8(&p1.data[6]) == channel);
-               assert(readU8(&p1.data[7]) == data1[0]);
-               
+               UASSERT(readU32(&p1.data[0]) == proto_id);
+               UASSERT(readU16(&p1.data[4]) == peer_id);
+               UASSERT(readU8(&p1.data[6]) == channel);
+               UASSERT(readU8(&p1.data[7]) == data1[0]);
+
                //infostream<<"initial data1[0]="<<((u32)data1[0]&0xff)<<std::endl;
 
                SharedBuffer<u8> p2 = con::makeReliablePacket(data1, seqnum);
@@ -998,10 +1813,10 @@ struct TestConnection
                                <<" p2[3]="<<((u32)p2[3]&0xff)<<std::endl;
                infostream<<"data1[0]="<<((u32)data1[0]&0xff)<<std::endl;*/
 
-               assert(p2.getSize() == 3 + data1.getSize());
-               assert(readU8(&p2[0]) == TYPE_RELIABLE);
-               assert(readU16(&p2[1]) == seqnum);
-               assert(readU8(&p2[3]) == data1[0]);
+               UASSERT(p2.getSize() == 3 + data1.getSize());
+               UASSERT(readU8(&p2[0]) == TYPE_RELIABLE);
+               UASSERT(readU16(&p2[1]) == seqnum);
+               UASSERT(readU8(&p2[3]) == data1[0]);
        }
 
        struct Handler : public con::PeerHandler
@@ -1049,28 +1864,48 @@ struct TestConnection
 
                Handler hand_server("server");
                Handler hand_client("client");
-               
+
+               Address address(0, 0, 0, 0, 30001);
+               Address bind_addr(0, 0, 0, 0, 30001);
+               /*
+                * Try to use the bind_address for servers with no localhost address
+                * For example: FreeBSD jails
+                */
+               std::string bind_str = g_settings->get("bind_address");
+               try {
+                       bind_addr.Resolve(bind_str.c_str());
+
+                       if (!bind_addr.isIPv6()) {
+                               address = bind_addr;
+                       }
+               } catch (ResolveError &e) {
+               }
+
                infostream<<"** Creating server Connection"<<std::endl;
-               con::Connection server(proto_id, 512, 5.0, &hand_server);
-               server.Serve(30001);
-               
+               con::Connection server(proto_id, 512, 5.0, false, &hand_server);
+               server.Serve(address);
+
                infostream<<"** Creating client Connection"<<std::endl;
-               con::Connection client(proto_id, 512, 5.0, &hand_client);
+               con::Connection client(proto_id, 512, 5.0, false, &hand_client);
+
+               UASSERT(hand_server.count == 0);
+               UASSERT(hand_client.count == 0);
 
-               assert(hand_server.count == 0);
-               assert(hand_client.count == 0);
-               
                sleep_ms(50);
-               
-               Address server_address(127,0,0,1, 30001);
+
+               Address server_address(127, 0, 0, 1, 30001);
+               if (address != Address(0, 0, 0, 0, 30001)) {
+                       server_address = bind_addr;
+               }
+
                infostream<<"** running client.Connect()"<<std::endl;
                client.Connect(server_address);
 
                sleep_ms(50);
-               
+
                // Client should not have added client yet
-               assert(hand_client.count == 0);
-               
+               UASSERT(hand_client.count == 0);
+
                try
                {
                        u16 peer_id;
@@ -1086,12 +1921,12 @@ struct TestConnection
                }
 
                // Client should have added server now
-               assert(hand_client.count == 1);
-               assert(hand_client.last_id == 1);
+               UASSERT(hand_client.count == 1);
+               UASSERT(hand_client.last_id == 1);
                // Server should not have added client yet
-               assert(hand_server.count == 0);
-               
-               sleep_ms(50);
+               UASSERT(hand_server.count == 0);
+
+               sleep_ms(100);
 
                try
                {
@@ -1108,14 +1943,14 @@ struct TestConnection
                        // No actual data received, but the client has
                        // probably been connected
                }
-               
+
                // Client should be the same
-               assert(hand_client.count == 1);
-               assert(hand_client.last_id == 1);
+               UASSERT(hand_client.count == 1);
+               UASSERT(hand_client.last_id == 1);
                // Server should have the client
-               assert(hand_server.count == 1);
-               assert(hand_server.last_id == 2);
-               
+               UASSERT(hand_server.count == 1);
+               UASSERT(hand_server.last_id == 2);
+
                //sleep_ms(50);
 
                while(client.Connected() == false)
@@ -1137,7 +1972,7 @@ struct TestConnection
                }
 
                sleep_ms(50);
-               
+
                try
                {
                        u16 peer_id;
@@ -1151,171 +1986,62 @@ struct TestConnection
                catch(con::NoIncomingDataException &e)
                {
                }
-#if 1
+
                /*
                        Simple send-receive test
                */
                {
-                       /*u8 data[] = "Hello World!";
-                       u32 datasize = sizeof(data);*/
-                       SharedBuffer<u8> data = SharedBufferFromString("Hello World!");
+                       NetworkPacket* pkt = new NetworkPacket((u8*) "Hello World !", 14, 0);
+
+                       SharedBuffer<u8> sentdata = pkt->oldForgePacket();
 
                        infostream<<"** running client.Send()"<<std::endl;
-                       client.Send(PEER_ID_SERVER, 0, data, true);
+                       client.Send(PEER_ID_SERVER, 0, pkt, true);
 
                        sleep_ms(50);
 
                        u16 peer_id;
                        SharedBuffer<u8> recvdata;
-                       infostream<<"** running server.Receive()"<<std::endl;
+                       infostream << "** running server.Receive()" << std::endl;
                        u32 size = server.Receive(peer_id, recvdata);
-                       infostream<<"** Server received: peer_id="<<peer_id
-                                       <<", size="<<size
-                                       <<", data="<<*data
-                                       <<std::endl;
-                       assert(memcmp(*data, *recvdata, data.getSize()) == 0);
-               }
-#endif
-               u16 peer_id_client = 2;
-#if 0
-               /*
-                       Send consequent packets in different order
-                       Not compatible with new Connection, thus commented out.
-               */
-               {
-                       //u8 data1[] = "hello1";
-                       //u8 data2[] = "hello2";
-                       SharedBuffer<u8> data1 = SharedBufferFromString("hello1");
-                       SharedBuffer<u8> data2 = SharedBufferFromString("Hello2");
-
-                       Address client_address =
-                                       server.GetPeerAddress(peer_id_client);
-                       
-                       infostream<<"*** Sending packets in wrong order (2,1,2)"
-                                       <<std::endl;
-                       
-                       u8 chn = 0;
-                       con::Channel *ch = &server.getPeer(peer_id_client)->channels[chn];
-                       u16 sn = ch->next_outgoing_seqnum;
-                       ch->next_outgoing_seqnum = sn+1;
-                       server.Send(peer_id_client, chn, data2, true);
-                       ch->next_outgoing_seqnum = sn;
-                       server.Send(peer_id_client, chn, data1, true);
-                       ch->next_outgoing_seqnum = sn+1;
-                       server.Send(peer_id_client, chn, data2, true);
-
-                       sleep_ms(50);
+                       infostream << "** Server received: peer_id=" << peer_id
+                                       << ", size=" << size
+                                       << ", data=" << (const char*)pkt->getU8Ptr(0)
+                                       << std::endl;
 
-                       infostream<<"*** Receiving the packets"<<std::endl;
+                       UASSERT(memcmp(*sentdata, *recvdata, recvdata.getSize()) == 0);
 
-                       u16 peer_id;
-                       SharedBuffer<u8> recvdata;
-                       u32 size;
-
-                       infostream<<"** running client.Receive()"<<std::endl;
-                       peer_id = 132;
-                       size = client.Receive(peer_id, recvdata);
-                       infostream<<"** Client received: peer_id="<<peer_id
-                                       <<", size="<<size
-                                       <<", data="<<*recvdata
-                                       <<std::endl;
-                       assert(size == data1.getSize());
-                       assert(memcmp(*data1, *recvdata, data1.getSize()) == 0);
-                       assert(peer_id == PEER_ID_SERVER);
-                       
-                       infostream<<"** running client.Receive()"<<std::endl;
-                       peer_id = 132;
-                       size = client.Receive(peer_id, recvdata);
-                       infostream<<"** Client received: peer_id="<<peer_id
-                                       <<", size="<<size
-                                       <<", data="<<*recvdata
-                                       <<std::endl;
-                       assert(size == data2.getSize());
-                       assert(memcmp(*data2, *recvdata, data2.getSize()) == 0);
-                       assert(peer_id == PEER_ID_SERVER);
-                       
-                       bool got_exception = false;
-                       try
-                       {
-                               infostream<<"** running client.Receive()"<<std::endl;
-                               peer_id = 132;
-                               size = client.Receive(peer_id, recvdata);
-                               infostream<<"** Client received: peer_id="<<peer_id
-                                               <<", size="<<size
-                                               <<", data="<<*recvdata
-                                               <<std::endl;
-                       }
-                       catch(con::NoIncomingDataException &e)
-                       {
-                               infostream<<"** No incoming data for client"<<std::endl;
-                               got_exception = true;
-                       }
-                       assert(got_exception);
-               }
-#endif
-#if 0
-               /*
-                       Send large amounts of packets (infinite test)
-                       Commented out because of infinity.
-               */
-               {
-                       infostream<<"Sending large amounts of packets (infinite test)"<<std::endl;
-                       int sendcount = 0;
-                       for(;;){
-                               int datasize = myrand_range(0,5)==0?myrand_range(100,10000):myrand_range(0,100);
-                               infostream<<"datasize="<<datasize<<std::endl;
-                               SharedBuffer<u8> data1(datasize);
-                               for(u16 i=0; i<datasize; i++)
-                                       data1[i] = i/4;
-                               
-                               int sendtimes = myrand_range(1,10);
-                               for(int i=0; i<sendtimes; i++){
-                                       server.Send(peer_id_client, 0, data1, true);
-                                       sendcount++;
-                               }
-                               infostream<<"sendcount="<<sendcount<<std::endl;
-                               
-                               //int receivetimes = myrand_range(1,20);
-                               int receivetimes = 20;
-                               for(int i=0; i<receivetimes; i++){
-                                       SharedBuffer<u8> recvdata;
-                                       u16 peer_id = 132;
-                                       u16 size = 0;
-                                       bool received = false;
-                                       try{
-                                               size = client.Receive(peer_id, recvdata);
-                                               received = true;
-                                       }catch(con::NoIncomingDataException &e){
-                                       }
-                               }
-                       }
+                       delete pkt;
                }
-#endif
+
+               u16 peer_id_client = 2;
                /*
                        Send a large packet
                */
                {
                        const int datasize = 30000;
-                       SharedBuffer<u8> data1(datasize);
+                       NetworkPacket* pkt = new NetworkPacket(0, datasize);
                        for(u16 i=0; i<datasize; i++){
-                               data1[i] = i/4;
+                               *pkt << (u8) i/4;
                        }
 
                        infostream<<"Sending data (size="<<datasize<<"):";
                        for(int i=0; i<datasize && i<20; i++){
                                if(i%2==0) infostream<<" ";
                                char buf[10];
-                               snprintf(buf, 10, "%.2X", ((int)((const char*)*data1)[i])&0xff);
+                               snprintf(buf, 10, "%.2X", ((int)((const char*)pkt->getU8Ptr(0))[i])&0xff);
                                infostream<<buf;
                        }
                        if(datasize>20)
                                infostream<<"...";
                        infostream<<std::endl;
-                       
-                       server.Send(peer_id_client, 0, data1, true);
+
+                       SharedBuffer<u8> sentdata = pkt->oldForgePacket();
+
+                       server.Send(peer_id_client, 0, pkt, true);
 
                        //sleep_ms(3000);
-                       
+
                        SharedBuffer<u8> recvdata;
                        infostream<<"** running client.Receive()"<<std::endl;
                        u16 peer_id = 132;
@@ -1332,7 +2058,7 @@ struct TestConnection
                                }
                                sleep_ms(10);
                        }
-                       assert(received);
+                       UASSERT(received);
                        infostream<<"** Client received: peer_id="<<peer_id
                                        <<", size="<<size
                                        <<std::endl;
@@ -1348,59 +2074,86 @@ struct TestConnection
                                infostream<<"...";
                        infostream<<std::endl;
 
-                       assert(memcmp(*data1, *recvdata, data1.getSize()) == 0);
-                       assert(peer_id == PEER_ID_SERVER);
+                       UASSERT(memcmp(*sentdata, *recvdata, recvdata.getSize()) == 0);
+                       UASSERT(peer_id == PEER_ID_SERVER);
+
+                       delete pkt;
                }
-               
+
                // Check peer handlers
-               assert(hand_client.count == 1);
-               assert(hand_client.last_id == 1);
-               assert(hand_server.count == 1);
-               assert(hand_server.last_id == 2);
-               
+               UASSERT(hand_client.count == 1);
+               UASSERT(hand_client.last_id == 1);
+               UASSERT(hand_server.count == 1);
+               UASSERT(hand_server.last_id == 2);
+
                //assert(0);
        }
 };
 
-#define TEST(X)\
-{\
+#define TEST(X) do {\
        X x;\
        infostream<<"Running " #X <<std::endl;\
        x.Run();\
-}
+       tests_run++;\
+       tests_failed += x.test_failed ? 1 : 0;\
+} while (0)
 
-#define TESTPARAMS(X, ...)\
-{\
+#define TESTPARAMS(X, ...) do {\
        X x;\
        infostream<<"Running " #X <<std::endl;\
        x.Run(__VA_ARGS__);\
-}
+       tests_run++;\
+       tests_failed += x.test_failed ? 1 : 0;\
+} while (0)
 
 void run_tests()
 {
        DSTACK(__FUNCTION_NAME);
-       
+
+       int tests_run = 0;
+       int tests_failed = 0;
+
        // Create item and node definitions
        IWritableItemDefManager *idef = createItemDefManager();
        IWritableNodeDefManager *ndef = createNodeDefManager();
        define_some_nodes(idef, ndef);
 
+       log_set_lev_silence(LMT_ERROR, true);
+
        infostream<<"run_tests() started"<<std::endl;
        TEST(TestUtilities);
+       TEST(TestPath);
        TEST(TestSettings);
        TEST(TestCompress);
        TEST(TestSerialization);
+       TEST(TestNodedefSerialization);
        TESTPARAMS(TestMapNode, ndef);
        TESTPARAMS(TestVoxelManipulator, ndef);
        TESTPARAMS(TestVoxelAlgorithms, ndef);
+       TESTPARAMS(TestInventory, idef);
        //TEST(TestMapBlock);
        //TEST(TestMapSector);
+       TEST(TestCollision);
        if(INTERNET_SIMULATOR == false){
                TEST(TestSocket);
-               dout_con<<"=== BEGIN RUNNING UNIT TESTS FOR CONNECTION ==="<<std::endl;
+               dout_con << "=== BEGIN RUNNING UNIT TESTS FOR CONNECTION ===" << std::endl;
                TEST(TestConnection);
-               dout_con<<"=== END RUNNING UNIT TESTS FOR CONNECTION ==="<<std::endl;
+               dout_con << "=== END RUNNING UNIT TESTS FOR CONNECTION ===" << std::endl;
+       }
+
+       log_set_lev_silence(LMT_ERROR, false);
+
+       delete idef;
+       delete ndef;
+
+       if(tests_failed == 0) {
+               actionstream << "run_tests(): " << tests_failed << " / " << tests_run << " tests failed." << std::endl;
+               actionstream << "run_tests() passed." << std::endl;
+               return;
+       } else {
+               errorstream << "run_tests(): " << tests_failed << " / " << tests_run << " tests failed." << std::endl;
+               errorstream << "run_tests() aborting." << std::endl;
+               abort();
        }
-       infostream<<"run_tests() passed"<<std::endl;
 }