Remove blank default values for emergequeue_limit_* settings

[dragonfireclient.git] / src / test.cpp

diff --git a/src/test.cpp b/src/test.cpp
index 7753e1d5f180256f485d383016d1bde03c1ea11a..c969c0951a76f72e859d7f88d9b723677eb7657a 100644 (file)
--- a/src/test.cpp
+++ b/src/test.cpp
@@ -157,6 +157,8 @@ struct TestUtilities: public TestBase
                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);
@@ -169,6 +171,10 @@ struct TestUtilities: public TestBase
                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?\"");
        }
 };
 
@@ -612,7 +618,7 @@ struct TestCompress: public TestBase
                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();
                
@@ -627,7 +633,7 @@ struct TestCompress: public TestBase
                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: ";