summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2021-11-24 10:52:11 -0500
committerGitHub <noreply@github.com>2021-11-24 10:52:11 -0500
commit7db340b75e7bf31e5a1e3ac1a3b4c651c6087f92 (patch)
treeea5c2e1f10b995ee73a0567bc93ddd0713e7ba67 /tools
parentbdc61bb8db321a8d788aa739b889354540a49ee0 (diff)
PersistentJSONValue (#2028)
* #include an absolute path didn't work - because paths were taken to always be relative. * Use 'Process' to communicate with an command line tool. * Remove slang-win-stream * Tidy up windows ProcessUtil. * First version of BufferedReadStream. * Windows working IPC for steams. * Test proxy count option. * Split Process/ProcessUtil. Process is platform dependant. ProcessUtil are functions that are platform independent. * First implementation of Unix Process interface. * Unix process compiles on cygwin. * Fix typo in unix process. * Separate unix pipe stream error of invalid access, from pipe availability. * Fix in standard line extraction. * Make fd non blocking. * Fix issues with Windows Process streams. * Added UnixPipe. * Some fixes around UnixPipeStream. * Make a unix stream closed explicit. * Hack to debug linux process/stream. * Revert to old linux pipe handling. * Pass executable path for unit tests. Split out CommandLine into own source. * Small improvements in process/command line. * Check process behavior with crash. * Make stderr and stdout unbuffered for crash testing. * Only turn disable buffering in crash test. * Disable crash test on CI. * Fix crash on clang/linux. * Enable crash test. Remove _appendBuffer as can use StreamUtil functionality. * Added inital processing for http headers. * Small improvements to HttpHeader. * First pass HTTPPacketConnection working on windows. * Enable other Process communication tests. * Update comments. * WIP JSON RPC. * Add terminate to Process. Made JSONRPC a Util. * Small tidy up around HTTPPacketConnection. * Improve process termination options. * WIP for test-server. * Add diagnostics error handling to test-server. * Improved JSON support. Parsing/creating JSON-RPC messages. * WIP JSONRPC parsing. * First pass RttiInfo support. * WIP converting between JSON/native types. * Project files. * Split out RttiUtil. Made RttiInfo constuction thread safe. * WIP RTTI<->JSON. * Add diagnostics to JSON<->native conversions. * Make RttiInfo for structs globals. Avoids problem around derived types (like pointers), being able to cause an abort. * Add pointer support to RTTI. Fixed some compilation issues on linux. * Add fixed array support. * Added Rtti unit test. * Add rtti unit test. * Split out quoted/unquoted key handling. Fix bugs in JSON value/container. Added JSON native test. * Make default array allocator use malloc/free. Remove the new[] handler (doesn't work on visuals studio). * Fix for linux warning. * Remove some test code. * Fix issues on x86 win. * Fix warning on aarch64. * Fix some bugs in JSON parsing/handling. Make Rtti work copy/dtor/ctor struct types. * Testing JSON<->native with fixed array. Make makeArrayView explicit if it's just a single value. Added array type. * Fix getting arrayView. * Improve JSON diagnostic name. * First pass refactor using Rtti for JSON RPC. * First pass of test server using RTTI/JSON-RPC. * Added JSONRPCConnection. * Fix some naming issues. * First pass of test-server working. * Added unit test support for JSON-RPC test server. * Fix compilation issues on linux around template handling. * Typo fix. * Fix a bug around SourceLoc lookup with JSONContainer. * Set the console type to console for ISlangWriters. * Small improvements to test-server. * Small improvements in test-server. * Small fix. * Remove test-proxy. Make test-process a process that can be used to unit test 'Process'. Adding mechanism to control spawning that will create a new process for every test. * Ability to remove source manager for JSONValue. * WIP SimpleJSONValue. * Add PersistentJSONValue * Testing around PersistentJSONValue. Bug fixes. * Small code improvements.
Diffstat (limited to 'tools')
-rw-r--r--tools/slang-unit-test/unit-test-json.cpp40
1 files changed, 40 insertions, 0 deletions
diff --git a/tools/slang-unit-test/unit-test-json.cpp b/tools/slang-unit-test/unit-test-json.cpp
index 2d2874cc8..b861465c8 100644
--- a/tools/slang-unit-test/unit-test-json.cpp
+++ b/tools/slang-unit-test/unit-test-json.cpp
@@ -316,5 +316,45 @@ SLANG_UNIT_TEST(json)
SLANG_CHECK(container->areEqual(a, c));
}
+
+ {
+ RefPtr<JSONContainer> container = new JSONContainer(&sourceManager);
+ const char aText[] = "{ \"a\" : \"Hi!\", \"b\" : 20.0, \"c\" : \"Hello\", \"d\" : 30, \"e\": null, \"f\": true }";
+
+ JSONBuilder builder(container);
+ SLANG_CHECK(SLANG_SUCCEEDED(_parse(aText, &sink, &builder)));
+ const JSONValue rootValue = builder.getRootValue();
+
+ List<PersistentJSONValue> values;
+
+ for (char c = 'a'; c <= 'f'; c++)
+ {
+ const char name[] = { c, 0 };
+ JSONKey key = container->getKey(UnownedStringSlice(name, 1));
+ auto value = container->findObjectValue(rootValue, key);
+
+ SLANG_CHECK(value.type != JSONValue::Type::Invalid);
+
+ PersistentJSONValue persistentValue(value, container);
+ values.add(persistentValue);
+
+ PersistentJSONValue copyValue(persistentValue);
+ PersistentJSONValue assignValue;
+ assignValue = persistentValue;
+
+ SLANG_CHECK(copyValue == persistentValue);
+ SLANG_CHECK(assignValue == persistentValue);
+ }
+
+ // Destroy the container
+ container.setNull();
+
+ SLANG_CHECK(values[0].getSlice() == "Hi!");
+ SLANG_CHECK(values[1].asFloat() == 20.0f);
+ SLANG_CHECK(values[2].getSlice() == "Hello");
+ SLANG_CHECK(values[3].asInteger() == 30);
+ SLANG_CHECK(values[4].type == JSONValue::Type::Null);
+ SLANG_CHECK(values[5].asBool() == true);
+ }
}