diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | test/issues/test-issue140.scxml | 70 | ||||
| -rw-r--r-- | test/src/test-lua-tables.cpp | 115 |
3 files changed, 192 insertions, 2 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index efbc2fa..e76e249 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -64,6 +64,10 @@ USCXML_TEST_COMPILE(NAME test-lifecycle LABEL general/test-lifecycle FILES src/t USCXML_TEST_COMPILE(NAME test-validating LABEL general/test-validating FILES src/test-validating.cpp) USCXML_TEST_COMPILE(NAME test-snippets LABEL general/test-snippets FILES src/test-snippets.cpp) +if(WITH_DM_LUA) + USCXML_TEST_COMPILE(NAME test-lua-tables LABEL general/test-lua-tables FILES src/test-lua-tables.cpp) +endif() + if (NOT BUILD_AS_PLUGINS) USCXML_TEST_COMPILE( NAME test-serialization @@ -109,7 +113,6 @@ if (TARGET csharp) WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin COMMENT "Compiling C# TestStatePass" ) - add_dependencies(testStatePassCSharp csharp) else() ADD_CUSTOM_TARGET(testStatePassCSharp ALL COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/bin/csharp @@ -123,8 +126,10 @@ if (TARGET csharp) WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin COMMENT "Compiling C# TestStatePass" ) - add_dependencies(testStatePassCSharp csharp) endif() + add_dependencies(testStatePassCSharp csharp) + set_target_properties(testStatePassCSharp PROPERTIES FOLDER "Tests") + endif() if (WIN32 AND BUILD_SHARED_LIBS) diff --git a/test/issues/test-issue140.scxml b/test/issues/test-issue140.scxml new file mode 100644 index 0000000..6443344 --- /dev/null +++ b/test/issues/test-issue140.scxml @@ -0,0 +1,70 @@ + +<scxml datamodel="lua" initial="StateShape1" name="ScxmlShape1" version="1.0" xmlns="http://www.w3.org/2005/07/scxml"> + <datamodel> + <data id="t_DifficultTable">{ + [2] = { + [1]={ 5,5,5,5 }, + [2]={ 5,5,5,5 }, + [3]= { 10,10 } + }, + [1] = { + [1]= { 4,4,4,4,4,4,4,4 }, + [2]= { 8,8,8,8 }, + [3]= { 16,16 } + }, + [3] = { + [1]={ 2,2,2 }, + test = false, + good = true, + xxx = 'asdf' + }, + zzz = { + 1,2,3,"different types", + [[bbbbbbb\nbbbbbb]], + qq = "asdf 'asdf' [[asdf]]" + } +} + </data> + <data expr="{ + [3]=3, + [2]=2, + [1]=1 +}" id="t_mixed"/> + </datamodel> + <state id="StateShape1"> + <onentry> + <script>function PrintTable(t_val, s_tab) + if type(t_val)=="table" then + for k,v in pairs(t_val) do + print(string.format("%sk=%s[%s],v=%s[%s]",s_tab,tostring(k),type(k),tostring(v),type(v))) + PrintTable(v,s_tab .. "\t") + end + end +end + +PrintTable(t_DifficultTable,"") + </script> + <foreach array="t_mixed" index="s_index" item="s_item"> + <log expr="s_item" label="s_item"/> + <log expr="s_index" label="s_index"/> + </foreach> + </onentry> + <transition cond="t_DifficultTable[2][3][1]==10 and +#t_DifficultTable[1]==3 and +t_DifficultTable[3][1][2]==2 and +t_DifficultTable[3].test==false and +t_DifficultTable[3].xxx=="asdf" and +t_DifficultTable.zzz.qq=="asdf 'asdf' [[asdf]]" and +t_DifficultTable.zzz[1]==1 and +t_DifficultTable.zzz[2]==2 and +t_DifficultTable.zzz[3]==3 and +t_DifficultTable.zzz[4]=="different types" and +t_DifficultTable.zzz[5]==[[bbbbbbb\nbbbbbb]]" target="pass"/> + <transition event="error.*" target="fail"/> + <transition target="fail"/> + </state> + <final id="pass"/> + <final id="fail"> + <onentry/> + </final> +</scxml>
\ No newline at end of file diff --git a/test/src/test-lua-tables.cpp b/test/src/test-lua-tables.cpp new file mode 100644 index 0000000..3adea2d --- /dev/null +++ b/test/src/test-lua-tables.cpp @@ -0,0 +1,115 @@ +#include "uscxml/plugins/DataModel.h" +#include "uscxml/plugins/datamodel/lua/LuaDataModel.h" +#include "uscxml/plugins/Factory.h" +#include "uscxml/interpreter/Logging.h" + +#include <iostream> + +using namespace std; +using namespace uscxml; + +std::string test1 = "\ +{ \n\ + [1] = { 1, 1, 1, 1 }, \n\ + [2] = { 2, 2, 2, 2 }, \n\ + [3] = { 3, 3 }, \n\ + [7] = false, \n\ + [8] = true \n\ +}\ +"; + +std::string test2 = "\ +{ \ + zzz = { \ + [0] = { 1, 1, 1, 1 }, \ + [2] = { 5, 5, 5, 5 }, \ + [3] = { 10, 10 }, \ + [8] = { 80, 80 } \ + }, \ + bb = { \ + [3] = { 3, 3 }, \ + [2] = { 2, 2 } \ + } \ +}\ +"; + +std::string test3 = "\ +{ \n\ + [2] = { \n\ + [1]={ 5,5,5,5 }, \n\ + [2]={ 5,5,5,5 }, \n\ + [3]= { 10,10 } \n\ + }, \n\ + [1] = { \n\ + [1]= { 4,4,4,4,4,4,4,4 }, \n\ + [2]= { 8,8,8,8 }, \n\ + [3]= { 16,16 } \n\ + }, \n\ + [3] = { \n\ + [1]={ 2,2,2 }, \n\ + test = false, \n\ + good = true, \n\ + xxx = 'asdf' \n\ + }, \n\ + zzz = { \n\ + 1,2,3,\"different types\", \n\ + [[bbbbbbb\nbbbbbb]], \n\ + qq = \"asdf 'asdf' [[asdf]]\" \n\ + }\ +}\ +"; + +class DMCallbacks : public DataModelCallbacks { +public: + std::string name = "asdf"; + std::string sessionId = "asdf"; + std::map<std::string, IOProcessor> ioProcs; + std::map<std::string, Invoker> invokers; + + virtual ~DMCallbacks() {} + const std::string& getName() { + return name; + } + const std::string& getSessionId() { + return sessionId; + } + const std::map<std::string, IOProcessor>& getIOProcessors() { + return ioProcs; + } + virtual bool isInState(const std::string& stateId) { + return false; + } + virtual XERCESC_NS::DOMDocument* getDocument() const { + return nullptr; + } + virtual const std::map<std::string, Invoker>& getInvokers() { + return invokers; + } + virtual Logger getLogger() { + return Logger::getDefault(); + } + +}; + +int main(int argc, char** argv) { + try { + DataModel lua = Factory::getInstance()->createDataModel("lua", new DMCallbacks()); + std::cout << "TEST1:" << lua.evalAsData(test1).asJSON() << std::endl << std::endl; + std::cout << "TEST2:" << lua.evalAsData(test2).asJSON() << std::endl << std::endl; + std::cout << "TEST3:" << lua.evalAsData(test3).asJSON() << std::endl << std::endl; + + { + Data d1 = lua.evalAsData(test3); + lua.assign("mixedTable", d1); + Data d2 = lua.evalAsData("mixedTable"); + std::cout << "TEST3.2:" << d2.asJSON() << std::endl << std::endl; + Data d3 = lua.evalAsData("mixedTable.zzz"); + std::cout << "TEST3.3:" << d3.asJSON() << std::endl << std::endl; + Data d4 = lua.evalAsData("mixedTable[1]"); + std::cout << "TEST3.4:" << d4.asJSON() << std::endl << std::endl; + + } + } catch (Event e) { + std::cout << e << std::endl; + } +} |