#include <unordered_map> #include <vector> #include "../string/String.hpp" #include "../serialization/JSONSerializer.hpp" #include "gtest_helpers.hpp" #include <gtest/gtest.h> namespace JsonTests { struct TestType { std::map<sprawl::String, double> map; std::vector<int> intArray; std::vector<sprawl::String> strArray; std::vector<std::vector<int>> nestedArray; sprawl::String str; int i; double d; bool b; char c; unsigned char u; void Serialize(sprawl::serialization::SerializerBase& ser) { ASSERT_NO_SPRAWL_EXCEPT(ser % NAME_PROPERTY(map)); ASSERT_NO_SPRAWL_EXCEPT(ser % NAME_PROPERTY(intArray)); ASSERT_NO_SPRAWL_EXCEPT(ser % NAME_PROPERTY(strArray)); ASSERT_NO_SPRAWL_EXCEPT(ser % NAME_PROPERTY(nestedArray)); ASSERT_NO_SPRAWL_EXCEPT(ser % NAME_PROPERTY(str)); ASSERT_NO_SPRAWL_EXCEPT(ser % NAME_PROPERTY(i)); ASSERT_NO_SPRAWL_EXCEPT(ser % NAME_PROPERTY(d)); ASSERT_NO_SPRAWL_EXCEPT(ser % NAME_PROPERTY(b)); ASSERT_NO_SPRAWL_EXCEPT(ser % NAME_PROPERTY(c)); ASSERT_NO_SPRAWL_EXCEPT(ser % NAME_PROPERTY(u)); } bool operator==(TestType const& other) const { return map == other.map && intArray == other.intArray && strArray == other.strArray && nestedArray == other.nestedArray && str == other.str && i == other.i && d == other.d && b == other.b && c == other.c && u == other.u; } bool operator!=(TestType const& other) { return !operator==(other); } }; } using namespace JsonTests; class JsonTokenTest : public testing::Test { protected: virtual void SetUp() override { tok = sprawl::serialization::JSONToken::object(); ASSERT_NO_SPRAWL_EXCEPT(tok.Insert("test1", 1)); ASSERT_NO_SPRAWL_EXCEPT(tok.Insert("test2", 2)); tok["object"] = sprawl::serialization::JSONToken::object(); #if !SPRAWL_EXCEPTIONS_ENABLED ASSERT_FALSE(tok["object"].Error()); #endif sprawl::serialization::JSONToken& obj = tok["object"]; #if !SPRAWL_EXCEPTIONS_ENABLED ASSERT_FALSE(obj.Insert("test1", 1).Error()); ASSERT_FALSE(obj.Insert("test2", 2).Error()); #else obj.Insert("test1", 1); obj.Insert("test2", 2); #endif tok["array"] = sprawl::serialization::JSONToken::array(); #if !SPRAWL_EXCEPTIONS_ENABLED ASSERT_FALSE(tok["object"].Error()); #endif sprawl::serialization::JSONToken& arr = tok["array"]; #if !SPRAWL_EXCEPTIONS_ENABLED ASSERT_FALSE(arr.PushBack(1).Error()); ASSERT_FALSE(arr.PushBack(2).Error()); #else arr.PushBack(1); arr.PushBack(2); #endif } sprawl::serialization::JSONToken tok; }; TEST_F(JsonTokenTest, JsonTokensWork) { sprawl::String expectedTokValue = "{ \"test1\" : 1, \"test2\" : 2, \"object\" : { \"test1\" : 1, \"test2\" : 2 }, \"array\" : [ 1, 2 ] }"; ASSERT_EQ(expectedTokValue, tok.ToJSONString()); } TEST_F(JsonTokenTest, CopyingWorks) { sprawl::String expectedTokValue = "{ \"test1\" : 1, \"test2\" : -2, \"object\" : { \"test1\" : 1, \"test2\" : -2, \"Tok\" : null }, \"array\" : [ -1, 2 ] }"; sprawl::String expectedTok2Value = "{ \"test1\" : -1, \"test2\" : 2, \"object\" : { \"test1\" : -1, \"test2\" : 2, \"Tok2\" : null }, \"array\" : [ 1, -2 ] }"; //With shallow copy, test1 and test2 will be unchanged, nested objects will mirror tok sprawl::String expectedTok3Value = "{ \"test1\" : 1, \"test2\" : 2, \"object\" : { \"test1\" : 1, \"test2\" : -2, \"Tok\" : null }, \"array\" : [ -1, 2 ] }"; sprawl::serialization::JSONToken tok2 = tok.DeepCopy(); sprawl::serialization::JSONToken tok3 = tok.ShallowCopy(); tok2["test1"] = sprawl::serialization::JSONToken::number((long long)-1); tok["test2"] = sprawl::serialization::JSONToken::number((long long)-2); #if !SPRAWL_EXCEPTIONS_ENABLED ASSERT_FALSE(tok2["object"].Error()); ASSERT_FALSE(tok["object"].Error()); #endif sprawl::serialization::JSONToken& tok2obj = tok2["object"]; sprawl::serialization::JSONToken& tokobj = tok["object"]; #if !SPRAWL_EXCEPTIONS_ENABLED ASSERT_FALSE(tok2obj["test1"].Error()); ASSERT_FALSE(tokobj["test2"].Error()); #endif tok2obj["test1"] = sprawl::serialization::JSONToken::number((long long)-1); tokobj["test2"] = sprawl::serialization::JSONToken::number((long long)-2); #if !SPRAWL_EXCEPTIONS_ENABLED ASSERT_FALSE(tokobj.Insert("Tok", sprawl::serialization::JSONToken::null()).Error()); ASSERT_FALSE(tok2obj.Insert("Tok2", sprawl::serialization::JSONToken::null()).Error()); #else tokobj.Insert("Tok", sprawl::serialization::JSONToken::null()); tok2obj.Insert("Tok2", sprawl::serialization::JSONToken::null()); #endif #if !SPRAWL_EXCEPTIONS_ENABLED ASSERT_FALSE(tok2["array"].Error()); ASSERT_FALSE(tok["array"].Error()); #endif sprawl::serialization::JSONToken& tok2arr = tok2["array"]; sprawl::serialization::JSONToken& tokarr = tok["array"]; #if !SPRAWL_EXCEPTIONS_ENABLED ASSERT_FALSE(tok2arr[1].Error()); ASSERT_FALSE(tokarr[0].Error()); #endif tokarr[0] = sprawl::serialization::JSONToken::number((long long)-1); tok2arr[1] = sprawl::serialization::JSONToken::number((long long)-2); ASSERT_EQ(expectedTokValue, tok.ToJSONString()); ASSERT_EQ(expectedTok2Value, tok2.ToJSONString()); ASSERT_EQ(expectedTok3Value, tok3.ToJSONString()); } class JsonSerializerTest : public testing::Test { protected: virtual void SetUp() override { t.str = "\\escapes\\ \" \n"; t.i = 3; t.d = 2.5; t.b = true; t.c = 'f'; t.u = 32; t.map["test"] = 0.000000000000000001; t.map["test2"] = 10000000000000000000000.1; t.map["test3"] = 1000000000.00000001; t.intArray.push_back(1); t.intArray.push_back(-2); t.intArray.push_back(3); t.intArray.push_back(-4); t.intArray.push_back(5); t.strArray.push_back("hi"); t.strArray.push_back("there"); t.strArray.push_back("y'all"); std::vector<int> nested; nested.push_back(6); nested.push_back(7); nested.push_back(8); nested.push_back(9); nested.push_back(10); t.nestedArray.push_back(nested); } TestType t; }; TEST_F(JsonSerializerTest, SerializationWorks) { sprawl::String expectedValue1 = "{ \"__version__\" : 0, \"t\" : { \"map\" : { \"test\" : 1.0000000000000000715e-18, \"test2\" : 1e+22, \"test3\" : 1000000000 }, \"intArray\" : [ 1, -2, 3, -4, 5 ], \"strArray\" : [ \"hi\", \"there\", \"y'all\" ], \"nestedArray\" : [ [ 6, 7, 8, 9, 10 ] ], \"str\" : \"\\\\escapes\\\\ \\\" \\n\", \"i\" : 3, \"d\" : 2.5, \"b\" : true, \"c\" : \"f\", \"u\" : 32 } }"; sprawl::serialization::JSONSerializer s; ASSERT_NO_SPRAWL_EXCEPT(s % NAME_PROPERTY(t)); sprawl::String str1 = s.Str(); ASSERT_EQ(expectedValue1, str1); } TEST_F(JsonSerializerTest, PrettySerializationWorks) { sprawl::String expectedValue2 = "{\n\t\"__version__\" : 0,\n\t\"map\" : {\n\t\t\"test\" : 1.0000000000000000715e-18,\n\t\t\"test2\" : 1e+22,\n\t\t\"test3\" : 1000000000\n\t},\n\t\"intArray\" : [\n\t\t1,\n\t\t-2,\n\t\t3,\n\t\t-4,\n\t\t5\n\t],\n\t\"strArray\" : [\n\t\t\"hi\",\n\t\t\"there\",\n\t\t\"y'all\"\n\t],\n\t\"nestedArray\" : [\n\t\t[\n\t\t\t6,\n\t\t\t7,\n\t\t\t8,\n\t\t\t9,\n\t\t\t10\n\t\t]\n\t],\n\t\"str\" : \"\\\\escapes\\\\ \\\" \\n\",\n\t\"i\" : 3,\n\t\"d\" : 2.5,\n\t\"b\" : true,\n\t\"c\" : \"f\",\n\t\"u\" : 32\n}"; sprawl::serialization::JSONSerializer s2; s2.SetPrettyPrint(true); t.Serialize(s2); sprawl::String str2 = s2.Str(); ASSERT_EQ(expectedValue2, str2); } TEST_F(JsonSerializerTest, DeserializationWorks) { sprawl::serialization::JSONSerializer s; ASSERT_NO_SPRAWL_EXCEPT(s % NAME_PROPERTY(t)); sprawl::String str1 = s.Str(); sprawl::serialization::JSONDeserializer d(str1); TestType t1; ASSERT_NO_SPRAWL_EXCEPT(d % sprawl::serialization::prepare_data(t1, "t")); ASSERT_EQ(t, t1); } TEST_F(JsonSerializerTest, PrettyDeserializationWorks) { sprawl::serialization::JSONSerializer s2; s2.SetPrettyPrint(true); t.Serialize(s2); sprawl::String str2 = s2.Str(); sprawl::serialization::JSONDeserializer d2(str2); TestType t2; t2.Serialize(d2); ASSERT_EQ(t, t2); }
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#1 | 23398 | ququlala | "Forking branch Mainline of shadauxcat-libsprawl to ququlala-libsprawl." | ||
//guest/ShadauxCat/Sprawl/Mainline/UnitTests/UnitTests_Json.cpp | |||||
#4 | 19908 | ShadauxCat |
Fixed some test issues in vs2015 (behavior of floating point serialization is now consistent with clang/gcc when it previously was not) and commented out a non-deterministic concurrent queue test. #review-19909 |
||
#3 | 16768 | ShadauxCat |
Improvements to error handling in builds with exceptions disabled: - In debug builds or with SPRAWL_ERRORSTATE_STRICT enabled, ErrorState will output a message to stderr and terminate if Get() is called when an error flag is set. (In release buils or with SPRAWL_ERRORSTATE_PERMISSIVE defined, Get() will return junk memory in this case.) - In debug builds or with SPRAWL_ERRORSTATE_STRICT enabled, ErrorState will output a message to stderr and terminate if its destructor is called without checking the errorstate if an error is present (equivalent to an exception terminating the application if no catch() block is present for it). - On linux builds and when running "Analyze" through visual studio, a warning will be issued if any function returning ErrorState has its return value ignored. (This only applies to builds with exceptions not enabled; when exceptions are enabled no warning is issued) - Many functions that could return ErrorState were having their return values silently ignored in internal sprawl code so the user would not find out about errors if exceptions are disabled; now anything in sprawl code that calls a function returning ErrorState will either handle the error, or (in most cases) surface it back up to the user. - As a positive side-effect of the warnings for ignoring ErrorState, several constructors that were capable of throwing exceptions are no longer capable of doing so. #review-16769 |
||
#2 | 16378 | ShadauxCat |
New exception framework, phase one. Added new class, ErrorState, for handling errors when exceptions are disabled. When exceptions are enabled, ErrorState<T> is an alias for T. When they're disabled, ErrorState<T> additionally encodes an error code, and will have junk data (and probably a crash) if an error is returned and not checked before the data is used. ErrorState<T> is implicitly convertible to and from T, so applications that don't care about errors can code like they don't exist... Phase two will involve overloading operators on ErrorState so that things that return ErrorState can still function as much as possible like they do when exceptions are enabled. #review-16379 |
||
#1 | 16052 | ShadauxCat |
- Changed default block size for concurrent queue to a more reasonable value - Changed some memory orders to memory_order_seq_cst when they don't actually need to be that to get around a bug in visual studio 2013 - debug builds assert when memory_order_acq_rel is used for a compare_exchange_strong (this is a standard library bug and is fixed in VS2015) - Added Event API - events are an alternative to condition variables that do not require a mutex and are guaranteed not to miss any signals, even if the signal comes while the thread is not listening for it. Unlike condition variables, however, they do not support broadcasting (and in fact, in general, are not safe to use with multiple threads listening for the same event simultaneously - though notifying on the same event is fine) - Rewrote ThreadManager around ConcurrentQueue and Event API so it is now lock-free. Also improved some behaviors of the staged thread manager operation so it now supports tasks that can be run on multiple stages via a bitmask. - Fixed an issue where the Coroutine copy constructor was calling the std::function constructor instead and another where initializing with a stack might try to call the wrong constructor and vice-versa - Fixed Coroutine never calling munmap() on its stack in linux and causing a memory leak - Added default arguments to time functions - Attempted to fix some issues with BinaryTree. Fixed some but not all. It's currently not suitable for use, sadly. - Logging Improvements: - - Added thread ID to logging - - Fixed some issues with category handlers - - Added backtraces - - Added the following additional log macros: - - - LOG_IF - - - LOG_EVERY_N - - - LOG_FIRST_N - - - LOG_IF_EVERY_N - - - LOG_IF_FIRST_N - - - LOG_ASSERT - - Added the ability to set extra info callbacks to get data such as script backtraces - - Removed the thread-related handlers and replaced them with RunHandler_Threaded and RunHandler_ThreadManager, which will enable any passed-in handler to be run in a threaded fashion - Removed StaticPoolAllocator and renamed DynamicPoolAllocator to PoolAllocator; adjusted unit tests accordingly - PoolAllocator now allocates its pool with mmap and VirtualAlloc, rather than with malloc - Fixed a bug with Vector copy assignment operator - Improved performance of StringBuilder considerably for cases where there are no modifier strings - Removed Copy-On-Write behavior of JSONToken as it was broken; copies are now performed with explicit DeepCopy() and ShallowCopy() functions - Fixed some parser bugs with JSONToken - Added iteration to JSONToken to iterate its children - Fixed crash when reading a negative number of bytes from a file - Changed StringBuilder to favor speed instead of memory by default - Added some performance unit tests for JSON token #review-16053 |
||
//guest/ShadauxCat/Sprawl/Mainline/UnitTests/UnitTests_Serialization.cpp | |||||
#6 | 14216 | ShadauxCat |
-Moved some global sprawl::Strings into local scope in json serialization test because of initialization order issues in the memory allocator on mac. This is a temporary fix, and a real fix will come by making the pool allocator work in explicitly-sized pieces and putting all the code for those pieces into a cpp file. -Fixed a large number of warnings on mac/linux that were exposed by fixes to csbuild -Fixed compile errors on mac due to malloc and alloca not being defined, fixed by #include <stdlib.h> in appropriate places -Fixed mac os x trying to link against pthread erroneously -Provided os x implementation of time library -Fixed compile errors on os x due to std::unordered_map whining about the difference between an allocator that allocates std::pair<key, value> and one that allocates std::pair<key const, value>, which, of course, is that the allocator will be no different at all. -Fixed an actual issue where one unordered_map was allocating only key_type instead of std::pair<key_type, value_type> -Fixed a memory leak where coroutine objects would never be cleaned up because either Yield() or reactivate_() will never return (and thus never clean up their stack memory and thus never release any dynamic memory held in stack objects) depending on the situation - if the function runs to completion, reactivate_() never returns after calling swapcontext(); meanwhile, if the function does not run to completion, Yield() never returns after calling Pause(). This behavior will need to be well-documented because it will affect client-side code as well. Stack memory within a coroutine should not rely on RAII behavior. -Fixed compile failure when creating a StlWrapper with a const value_type #review-14217 |
||
#5 | 14146 | ShadauxCat |
Moving a gtest-specific function out of String.hpp #review-14147 |
||
#4 | 14144 | ShadauxCat |
Switching unit tests to gtest. 100 is a decent number of tests to start with, but it needs to be more like 400 to test the current codebase. #review-14145 |
||
#3 | 13650 | ShadauxCat |
- Windows implementations of thread and time libraries - Added coroutines - Added some more unit tests, fixed some unit tests in windows environments - Fixed an issue where multi threading was not properly detected on Linux - Fixed the makefiles to build with threading by default on linux - Changed the pool allocator to use thread-local pools instead of locking mutexes - Fixed output of sprawl::string in the StringBuilder library to take length into account - Added string builder options for StringLiteral - Added thread local implementation #review |
||
#2 | 11500 | ShadauxCat |
Added sprawl::time library. Fixed JSON Unit Test bug. |
||
#1 | 11496 | ShadauxCat | Initial checkin: Current states for csbuild and libSprawl |