orthanc: UnitTestsSources/LuaTests.cpp annotate

annotate UnitTestsSources/LuaTests.cpp @ 4032:058b5ade8acd

renaming embedded resources

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 09 Jun 2020 21:43:42 +0200
parents	e3b3af80732d
children

rev	line source
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	1 /**
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1659 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1056 diff changeset	4 * Department, University Hospital of Liege, Belgium
3640 94f4a18a79cc upgrade to year 2020 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	6 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	7 * This program is free software: you can redistribute it and/or
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	8 * modify it under the terms of the GNU General Public License as
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	9 * published by the Free Software Foundation, either version 3 of the
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	10 * License, or (at your option) any later version.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	11 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	12 * In addition, as a special exception, the copyright holders of this
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	13 * program give permission to link the code of its release with the
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	16 * the linked executables. You must obey the GNU General Public License
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	18 * modify file(s) with this exception, you may extend this exception to
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	20 * you do not wish to do so, delete this exception statement from your
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	21 * version. If you delete this exception statement from all source files
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	22 * in the program, then also delete it here.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	23 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	24 * This program is distributed in the hope that it will be useful, but
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	27 * General Public License for more details.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	28 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	29 * You should have received a copy of the GNU General Public License
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	31 **/
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	32
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 712 diff changeset	33
3992 f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	34 #if ORTHANC_UNIT_TESTS_LINK_FRAMEWORK == 1
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 3992 diff changeset	35 # include <OrthancFramework.h>
3992 f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	36 #endif
f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	37
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 827 diff changeset	38 #include "PrecompiledHeadersUnitTests.h"
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39 #include "gtest/gtest.h"
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40
1583 9ea3d082b064 got rid of custom exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1532 diff changeset	41 #include "../Core/OrthancException.h"
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	42 #include "../Core/Toolbox.h"
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43 #include "../Core/Lua/LuaFunctionCall.h"
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4031 diff changeset	45 #include <OrthancServerResources.h>
4031 e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	46
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	47 #include <boost/lexical_cast.hpp>
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	48
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	49 #if !defined(UNIT_TESTS_WITH_HTTP_CONNEXIONS)
1532 b5eb5210af91 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1448 diff changeset	50 #error "Please set UNIT_TESTS_WITH_HTTP_CONNEXIONS to 0 or 1"
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	51 #endif
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	52
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53
712 9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	54 TEST(Lua, Json)
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55 {
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	56 Orthanc::LuaContext lua;
3992 f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	57
f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	58 #if ORTHANC_UNIT_TESTS_LINK_FRAMEWORK != 1
4031 e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	59 {
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	60 std::string command;
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	61 Orthanc::ServerResources::GetFileResource(command, Orthanc::ServerResources::LUA_TOOLBOX);
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	62 lua.Execute(command);
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	63 }
3992 f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	64 #endif
4031 e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	65
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	66 lua.Execute("a={}");
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	67 lua.Execute("a['x'] = 10");
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	68 lua.Execute("a['y'] = {}");
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	69 lua.Execute("a['y'][1] = 20");
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	70 lua.Execute("a['y'][2] = 20");
3992 f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	71
f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	72 #if ORTHANC_UNIT_TESTS_LINK_FRAMEWORK != 1
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	73 lua.Execute("PrintRecursive(a)");
3992 f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	74 #endif
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	76 lua.Execute("function f(a) print(a.bool) return a.bool,20,30,40,50,60 end");
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	78 Json::Value v, vv, o;
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	79 //v["a"] = "b";
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	80 v.append("hello");
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	81 v.append("world");
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	82 v.append("42");
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	83 vv.append("sub");
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	84 vv.append("set");
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	85 v.append(vv);
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	86 o = Json::objectValue;
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	87 o["x"] = 10;
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	88 o["y"] = 20;
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	89 o["z"] = 20.5f;
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	90 v.append(o);
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91
3992 f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	92 #if ORTHANC_UNIT_TESTS_LINK_FRAMEWORK != 1
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	93 {
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	94 Orthanc::LuaFunctionCall f(lua, "PrintRecursive");
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	95 f.PushJson(v);
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	96 f.Execute();
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	97 }
3992 f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	98 #endif
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	100 {
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	101 Orthanc::LuaFunctionCall f(lua, "f");
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	102 f.PushJson(o);
1583 9ea3d082b064 got rid of custom exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1532 diff changeset	103 ASSERT_THROW(f.ExecutePredicate(), Orthanc::OrthancException);
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	104 }
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	105
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	106 o["bool"] = false;
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	107
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	108 {
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	109 Orthanc::LuaFunctionCall f(lua, "f");
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	110 f.PushJson(o);
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	111 ASSERT_FALSE(f.ExecutePredicate());
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	112 }
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	113
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	114 o["bool"] = true;
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	115
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	116 {
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	117 Orthanc::LuaFunctionCall f(lua, "f");
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	118 f.PushJson(o);
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	119 ASSERT_TRUE(f.ExecutePredicate());
386 7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	120 }
7dec4f3c922c lua wrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121 }
397 941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	122
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	123
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	124 TEST(Lua, Existing)
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	125 {
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	126 Orthanc::LuaContext lua;
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	127 lua.Execute("a={}");
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	128 lua.Execute("function f() end");
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	129
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	130 ASSERT_TRUE(lua.IsExistingFunction("f"));
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	131 ASSERT_FALSE(lua.IsExistingFunction("a"));
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	132 ASSERT_FALSE(lua.IsExistingFunction("Dummy"));
941ea46e9e26 lua filter of new instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 386 diff changeset	133 }
712 9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	134
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	135
3992 f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	136 #if ORTHANC_UNIT_TESTS_LINK_FRAMEWORK != 1
712 9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	137 TEST(Lua, Simple)
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	138 {
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	139 Orthanc::LuaContext lua;
4031 e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	140
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	141 {
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	142 std::string command;
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	143 Orthanc::ServerResources::GetFileResource(command, Orthanc::ServerResources::LUA_TOOLBOX);
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	144 lua.Execute(command);
e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	145 }
712 9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	146
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	147 {
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	148 Orthanc::LuaFunctionCall f(lua, "PrintRecursive");
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	149 f.PushString("hello");
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	150 f.Execute();
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	151 }
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	152
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	153 {
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	154 Orthanc::LuaFunctionCall f(lua, "PrintRecursive");
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	155 f.PushBoolean(true);
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	156 f.Execute();
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	157 }
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	158
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	159 {
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	160 Orthanc::LuaFunctionCall f(lua, "PrintRecursive");
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	161 f.PushInteger(42);
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	162 f.Execute();
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	163 }
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	164
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	165 {
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	166 Orthanc::LuaFunctionCall f(lua, "PrintRecursive");
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	167 f.PushDouble(3.1415);
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	168 f.Execute();
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	169 }
9e3f21441903 lua tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 632 diff changeset	170 }
3992 f9863630ec7f working on the shared library for Orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	171 #endif
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	172
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	173
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	174 TEST(Lua, ReturnJson)
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	175 {
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	176 Json::Value b = Json::objectValue;
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	177 b["a"] = 42;
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	178 b["b"] = 44.37;
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	179 b["c"] = -43;
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	180
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	181 Json::Value c = Json::arrayValue;
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	182 c.append("test3");
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	183 c.append("test1");
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	184 c.append("test2");
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	185
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	186 Json::Value a = Json::objectValue;
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	187 a["Hello"] = "World";
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	188 a["List"] = Json::arrayValue;
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	189 a["List"].append(b);
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	190 a["List"].append(c);
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	191
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	192 Orthanc::LuaContext lua;
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	193
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	194 // This is the identity function (it simply returns its input)
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	195 lua.Execute("function identity(a) return a end");
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	196
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	197 {
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	198 Orthanc::LuaFunctionCall f(lua, "identity");
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	199 f.PushJson("hello");
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	200 Json::Value v;
1659 87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	201 f.ExecuteToJson(v, false);
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	202 ASSERT_EQ("hello", v.asString());
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	203 }
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	204
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	205 {
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	206 Orthanc::LuaFunctionCall f(lua, "identity");
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	207 f.PushJson(42.25);
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	208 Json::Value v;
1659 87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	209 f.ExecuteToJson(v, false);
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	210 ASSERT_FLOAT_EQ(42.25f, v.asFloat());
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	211 }
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	212
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	213 {
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	214 Orthanc::LuaFunctionCall f(lua, "identity");
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	215 f.PushJson(-42);
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	216 Json::Value v;
1659 87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	217 f.ExecuteToJson(v, false);
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	218 ASSERT_EQ(-42, v.asInt());
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	219 }
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	220
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	221 {
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	222 Orthanc::LuaFunctionCall f(lua, "identity");
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	223 Json::Value vv = Json::arrayValue;
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	224 f.PushJson(vv);
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	225 Json::Value v;
1659 87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	226 f.ExecuteToJson(v, false);
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	227 ASSERT_EQ(Json::arrayValue, v.type());
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	228 }
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	229
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	230 {
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	231 Orthanc::LuaFunctionCall f(lua, "identity");
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	232 Json::Value vv = Json::objectValue;
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	233 f.PushJson(vv);
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	234 Json::Value v;
1659 87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	235 f.ExecuteToJson(v, false);
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	236 // Lua does not make the distinction between empty lists and empty objects
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	237 ASSERT_EQ(Json::arrayValue, v.type());
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	238 }
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	239
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	240 {
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	241 Orthanc::LuaFunctionCall f(lua, "identity");
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	242 f.PushJson(b);
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	243 Json::Value v;
1659 87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	244 f.ExecuteToJson(v, false);
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	245 ASSERT_EQ(Json::objectValue, v.type());
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	246 ASSERT_FLOAT_EQ(42.0f, v["a"].asFloat());
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	247 ASSERT_FLOAT_EQ(44.37f, v["b"].asFloat());
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	248 ASSERT_FLOAT_EQ(-43.0f, v["c"].asFloat());
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	249 }
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	250
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	251 {
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	252 Orthanc::LuaFunctionCall f(lua, "identity");
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	253 f.PushJson(c);
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	254 Json::Value v;
1659 87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	255 f.ExecuteToJson(v, false);
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	256 ASSERT_EQ(Json::arrayValue, v.type());
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	257 ASSERT_EQ("test3", v[0].asString());
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	258 ASSERT_EQ("test1", v[1].asString());
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	259 ASSERT_EQ("test2", v[2].asString());
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	260 }
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	261
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	262 {
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	263 Orthanc::LuaFunctionCall f(lua, "identity");
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	264 f.PushJson(a);
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	265 Json::Value v;
1659 87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	266 f.ExecuteToJson(v, false);
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	267 ASSERT_EQ("World", v["Hello"].asString());
1659 87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	268 ASSERT_EQ(Json::intValue, v["List"][0]["a"].type());
87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	269 ASSERT_EQ(Json::realValue, v["List"][0]["b"].type());
87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	270 ASSERT_EQ(Json::intValue, v["List"][0]["c"].type());
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	271 ASSERT_EQ(42, v["List"][0]["a"].asInt());
1659 87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	272 ASSERT_FLOAT_EQ(44.37f, v["List"][0]["b"].asFloat());
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	273 ASSERT_EQ(44, v["List"][0]["b"].asInt());
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	274 ASSERT_EQ(-43, v["List"][0]["c"].asInt());
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	275 ASSERT_EQ("test3", v["List"][1][0].asString());
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	276 ASSERT_EQ("test1", v["List"][1][1].asString());
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	277 ASSERT_EQ("test2", v["List"][1][2].asString());
1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	278 }
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	279
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	280 {
1659 87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	281 Orthanc::LuaFunctionCall f(lua, "identity");
87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	282 f.PushJson(a);
87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	283 Json::Value v;
87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	284 f.ExecuteToJson(v, true);
87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	285 ASSERT_EQ("World", v["Hello"].asString());
87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	286 ASSERT_EQ(Json::stringValue, v["List"][0]["a"].type());
87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	287 ASSERT_EQ(Json::stringValue, v["List"][0]["b"].type());
87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	288 ASSERT_EQ(Json::stringValue, v["List"][0]["c"].type());
1966 8c506670f3cd fix unit tests for recent JsonCpp releases Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	289 ASSERT_FLOAT_EQ(42.0f, boost::lexical_cast<float>(v["List"][0]["a"].asString()));
8c506670f3cd fix unit tests for recent JsonCpp releases Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	290 ASSERT_FLOAT_EQ(44.37f, boost::lexical_cast<float>(v["List"][0]["b"].asString()));
8c506670f3cd fix unit tests for recent JsonCpp releases Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	291 ASSERT_FLOAT_EQ(-43.0f, boost::lexical_cast<float>(v["List"][0]["c"].asString()));
1659 87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	292 ASSERT_EQ("test3", v["List"][1][0].asString());
87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	293 ASSERT_EQ("test1", v["List"][1][1].asString());
87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	294 ASSERT_EQ("test2", v["List"][1][2].asString());
87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	295 }
87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	296
87a606265de8 fix tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1583 diff changeset	297 {
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	298 Orthanc::LuaFunctionCall f(lua, "DumpJson");
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	299 f.PushJson(a);
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	300 std::string s;
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	301 f.ExecuteToString(s);
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	302
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	303 Json::FastWriter writer;
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	304 std::string t = writer.write(a);
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	305
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	306 ASSERT_EQ(s, t);
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	307 }
997 1b1d51e9f1a2 return Json from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 967 diff changeset	308 }
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	309
1448 3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	310
3f7722179467 refactoring: GetJson in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1439 diff changeset	311
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	312 TEST(Lua, Http)
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	313 {
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	314 Orthanc::LuaContext lua;
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	315
2363 f8ef157f2d73 fix unit tests given www.orthanc-server.com now mandatory uses HTTPS Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	316 #if UNIT_TESTS_WITH_HTTP_CONNEXIONS == 1
2386 883387e2b379 remove dependendy upon ULg Montefiore Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2363 diff changeset	317 // The "http://www.orthanc-server.com/downloads/third-party/" does
883387e2b379 remove dependendy upon ULg Montefiore Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2363 diff changeset	318 // not automatically redirect to HTTPS, so we cas use it even if the
883387e2b379 remove dependendy upon ULg Montefiore Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2363 diff changeset	319 // OpenSSL/HTTPS support is disabled in curl
883387e2b379 remove dependendy upon ULg Montefiore Web server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2363 diff changeset	320 const std::string BASE = "http://www.orthanc-server.com/downloads/third-party/";
2363 f8ef157f2d73 fix unit tests given www.orthanc-server.com now mandatory uses HTTPS Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	321
2947 11f8d72f366f Lua 5.3.5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	322 #if LUA_VERSION_NUM >= 502
11f8d72f366f Lua 5.3.5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	323 // Since Lua >= 5.2.0, the function "loadstring" has been replaced by "load"
11f8d72f366f Lua 5.3.5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	324 lua.Execute("JSON = load(HttpGet('" + BASE + "JSON.lua')) ()");
11f8d72f366f Lua 5.3.5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	325 #else
2363 f8ef157f2d73 fix unit tests given www.orthanc-server.com now mandatory uses HTTPS Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	326 lua.Execute("JSON = loadstring(HttpGet('" + BASE + "JSON.lua')) ()");
2947 11f8d72f366f Lua 5.3.5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	327 #endif
11f8d72f366f Lua 5.3.5 Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	328
2363 f8ef157f2d73 fix unit tests given www.orthanc-server.com now mandatory uses HTTPS Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	329 const std::string url(BASE + "Product.json");
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	330 #endif
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	331
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	332 std::string s;
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	333 lua.Execute(s, "print(HttpGet({}))");
1439 354640db5a7f fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1396 diff changeset	334 ASSERT_EQ("nil", Orthanc::Toolbox::StripSpaces(s));
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	335
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	336 #if UNIT_TESTS_WITH_HTTP_CONNEXIONS == 1
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	337 lua.Execute(s, "print(string.len(HttpGet(\"" + url + "\")))");
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	338 ASSERT_LE(100, boost::lexical_cast<int>(Orthanc::Toolbox::StripSpaces(s)));
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	339
92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	340 // Parse a JSON file
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	341 lua.Execute(s, "print(JSON:decode(HttpGet(\"" + url + "\")) ['Product'])");
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	342 ASSERT_EQ("OrthancClient", Orthanc::Toolbox::StripSpaces(s));
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	343
1056 03c738276a04 oups Sebastien Jodogne <s.jodogne@gmail.com> parents: 1055 diff changeset	344 #if 0
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	345 // This part of the test can only be executed if one instance of
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	346 // Orthanc is running on the localhost
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	347
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	348 lua.Execute("modality = {}");
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	349 lua.Execute("table.insert(modality, 'ORTHANC')");
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	350 lua.Execute("table.insert(modality, 'localhost')");
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	351 lua.Execute("table.insert(modality, 4242)");
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	352
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	353 lua.Execute(s, "print(HttpPost(\"http://localhost:8042/tools/execute-script\", \"print('hello world')\"))");
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	354 ASSERT_EQ("hello world", Orthanc::Toolbox::StripSpaces(s));
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	355
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	356 lua.Execute(s, "print(JSON:decode(HttpPost(\"http://localhost:8042/tools/execute-script\", \"print('[10,42,1000]')\")) [2])");
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	357 ASSERT_EQ("42", Orthanc::Toolbox::StripSpaces(s));
1055 6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	358
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	359 // Add/remove a modality with Lua
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	360 Json::Value v;
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	361 lua.Execute(s, "print(HttpGet('http://localhost:8042/modalities/lua'))");
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	362 ASSERT_EQ(0, Orthanc::Toolbox::StripSpaces(s).size());
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	363 lua.Execute(s, "print(HttpPut('http://localhost:8042/modalities/lua', JSON:encode(modality)))");
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	364 lua.Execute(v, "print(HttpGet('http://localhost:8042/modalities/lua'))");
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	365 ASSERT_TRUE(v.type() == Json::arrayValue);
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	366 lua.Execute(s, "print(HttpDelete('http://localhost:8042/modalities/lua'))");
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	367 lua.Execute(s, "print(HttpGet('http://localhost:8042/modalities/lua'))");
6f923d52a46c call Web services from Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1053 diff changeset	368 ASSERT_EQ(0, Orthanc::Toolbox::StripSpaces(s).size());
1052 cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	369 #endif
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	370
cc4ff680e2a0 http requests in lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 1051 diff changeset	371 #endif
1051 92f4bf2c5d73 HTTP GET in Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 997 diff changeset	372 }

Mercurial > hg > orthanc

annotate UnitTestsSources/LuaTests.cpp @ 4032:058b5ade8acd