orthanc: OrthancFramework/UnitTestsSources/JobsTests.cpp annotate

annotate OrthancFramework/UnitTestsSources/JobsTests.cpp @ 5014:bedc27c0da5b

todo

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 08 Jun 2022 18:16:18 +0200
parents	6d4e8d90ca02
children	0ea402b4d901

rev	line source
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	1 /**
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1681 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1009 diff changeset	4 * Department, University Hospital of Liege, Belgium
4870 43e613a7756b upgrade to year 2022 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	5 * Copyright (C) 2017-2022 Osimis S.A., Belgium
43e613a7756b upgrade to year 2022 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4831 diff changeset	6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	7 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	8 * This program is free software: you can redistribute it and/or
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	9 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	10 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	11 * the License, or (at your option) any later version.
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	12 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	13 * 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: 776 diff changeset	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	16 * Lesser General Public License for more details.
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	17 *
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	18 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	19 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4063 diff changeset	20 * <http://www.gnu.org/licenses/>.
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	21 **/
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	22
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 776 diff changeset	23
4060 149172a06b4d splitting MultiThreadingTests.cpp into JobsTests.cpp and ServerJobsTests.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	24 #if ORTHANC_UNIT_TESTS_LINK_FRAMEWORK == 1
4063 e00f3d089991 shared library of orthanc framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	25 // Must be the first to be sure to use the Orthanc framework shared library
4060 149172a06b4d splitting MultiThreadingTests.cpp into JobsTests.cpp and ServerJobsTests.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	26 # include <OrthancFramework.h>
149172a06b4d splitting MultiThreadingTests.cpp into JobsTests.cpp and ServerJobsTests.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	27 #endif
149172a06b4d splitting MultiThreadingTests.cpp into JobsTests.cpp and ServerJobsTests.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	28
4062 0953b3dc3261 pretty-printing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4060 diff changeset	29 #include <gtest/gtest.h>
723 0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	31 #include "../../OrthancFramework/Sources/Compatibility.h"
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	32 #include "../../OrthancFramework/Sources/DicomNetworking/DicomAssociationParameters.h"
4060 149172a06b4d splitting MultiThreadingTests.cpp into JobsTests.cpp and ServerJobsTests.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	33 #include "../../OrthancFramework/Sources/DicomNetworking/RemoteModalityParameters.h"
149172a06b4d splitting MultiThreadingTests.cpp into JobsTests.cpp and ServerJobsTests.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	34 #include "../../OrthancFramework/Sources/DicomParsing/DicomModification.h"
149172a06b4d splitting MultiThreadingTests.cpp into JobsTests.cpp and ServerJobsTests.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	35 #include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h"
149172a06b4d splitting MultiThreadingTests.cpp into JobsTests.cpp and ServerJobsTests.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	36 #include "../../OrthancFramework/Sources/JobsEngine/GenericJobUnserializer.h"
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	37 #include "../../OrthancFramework/Sources/JobsEngine/JobsEngine.h"
4060 149172a06b4d splitting MultiThreadingTests.cpp into JobsTests.cpp and ServerJobsTests.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	38 #include "../../OrthancFramework/Sources/JobsEngine/Operations/JobOperationValues.h"
149172a06b4d splitting MultiThreadingTests.cpp into JobsTests.cpp and ServerJobsTests.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	39 #include "../../OrthancFramework/Sources/JobsEngine/Operations/LogJobOperation.h"
149172a06b4d splitting MultiThreadingTests.cpp into JobsTests.cpp and ServerJobsTests.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	40 #include "../../OrthancFramework/Sources/JobsEngine/Operations/NullOperationValue.h"
149172a06b4d splitting MultiThreadingTests.cpp into JobsTests.cpp and ServerJobsTests.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	41 #include "../../OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.h"
149172a06b4d splitting MultiThreadingTests.cpp into JobsTests.cpp and ServerJobsTests.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	42 #include "../../OrthancFramework/Sources/JobsEngine/Operations/StringOperationValue.h"
149172a06b4d splitting MultiThreadingTests.cpp into JobsTests.cpp and ServerJobsTests.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	43 #include "../../OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.h"
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	44 #include "../../OrthancFramework/Sources/Logging.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	45 #include "../../OrthancFramework/Sources/MultiThreading/SharedMessageQueue.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	46 #include "../../OrthancFramework/Sources/OrthancException.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	47 #include "../../OrthancFramework/Sources/SerializationToolbox.h"
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	48
723 0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 using namespace Orthanc;
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52 namespace
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53 {
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	54 class DummyJob : public IJob
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	55 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	56 private:
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	57 bool fails_;
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	58 unsigned int count_;
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	59 unsigned int steps_;
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	60
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	61 public:
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	62 DummyJob() :
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	63 fails_(false),
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	64 count_(0),
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	65 steps_(4)
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	66 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	67 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	68
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	69 explicit DummyJob(bool fails) :
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	70 fails_(fails),
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	71 count_(0),
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	72 steps_(4)
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	73 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	74 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	75
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2872 diff changeset	76 virtual void Start() ORTHANC_OVERRIDE
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	77 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	78 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	79
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2872 diff changeset	80 virtual void Reset() ORTHANC_OVERRIDE
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	81 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	82 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	83
3658 2d90dd30858c providing job ID to the IJob::Step() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	84 virtual JobStepResult Step(const std::string& jobId) ORTHANC_OVERRIDE
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	85 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	86 if (fails_)
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	87 {
3240 e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	88 return JobStepResult::Failure(ErrorCode_ParameterOutOfRange, NULL);
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	89 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	90 else if (count_ == steps_ - 1)
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	91 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	92 return JobStepResult::Success();
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	93 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	94 else
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	95 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	96 count_++;
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	97 return JobStepResult::Continue();
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	98 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	99 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	100
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2872 diff changeset	101 virtual void Stop(JobStopReason reason) ORTHANC_OVERRIDE
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	102 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	103 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	104
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2872 diff changeset	105 virtual float GetProgress() ORTHANC_OVERRIDE
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	106 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	107 return static_cast<float>(count_) / static_cast<float>(steps_ - 1);
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	108 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	109
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2872 diff changeset	110 virtual void GetJobType(std::string& type) ORTHANC_OVERRIDE
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	111 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	112 type = "DummyJob";
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	113 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	114
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2872 diff changeset	115 virtual bool Serialize(Json::Value& value) ORTHANC_OVERRIDE
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	116 {
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	117 value = Json::objectValue;
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	118 value["Type"] = "DummyJob";
2663 228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	119 return true;
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	120 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	121
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2872 diff changeset	122 virtual void GetPublicContent(Json::Value& value) ORTHANC_OVERRIDE
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	123 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	124 value["hello"] = "world";
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	125 }
2976 cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2966 diff changeset	126
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2966 diff changeset	127 virtual bool GetOutput(std::string& output,
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2966 diff changeset	128 MimeType& mime,
4805 0a38000b086d Archive jobs response now contains a header Content-Disposition:filename='archive.zip' Alain Mazy <am@osimis.io> parents: 4779 diff changeset	129 std::string& filename,
2976 cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2966 diff changeset	130 const std::string& key) ORTHANC_OVERRIDE
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2966 diff changeset	131 {
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2966 diff changeset	132 return false;
cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2966 diff changeset	133 }
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	134 };
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	135
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	136
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	137 class DummyInstancesJob : public SetOfInstancesJob
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	138 {
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	139 private:
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	140 bool trailingStepDone_;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	141
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	142 protected:
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2872 diff changeset	143 virtual bool HandleInstance(const std::string& instance) ORTHANC_OVERRIDE
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	144 {
2657 5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	145 return (instance != "nope");
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	146 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	147
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2872 diff changeset	148 virtual bool HandleTrailingStep() ORTHANC_OVERRIDE
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	149 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	150 if (HasTrailingStep())
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	151 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	152 if (trailingStepDone_)
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	153 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	154 throw OrthancException(ErrorCode_InternalError);
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	155 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	156 else
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	157 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	158 trailingStepDone_ = true;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	159 return true;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	160 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	161 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	162 else
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	163 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	164 throw OrthancException(ErrorCode_InternalError);
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	165 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	166 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	167
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	168 public:
2860 8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	169 DummyInstancesJob() :
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	170 trailingStepDone_(false)
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	171 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	172 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	173
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	174 explicit DummyInstancesJob(const Json::Value& value) :
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	175 SetOfInstancesJob(value)
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	176 {
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	177 if (HasTrailingStep())
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	178 {
2860 8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	179 trailingStepDone_ = (GetPosition() == GetCommandsCount());
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	180 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	181 else
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	182 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	183 trailingStepDone_ = false;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	184 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	185 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	186
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	187 bool IsTrailingStepDone() const
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	188 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	189 return trailingStepDone_;
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	190 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	191
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2872 diff changeset	192 virtual void Stop(JobStopReason reason) ORTHANC_OVERRIDE
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	193 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	194 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	195
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2872 diff changeset	196 virtual void GetJobType(std::string& s) ORTHANC_OVERRIDE
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	197 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	198 s = "DummyInstancesJob";
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	199 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	200 };
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	201
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	202
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	203 class DummyUnserializer : public GenericJobUnserializer
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	204 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	205 public:
2924 22524fd06225 macros ORTHANC_OVERRIDE and ORTHANC_FINAL Sebastien Jodogne <s.jodogne@gmail.com> parents: 2872 diff changeset	206 virtual IJob* UnserializeJob(const Json::Value& value) ORTHANC_OVERRIDE
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	207 {
2656 a6d3e45eeff5 SerializationToolbox Sebastien Jodogne <s.jodogne@gmail.com> parents: 2655 diff changeset	208 if (SerializationToolbox::ReadString(value, "Type") == "DummyInstancesJob")
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	209 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	210 return new DummyInstancesJob(value);
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	211 }
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	212 else if (SerializationToolbox::ReadString(value, "Type") == "DummyJob")
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	213 {
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	214 return new DummyJob;
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	215 }
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	216 else
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	217 {
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	218 return GenericJobUnserializer::UnserializeJob(value);
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	219 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	220 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	221 };
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	222
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	223
1396 ac4efabeb80c Migration of the orthanc-client as a separate project Sebastien Jodogne <s.jodogne@gmail.com> parents: 1304 diff changeset	224 class DynamicInteger : public IDynamicObject
723 0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225 {
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226 private:
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227 int value_;
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	228 std::set<int>& target_;
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230 public:
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	231 DynamicInteger(int value, std::set<int>& target) :
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232 value_(value), target_(target)
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233 {
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234 }
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	235
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 int GetValue() const
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237 {
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238 return value_;
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239 }
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 };
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241 }
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 TEST(MultiThreading, SharedMessageQueueBasic)
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245 {
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246 std::set<int> s;
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 SharedMessageQueue q;
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249 ASSERT_TRUE(q.WaitEmpty(0));
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250 q.Enqueue(new DynamicInteger(10, s));
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251 ASSERT_FALSE(q.WaitEmpty(1));
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 q.Enqueue(new DynamicInteger(20, s));
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 q.Enqueue(new DynamicInteger(30, s));
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 q.Enqueue(new DynamicInteger(40, s));
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	256 std::unique_ptr<DynamicInteger> i;
723 0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	257 i.reset(dynamic_cast<DynamicInteger*>(q.Dequeue(1))); ASSERT_EQ(10, i->GetValue());
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	258 i.reset(dynamic_cast<DynamicInteger*>(q.Dequeue(1))); ASSERT_EQ(20, i->GetValue());
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	259 i.reset(dynamic_cast<DynamicInteger*>(q.Dequeue(1))); ASSERT_EQ(30, i->GetValue());
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	260 ASSERT_FALSE(q.WaitEmpty(1));
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	261 i.reset(dynamic_cast<DynamicInteger*>(q.Dequeue(1))); ASSERT_EQ(40, i->GetValue());
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	262 ASSERT_TRUE(q.WaitEmpty(0));
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	263 ASSERT_EQ(NULL, q.Dequeue(1));
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	264 }
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	265
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 TEST(MultiThreading, SharedMessageQueueClean)
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268 {
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	269 std::set<int> s;
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	270
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	271 try
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	272 {
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	273 SharedMessageQueue q;
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	274 q.Enqueue(new DynamicInteger(10, s));
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	275 q.Enqueue(new DynamicInteger(20, s));
1583 9ea3d082b064 got rid of custom exceptions Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	276 throw OrthancException(ErrorCode_InternalError);
723 0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	277 }
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	278 catch (OrthancException&)
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	279 {
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	280 }
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	281 }
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	282
0da078f3affc multithreading tests Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	283
769 3f946e5c3802 ReusableDicomUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	284
3f946e5c3802 ReusableDicomUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 760 diff changeset	285
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	286 static bool CheckState(JobsRegistry& registry,
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	287 const std::string& id,
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	288 JobState state)
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	289 {
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	290 JobState s;
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	291 if (registry.GetState(s, id))
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	292 {
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	293 return state == s;
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	294 }
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	295 else
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	296 {
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	297 return false;
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	298 }
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	299 }
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	300
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	301
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	302 static bool CheckErrorCode(JobsRegistry& registry,
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	303 const std::string& id,
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	304 ErrorCode code)
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	305 {
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	306 JobInfo s;
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	307 if (registry.GetJobInfo(s, id))
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	308 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	309 return code == s.GetStatus().GetErrorCode();
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	310 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	311 else
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	312 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	313 return false;
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	314 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	315 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	316
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	317
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	318 TEST(JobsRegistry, Priority)
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	319 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2924 diff changeset	320 JobsRegistry registry(10);
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	321
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	322 std::string i1, i2, i3, i4;
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	323 registry.Submit(i1, new DummyJob(), 10);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	324 registry.Submit(i2, new DummyJob(), 30);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	325 registry.Submit(i3, new DummyJob(), 20);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	326 registry.Submit(i4, new DummyJob(), 5);
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	327
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	328 registry.SetMaxCompletedJobs(2);
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	329
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	330 std::set<std::string> id;
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	331 registry.ListJobs(id);
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	332
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	333 ASSERT_EQ(4u, id.size());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	334 ASSERT_TRUE(id.find(i1) != id.end());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	335 ASSERT_TRUE(id.find(i2) != id.end());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	336 ASSERT_TRUE(id.find(i3) != id.end());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	337 ASSERT_TRUE(id.find(i4) != id.end());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	338
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	339 ASSERT_TRUE(CheckState(registry, i2, JobState_Pending));
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	340
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	341 {
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	342 JobsRegistry::RunningJob job(registry, 0);
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	343 ASSERT_TRUE(job.IsValid());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	344 ASSERT_EQ(30, job.GetPriority());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	345 ASSERT_EQ(i2, job.GetId());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	346
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	347 ASSERT_TRUE(CheckState(registry, i2, JobState_Running));
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	348 }
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	349
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	350 ASSERT_TRUE(CheckState(registry, i2, JobState_Failure));
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	351 ASSERT_TRUE(CheckState(registry, i3, JobState_Pending));
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	352
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	353 {
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	354 JobsRegistry::RunningJob job(registry, 0);
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	355 ASSERT_TRUE(job.IsValid());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	356 ASSERT_EQ(20, job.GetPriority());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	357 ASSERT_EQ(i3, job.GetId());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	358
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	359 job.MarkSuccess();
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	360
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	361 ASSERT_TRUE(CheckState(registry, i3, JobState_Running));
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	362 }
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	363
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	364 ASSERT_TRUE(CheckState(registry, i3, JobState_Success));
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	365
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	366 {
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	367 JobsRegistry::RunningJob job(registry, 0);
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	368 ASSERT_TRUE(job.IsValid());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	369 ASSERT_EQ(10, job.GetPriority());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	370 ASSERT_EQ(i1, job.GetId());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	371 }
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	372
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	373 {
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	374 JobsRegistry::RunningJob job(registry, 0);
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	375 ASSERT_TRUE(job.IsValid());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	376 ASSERT_EQ(5, job.GetPriority());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	377 ASSERT_EQ(i4, job.GetId());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	378 }
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	379
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	380 {
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	381 JobsRegistry::RunningJob job(registry, 1);
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	382 ASSERT_FALSE(job.IsValid());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	383 }
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	384
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	385 JobState s;
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	386 ASSERT_TRUE(registry.GetState(s, i1));
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	387 ASSERT_FALSE(registry.GetState(s, i2)); // Removed because oldest
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	388 ASSERT_FALSE(registry.GetState(s, i3)); // Removed because second oldest
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	389 ASSERT_TRUE(registry.GetState(s, i4));
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	390
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	391 registry.SetMaxCompletedJobs(1); // (*)
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	392 ASSERT_FALSE(registry.GetState(s, i1)); // Just discarded by (*)
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	393 ASSERT_TRUE(registry.GetState(s, i4));
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	394 }
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	395
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	396
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	397 TEST(JobsRegistry, Simultaneous)
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	398 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2924 diff changeset	399 JobsRegistry registry(10);
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	400
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	401 std::string i1, i2;
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	402 registry.Submit(i1, new DummyJob(), 20);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	403 registry.Submit(i2, new DummyJob(), 10);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	404
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	405 ASSERT_TRUE(CheckState(registry, i1, JobState_Pending));
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	406 ASSERT_TRUE(CheckState(registry, i2, JobState_Pending));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	407
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	408 {
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	409 JobsRegistry::RunningJob job1(registry, 0);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	410 JobsRegistry::RunningJob job2(registry, 0);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	411
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	412 ASSERT_TRUE(job1.IsValid());
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	413 ASSERT_TRUE(job2.IsValid());
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	414
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	415 job1.MarkFailure();
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	416 job2.MarkSuccess();
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	417
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	418 ASSERT_TRUE(CheckState(registry, i1, JobState_Running));
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	419 ASSERT_TRUE(CheckState(registry, i2, JobState_Running));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	420 }
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	421
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	422 ASSERT_TRUE(CheckState(registry, i1, JobState_Failure));
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	423 ASSERT_TRUE(CheckState(registry, i2, JobState_Success));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	424 }
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	425
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	426
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	427 TEST(JobsRegistry, Resubmit)
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	428 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2924 diff changeset	429 JobsRegistry registry(10);
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	430
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	431 std::string id;
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	432 registry.Submit(id, new DummyJob(), 10);
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	433
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	434 ASSERT_TRUE(CheckState(registry, id, JobState_Pending));
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	435
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	436 registry.Resubmit(id);
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	437 ASSERT_TRUE(CheckState(registry, id, JobState_Pending));
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	438
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	439 {
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	440 JobsRegistry::RunningJob job(registry, 0);
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	441 ASSERT_TRUE(job.IsValid());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	442 job.MarkFailure();
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	443
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	444 ASSERT_TRUE(CheckState(registry, id, JobState_Running));
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	445
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	446 registry.Resubmit(id);
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	447 ASSERT_TRUE(CheckState(registry, id, JobState_Running));
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	448 }
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	449
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	450 ASSERT_TRUE(CheckState(registry, id, JobState_Failure));
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	451
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	452 registry.Resubmit(id);
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	453 ASSERT_TRUE(CheckState(registry, id, JobState_Pending));
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	454
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	455 {
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	456 JobsRegistry::RunningJob job(registry, 0);
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	457 ASSERT_TRUE(job.IsValid());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	458 ASSERT_EQ(id, job.GetId());
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	459
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	460 job.MarkSuccess();
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	461 ASSERT_TRUE(CheckState(registry, id, JobState_Running));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	462 }
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	463
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	464 ASSERT_TRUE(CheckState(registry, id, JobState_Success));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	465
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	466 registry.Resubmit(id);
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	467 ASSERT_TRUE(CheckState(registry, id, JobState_Success));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	468 }
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	469
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	470
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	471 TEST(JobsRegistry, Retry)
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	472 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2924 diff changeset	473 JobsRegistry registry(10);
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	474
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	475 std::string id;
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	476 registry.Submit(id, new DummyJob(), 10);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	477
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	478 ASSERT_TRUE(CheckState(registry, id, JobState_Pending));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	479
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	480 {
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	481 JobsRegistry::RunningJob job(registry, 0);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	482 ASSERT_TRUE(job.IsValid());
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	483 job.MarkRetry(0);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	484
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	485 ASSERT_TRUE(CheckState(registry, id, JobState_Running));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	486 }
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	487
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	488 ASSERT_TRUE(CheckState(registry, id, JobState_Retry));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	489
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	490 registry.Resubmit(id);
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	491 ASSERT_TRUE(CheckState(registry, id, JobState_Retry));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	492
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	493 registry.ScheduleRetries();
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	494 ASSERT_TRUE(CheckState(registry, id, JobState_Pending));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	495
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	496 {
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	497 JobsRegistry::RunningJob job(registry, 0);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	498 ASSERT_TRUE(job.IsValid());
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	499 job.MarkSuccess();
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	500
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	501 ASSERT_TRUE(CheckState(registry, id, JobState_Running));
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	502 }
b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	503
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	504 ASSERT_TRUE(CheckState(registry, id, JobState_Success));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	505 }
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	506
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	507
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	508 TEST(JobsRegistry, PausePending)
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	509 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2924 diff changeset	510 JobsRegistry registry(10);
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	511
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	512 std::string id;
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	513 registry.Submit(id, new DummyJob(), 10);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	514
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	515 ASSERT_TRUE(CheckState(registry, id, JobState_Pending));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	516
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	517 registry.Pause(id);
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	518 ASSERT_TRUE(CheckState(registry, id, JobState_Paused));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	519
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	520 registry.Pause(id);
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	521 ASSERT_TRUE(CheckState(registry, id, JobState_Paused));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	522
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	523 registry.Resubmit(id);
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	524 ASSERT_TRUE(CheckState(registry, id, JobState_Paused));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	525
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	526 registry.Resume(id);
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	527 ASSERT_TRUE(CheckState(registry, id, JobState_Pending));
2557 b4516a6f214b state machine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2556 diff changeset	528 }
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	529
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	530
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	531 TEST(JobsRegistry, PauseRunning)
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	532 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2924 diff changeset	533 JobsRegistry registry(10);
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	534
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	535 std::string id;
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	536 registry.Submit(id, new DummyJob(), 10);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	537
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	538 ASSERT_TRUE(CheckState(registry, id, JobState_Pending));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	539
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	540 {
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	541 JobsRegistry::RunningJob job(registry, 0);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	542 ASSERT_TRUE(job.IsValid());
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	543
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	544 registry.Resubmit(id);
2562 1e66fe3ddf9f refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2559 diff changeset	545 job.MarkPause();
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	546 ASSERT_TRUE(CheckState(registry, id, JobState_Running));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	547 }
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	548
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	549 ASSERT_TRUE(CheckState(registry, id, JobState_Paused));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	550
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	551 registry.Resubmit(id);
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	552 ASSERT_TRUE(CheckState(registry, id, JobState_Paused));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	553
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	554 registry.Resume(id);
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	555 ASSERT_TRUE(CheckState(registry, id, JobState_Pending));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	556
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	557 {
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	558 JobsRegistry::RunningJob job(registry, 0);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	559 ASSERT_TRUE(job.IsValid());
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	560
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	561 job.MarkSuccess();
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	562 ASSERT_TRUE(CheckState(registry, id, JobState_Running));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	563 }
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	564
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	565 ASSERT_TRUE(CheckState(registry, id, JobState_Success));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	566 }
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	567
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	568
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	569 TEST(JobsRegistry, PauseRetry)
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	570 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2924 diff changeset	571 JobsRegistry registry(10);
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	572
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	573 std::string id;
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	574 registry.Submit(id, new DummyJob(), 10);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	575
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	576 ASSERT_TRUE(CheckState(registry, id, JobState_Pending));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	577
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	578 {
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	579 JobsRegistry::RunningJob job(registry, 0);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	580 ASSERT_TRUE(job.IsValid());
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	581
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	582 job.MarkRetry(0);
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	583 ASSERT_TRUE(CheckState(registry, id, JobState_Running));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	584 }
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	585
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	586 ASSERT_TRUE(CheckState(registry, id, JobState_Retry));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	587
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	588 registry.Pause(id);
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	589 ASSERT_TRUE(CheckState(registry, id, JobState_Paused));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	590
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	591 registry.Resume(id);
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	592 ASSERT_TRUE(CheckState(registry, id, JobState_Pending));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	593
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	594 {
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	595 JobsRegistry::RunningJob job(registry, 0);
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	596 ASSERT_TRUE(job.IsValid());
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	597
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	598 job.MarkSuccess();
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	599 ASSERT_TRUE(CheckState(registry, id, JobState_Running));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	600 }
57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	601
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	602 ASSERT_TRUE(CheckState(registry, id, JobState_Success));
2558 57f81b988713 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2557 diff changeset	603 }
2565 0f06b4d5b3d0 JobsEngine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2564 diff changeset	604
0f06b4d5b3d0 JobsEngine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2564 diff changeset	605
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	606 TEST(JobsRegistry, Cancel)
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	607 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2924 diff changeset	608 JobsRegistry registry(10);
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	609
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	610 std::string id;
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	611 registry.Submit(id, new DummyJob(), 10);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	612
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	613 ASSERT_FALSE(registry.Cancel("nope"));
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	614
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	615 ASSERT_TRUE(CheckState(registry, id, JobState_Pending));
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	616 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_Success));
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	617
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	618 ASSERT_TRUE(registry.Cancel(id));
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	619 ASSERT_TRUE(CheckState(registry, id, JobState_Failure));
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	620 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob));
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	621
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	622 ASSERT_TRUE(registry.Cancel(id));
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	623 ASSERT_TRUE(CheckState(registry, id, JobState_Failure));
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	624 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob));
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	625
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	626 ASSERT_TRUE(registry.Resubmit(id));
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	627 ASSERT_TRUE(CheckState(registry, id, JobState_Pending));
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	628 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob));
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	629
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	630 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	631 JobsRegistry::RunningJob job(registry, 0);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	632 ASSERT_TRUE(job.IsValid());
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	633
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	634 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_Success));
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	635
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	636 job.MarkSuccess();
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	637 ASSERT_TRUE(CheckState(registry, id, JobState_Running));
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	638 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	639
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	640 ASSERT_TRUE(CheckState(registry, id, JobState_Success));
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	641 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_Success));
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	642
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	643 ASSERT_TRUE(registry.Cancel(id));
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	644 ASSERT_TRUE(CheckState(registry, id, JobState_Success));
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	645 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_Success));
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	646
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	647 registry.Submit(id, new DummyJob(), 10);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	648
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	649 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	650 JobsRegistry::RunningJob job(registry, 0);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	651 ASSERT_TRUE(job.IsValid());
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	652 ASSERT_EQ(id, job.GetId());
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	653
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	654 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_Success));
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	655 ASSERT_TRUE(CheckState(registry, id, JobState_Running));
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	656
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	657 job.MarkCanceled();
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	658 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	659
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	660 ASSERT_TRUE(CheckState(registry, id, JobState_Failure));
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	661 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob));
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	662
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	663 ASSERT_TRUE(registry.Resubmit(id));
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	664 ASSERT_TRUE(CheckState(registry, id, JobState_Pending));
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	665 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob));
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	666
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	667 ASSERT_TRUE(registry.Pause(id));
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	668 ASSERT_TRUE(CheckState(registry, id, JobState_Paused));
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	669 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob));
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	670
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	671 ASSERT_TRUE(registry.Cancel(id));
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	672 ASSERT_TRUE(CheckState(registry, id, JobState_Failure));
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	673 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob));
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	674
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	675 ASSERT_TRUE(registry.Resubmit(id));
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	676 ASSERT_TRUE(CheckState(registry, id, JobState_Pending));
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	677 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob));
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	678
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	679 {
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	680 JobsRegistry::RunningJob job(registry, 0);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	681 ASSERT_TRUE(job.IsValid());
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	682 ASSERT_EQ(id, job.GetId());
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	683
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	684 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_Success));
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	685 ASSERT_TRUE(CheckState(registry, id, JobState_Running));
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	686
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	687 job.MarkRetry(500);
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	688 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	689
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	690 ASSERT_TRUE(CheckState(registry, id, JobState_Retry));
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	691 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_Success));
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	692
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	693 ASSERT_TRUE(registry.Cancel(id));
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	694 ASSERT_TRUE(CheckState(registry, id, JobState_Failure));
2581 8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	695 ASSERT_TRUE(CheckErrorCode(registry, id, ErrorCode_CanceledJob));
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	696 }
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	697
8da2cffc2378 JobsRegistry::Cancel() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2580 diff changeset	698
2570 2e879c796ec7 JobsRegistry::SubmitAndWait(), StoreScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2569 diff changeset	699
2599 593d6b0f4cba IJobOperation Sebastien Jodogne <s.jodogne@gmail.com> parents: 2598 diff changeset	700 TEST(JobsEngine, SubmitAndWait)
2565 0f06b4d5b3d0 JobsEngine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2564 diff changeset	701 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2924 diff changeset	702 JobsEngine engine(10);
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	703 engine.SetThreadSleep(10);
2565 0f06b4d5b3d0 JobsEngine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2564 diff changeset	704 engine.SetWorkersCount(3);
0f06b4d5b3d0 JobsEngine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2564 diff changeset	705 engine.Start();
0f06b4d5b3d0 JobsEngine Sebastien Jodogne <s.jodogne@gmail.com> parents: 2564 diff changeset	706
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2860 diff changeset	707 Json::Value content = Json::nullValue;
3240 e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	708 engine.GetRegistry().SubmitAndWait(content, new DummyJob(), rand() % 10);
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2860 diff changeset	709 ASSERT_EQ(Json::objectValue, content.type());
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2860 diff changeset	710 ASSERT_EQ("world", content["hello"].asString());
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2860 diff changeset	711
251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2860 diff changeset	712 content = Json::nullValue;
3240 e44e0127e553 Fix issue #134 (/patient/modify gives 500, should really be 400) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	713 ASSERT_THROW(engine.GetRegistry().SubmitAndWait(content, new DummyJob(true), rand() % 10), OrthancException);
2867 251614c2edac DicomMoveScuJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2860 diff changeset	714 ASSERT_EQ(Json::nullValue, content.type());
2599 593d6b0f4cba IJobOperation Sebastien Jodogne <s.jodogne@gmail.com> parents: 2598 diff changeset	715
593d6b0f4cba IJobOperation Sebastien Jodogne <s.jodogne@gmail.com> parents: 2598 diff changeset	716 engine.Stop();
593d6b0f4cba IJobOperation Sebastien Jodogne <s.jodogne@gmail.com> parents: 2598 diff changeset	717 }
593d6b0f4cba IJobOperation Sebastien Jodogne <s.jodogne@gmail.com> parents: 2598 diff changeset	718
593d6b0f4cba IJobOperation Sebastien Jodogne <s.jodogne@gmail.com> parents: 2598 diff changeset	719
2600 140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	720 TEST(JobsEngine, DISABLED_SequenceOfOperationsJob)
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	721 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2924 diff changeset	722 JobsEngine engine(10);
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	723 engine.SetThreadSleep(10);
2600 140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	724 engine.SetWorkersCount(3);
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	725 engine.Start();
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	726
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	727 std::string id;
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	728 SequenceOfOperationsJob* job = NULL;
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	729
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	730 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	731 std::unique_ptr<SequenceOfOperationsJob> a(new SequenceOfOperationsJob);
2600 140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	732 job = a.get();
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	733 engine.GetRegistry().Submit(id, a.release(), 0);
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	734 }
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	735
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	736 boost::this_thread::sleep(boost::posix_time::milliseconds(500));
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	737
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	738 {
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	739 SequenceOfOperationsJob::Lock lock(*job);
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	740 size_t i = lock.AddOperation(new LogJobOperation);
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	741 size_t j = lock.AddOperation(new LogJobOperation);
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	742 size_t k = lock.AddOperation(new LogJobOperation);
2730 cb1b26a7db98 fix mingw compilation s.jodogne@gmail.com parents: 2726 diff changeset	743
cb1b26a7db98 fix mingw compilation s.jodogne@gmail.com parents: 2726 diff changeset	744 StringOperationValue a("Hello");
cb1b26a7db98 fix mingw compilation s.jodogne@gmail.com parents: 2726 diff changeset	745 StringOperationValue b("World");
cb1b26a7db98 fix mingw compilation s.jodogne@gmail.com parents: 2726 diff changeset	746 lock.AddInput(i, a);
cb1b26a7db98 fix mingw compilation s.jodogne@gmail.com parents: 2726 diff changeset	747 lock.AddInput(i, b);
cb1b26a7db98 fix mingw compilation s.jodogne@gmail.com parents: 2726 diff changeset	748
2600 140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	749 lock.Connect(i, j);
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	750 lock.Connect(j, k);
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	751 }
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	752
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	753 boost::this_thread::sleep(boost::posix_time::milliseconds(2000));
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	754
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	755 engine.Stop();
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	756
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	757 }
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	758
140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	759
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	760 static bool CheckSameJson(const Json::Value& a,
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	761 const Json::Value& b)
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	762 {
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	763 std::string s = a.toStyledString();
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	764 std::string t = b.toStyledString();
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	765
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	766 if (s == t)
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	767 {
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	768 return true;
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	769 }
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	770 else
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	771 {
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	772 LOG(ERROR) << "Expected serialization: " << s;
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	773 LOG(ERROR) << "Actual serialization: " << t;
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	774 return false;
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	775 }
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	776 }
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	777
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	778
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	779 static bool CheckIdempotentSerialization(IJobUnserializer& unserializer,
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	780 IJob& job)
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	781 {
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	782 Json::Value a = 42;
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	783
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	784 if (!job.Serialize(a))
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	785 {
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	786 return false;
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	787 }
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	788 else
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	789 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	790 std::unique_ptr<IJob> unserialized(unserializer.UnserializeJob(a));
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	791
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	792 Json::Value b = 43;
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	793 if (unserialized->Serialize(b))
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	794 {
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	795 return (CheckSameJson(a, b));
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	796 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	797 else
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	798 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	799 return false;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	800 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	801 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	802 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	803
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	804
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	805 static bool CheckIdempotentSetOfInstances(IJobUnserializer& unserializer,
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	806 SetOfInstancesJob& job)
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	807 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	808 Json::Value a = 42;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	809
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	810 if (!job.Serialize(a))
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	811 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	812 return false;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	813 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	814 else
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	815 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	816 std::unique_ptr<SetOfInstancesJob> unserialized
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	817 (dynamic_cast<SetOfInstancesJob*>(unserializer.UnserializeJob(a)));
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	818
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	819 Json::Value b = 43;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	820 if (unserialized->Serialize(b))
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	821 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	822 return (CheckSameJson(a, b) &&
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	823 job.HasTrailingStep() == unserialized->HasTrailingStep() &&
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	824 job.GetPosition() == unserialized->GetPosition() &&
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	825 job.GetInstancesCount() == unserialized->GetInstancesCount() &&
2860 8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	826 job.GetCommandsCount() == unserialized->GetCommandsCount());
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	827 }
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	828 else
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	829 {
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	830 return false;
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	831 }
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	832 }
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	833 }
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	834
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	835
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	836 static bool CheckIdempotentSerialization(IJobUnserializer& unserializer,
4310 2ae905070221 renaming pure interface JobOperationValue as IJobOperationValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	837 const IJobOperationValue& value)
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	838 {
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	839 Json::Value a = 42;
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	840 value.Serialize(a);
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	841
4310 2ae905070221 renaming pure interface JobOperationValue as IJobOperationValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	842 std::unique_ptr<IJobOperationValue> unserialized(unserializer.UnserializeValue(a));
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	843
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	844 Json::Value b = 43;
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	845 unserialized->Serialize(b);
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	846
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	847 return CheckSameJson(a, b);
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	848 }
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	849
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	850
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	851 TEST(JobsSerialization, BadFileFormat)
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	852 {
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	853 GenericJobUnserializer unserializer;
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	854
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	855 Json::Value s;
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	856
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	857 s = Json::objectValue;
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	858 ASSERT_THROW(unserializer.UnserializeValue(s), OrthancException);
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	859 ASSERT_THROW(unserializer.UnserializeJob(s), OrthancException);
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	860 ASSERT_THROW(unserializer.UnserializeOperation(s), OrthancException);
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	861
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	862 s = Json::arrayValue;
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	863 ASSERT_THROW(unserializer.UnserializeValue(s), OrthancException);
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	864 ASSERT_THROW(unserializer.UnserializeJob(s), OrthancException);
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	865 ASSERT_THROW(unserializer.UnserializeOperation(s), OrthancException);
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	866
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	867 s = "hello";
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	868 ASSERT_THROW(unserializer.UnserializeValue(s), OrthancException);
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	869 ASSERT_THROW(unserializer.UnserializeJob(s), OrthancException);
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	870 ASSERT_THROW(unserializer.UnserializeOperation(s), OrthancException);
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	871
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	872 s = 42;
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	873 ASSERT_THROW(unserializer.UnserializeValue(s), OrthancException);
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	874 ASSERT_THROW(unserializer.UnserializeJob(s), OrthancException);
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	875 ASSERT_THROW(unserializer.UnserializeOperation(s), OrthancException);
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	876 }
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	877
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	878
2657 5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	879 TEST(JobsSerialization, JobOperationValues)
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	880 {
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	881 Json::Value s;
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	882
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	883 {
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	884 JobOperationValues values;
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	885 values.Append(new NullOperationValue);
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	886 values.Append(new StringOperationValue("hello"));
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	887 values.Append(new StringOperationValue("world"));
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	888
389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	889 s = 42;
2657 5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	890 values.Serialize(s);
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	891 }
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	892
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	893 {
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	894 GenericJobUnserializer unserializer;
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	895 std::unique_ptr<JobOperationValues> values(JobOperationValues::Unserialize(unserializer, s));
2657 5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	896 ASSERT_EQ(3u, values->GetSize());
4310 2ae905070221 renaming pure interface JobOperationValue as IJobOperationValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	897 ASSERT_EQ(IJobOperationValue::Type_Null, values->GetValue(0).GetType());
2ae905070221 renaming pure interface JobOperationValue as IJobOperationValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	898 ASSERT_EQ(IJobOperationValue::Type_String, values->GetValue(1).GetType());
2ae905070221 renaming pure interface JobOperationValue as IJobOperationValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	899 ASSERT_EQ(IJobOperationValue::Type_String, values->GetValue(2).GetType());
2657 5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	900
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	901 ASSERT_EQ("hello", dynamic_cast<const StringOperationValue&>(values->GetValue(1)).GetContent());
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	902 ASSERT_EQ("world", dynamic_cast<const StringOperationValue&>(values->GetValue(2)).GetContent());
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	903 }
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	904 }
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	905
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	906
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	907 TEST(JobsSerialization, GenericValues)
1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	908 {
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	909 GenericJobUnserializer unserializer;
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	910 Json::Value s;
1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	911
1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	912 {
1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	913 NullOperationValue null;
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	914
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	915 ASSERT_TRUE(CheckIdempotentSerialization(unserializer, null));
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	916 null.Serialize(s);
1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	917 }
1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	918
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	919 ASSERT_THROW(unserializer.UnserializeJob(s), OrthancException);
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	920 ASSERT_THROW(unserializer.UnserializeOperation(s), OrthancException);
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	921
4310 2ae905070221 renaming pure interface JobOperationValue as IJobOperationValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	922 std::unique_ptr<IJobOperationValue> value;
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	923 value.reset(unserializer.UnserializeValue(s));
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	924
4310 2ae905070221 renaming pure interface JobOperationValue as IJobOperationValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	925 ASSERT_EQ(IJobOperationValue::Type_Null, value->GetType());
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	926
1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	927 {
1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	928 StringOperationValue str("Hello");
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	929
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	930 ASSERT_TRUE(CheckIdempotentSerialization(unserializer, str));
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	931 str.Serialize(s);
1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	932 }
1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	933
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	934 ASSERT_THROW(unserializer.UnserializeJob(s), OrthancException);
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	935 ASSERT_THROW(unserializer.UnserializeOperation(s), OrthancException);
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	936 value.reset(unserializer.UnserializeValue(s));
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	937
4310 2ae905070221 renaming pure interface JobOperationValue as IJobOperationValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 4204 diff changeset	938 ASSERT_EQ(IJobOperationValue::Type_String, value->GetType());
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	939 ASSERT_EQ("Hello", dynamic_cast<StringOperationValue&>(*value).GetContent());
2600 140a539b4eba SequenceOfOperationsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2599 diff changeset	940 }
2651 1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	941
1da5a052c777 testing value serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2648 diff changeset	942
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	943 TEST(JobsSerialization, GenericJobs)
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	944 {
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	945 Json::Value s;
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	946
2658 ce770f095092 todo Sebastien Jodogne <s.jodogne@gmail.com> parents: 2657 diff changeset	947 // This tests SetOfInstancesJob
ce770f095092 todo Sebastien Jodogne <s.jodogne@gmail.com> parents: 2657 diff changeset	948
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	949 {
2860 8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	950 DummyInstancesJob job;
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	951 job.SetDescription("description");
2657 5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	952 job.AddInstance("hello");
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	953 job.AddInstance("nope");
2657 5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	954 job.AddInstance("world");
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	955 job.SetPermissive(true);
3658 2d90dd30858c providing job ID to the IJob::Step() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	956 ASSERT_THROW(job.Step("jobId"), OrthancException); // Not started yet
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	957 ASSERT_FALSE(job.HasTrailingStep());
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	958 ASSERT_FALSE(job.IsTrailingStepDone());
2657 5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	959 job.Start();
3658 2d90dd30858c providing job ID to the IJob::Step() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	960 ASSERT_EQ(JobStepCode_Continue, job.Step("jobId").GetCode());
2d90dd30858c providing job ID to the IJob::Step() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	961 ASSERT_EQ(JobStepCode_Continue, job.Step("jobId").GetCode());
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	962
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	963 {
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	964 DummyUnserializer unserializer;
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	965 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	966 }
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	967
2663 228e2783ce83 some jobs might not be serializable Sebastien Jodogne <s.jodogne@gmail.com> parents: 2662 diff changeset	968 ASSERT_TRUE(job.Serialize(s));
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	969 }
a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	970
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	971 {
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	972 DummyUnserializer unserializer;
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	973 ASSERT_THROW(unserializer.UnserializeValue(s), OrthancException);
c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	974 ASSERT_THROW(unserializer.UnserializeOperation(s), OrthancException);
2652 a3f0f61a14ca fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2651 diff changeset	975
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	976 std::unique_ptr<IJob> job;
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	977 job.reset(unserializer.UnserializeJob(s));
2657 5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	978
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	979 const DummyInstancesJob& tmp = dynamic_cast<const DummyInstancesJob&>(*job);
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	980 ASSERT_FALSE(tmp.IsStarted());
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	981 ASSERT_TRUE(tmp.IsPermissive());
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	982 ASSERT_EQ("description", tmp.GetDescription());
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	983 ASSERT_EQ(3u, tmp.GetInstancesCount());
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	984 ASSERT_EQ(2u, tmp.GetPosition());
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	985 ASSERT_EQ(1u, tmp.GetFailedInstances().size());
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	986 ASSERT_EQ("hello", tmp.GetInstance(0));
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	987 ASSERT_EQ("nope", tmp.GetInstance(1));
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	988 ASSERT_EQ("world", tmp.GetInstance(2));
5eea2f11e8df JobsSerialization.GenericJobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 2656 diff changeset	989 ASSERT_TRUE(tmp.IsFailedInstance("nope"));
2655 c196d76cb8fa serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2653 diff changeset	990 }
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	991
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	992 // SequenceOfOperationsJob
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	993
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	994 {
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	995 SequenceOfOperationsJob job;
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	996 job.SetDescription("hello");
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	997
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	998 {
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	999 SequenceOfOperationsJob::Lock lock(job);
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1000 size_t a = lock.AddOperation(new LogJobOperation);
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1001 size_t b = lock.AddOperation(new LogJobOperation);
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1002 lock.Connect(a, b);
2730 cb1b26a7db98 fix mingw compilation s.jodogne@gmail.com parents: 2726 diff changeset	1003
cb1b26a7db98 fix mingw compilation s.jodogne@gmail.com parents: 2726 diff changeset	1004 StringOperationValue s1("hello");
cb1b26a7db98 fix mingw compilation s.jodogne@gmail.com parents: 2726 diff changeset	1005 StringOperationValue s2("world");
cb1b26a7db98 fix mingw compilation s.jodogne@gmail.com parents: 2726 diff changeset	1006 lock.AddInput(a, s1);
cb1b26a7db98 fix mingw compilation s.jodogne@gmail.com parents: 2726 diff changeset	1007 lock.AddInput(a, s2);
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1008 lock.SetTrailingOperationTimeout(300);
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1009 }
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1010
3658 2d90dd30858c providing job ID to the IJob::Step() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	1011 ASSERT_EQ(JobStepCode_Continue, job.Step("jobId").GetCode());
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1012
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1013 {
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1014 GenericJobUnserializer unserializer;
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1015 ASSERT_TRUE(CheckIdempotentSerialization(unserializer, job));
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1016 }
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1017
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1018 ASSERT_TRUE(job.Serialize(s));
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1019 }
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1020
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1021 {
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1022 GenericJobUnserializer unserializer;
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1023 ASSERT_THROW(unserializer.UnserializeValue(s), OrthancException);
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1024 ASSERT_THROW(unserializer.UnserializeOperation(s), OrthancException);
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1025
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1026 std::unique_ptr<IJob> job;
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1027 job.reset(unserializer.UnserializeJob(s));
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1028
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1029 std::string tmp;
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1030 dynamic_cast<SequenceOfOperationsJob&>(*job).GetDescription(tmp);
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1031 ASSERT_EQ("hello", tmp);
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1032 }
2658 ce770f095092 todo Sebastien Jodogne <s.jodogne@gmail.com> parents: 2657 diff changeset	1033 }
ce770f095092 todo Sebastien Jodogne <s.jodogne@gmail.com> parents: 2657 diff changeset	1034
ce770f095092 todo Sebastien Jodogne <s.jodogne@gmail.com> parents: 2657 diff changeset	1035
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1036 static bool IsSameTagValue(const ParsedDicomFile& dicom1,
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1037 const ParsedDicomFile& dicom2,
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1038 DicomTag tag)
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1039 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1040 std::string a, b;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1041 return (dicom1.GetTagValue(a, tag) &&
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1042 dicom2.GetTagValue(b, tag) &&
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1043 (a == b));
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1044 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1045
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1046
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1047
2660 27b7884512be todo Sebastien Jodogne <s.jodogne@gmail.com> parents: 2659 diff changeset	1048 TEST(JobsSerialization, DicomModification)
27b7884512be todo Sebastien Jodogne <s.jodogne@gmail.com> parents: 2659 diff changeset	1049 {
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1050 Json::Value s;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1051
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1052 ParsedDicomFile source(true);
3691 4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1053 source.Insert(DICOM_TAG_STUDY_DESCRIPTION, "Test 1", false, "");
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1054 source.Insert(DICOM_TAG_SERIES_DESCRIPTION, "Test 2", false, "");
4922bdd046dd Fix issue #140 (Modifying private tags with REST API changes VR from LO to UN) - DANGEROUS COMMIT Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	1055 source.Insert(DICOM_TAG_PATIENT_NAME, "Test 3", false, "");
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1056
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1057 std::unique_ptr<ParsedDicomFile> modified(source.Clone(true));
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1058
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1059 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1060 DicomModification modification;
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1061 modification.SetLevel(ResourceType_Series);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1062 modification.Clear(DICOM_TAG_STUDY_DESCRIPTION);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1063 modification.Remove(DICOM_TAG_SERIES_DESCRIPTION);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1064 modification.Replace(DICOM_TAG_PATIENT_NAME, "Test 4", true);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1065
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1066 modification.Apply(*modified);
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	1067
389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	1068 s = 42;
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1069 modification.Serialize(s);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1070 }
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1071
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1072 {
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1073 DicomModification modification(s);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1074 ASSERT_EQ(ResourceType_Series, modification.GetLevel());
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1075
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	1076 std::unique_ptr<ParsedDicomFile> second(source.Clone(true));
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1077 modification.Apply(*second);
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1078
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1079 std::string t;
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1080 ASSERT_TRUE(second->GetTagValue(t, DICOM_TAG_STUDY_DESCRIPTION));
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1081 ASSERT_TRUE(t.empty());
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1082 ASSERT_FALSE(second->GetTagValue(t, DICOM_TAG_SERIES_DESCRIPTION));
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1083 ASSERT_TRUE(second->GetTagValue(t, DICOM_TAG_PATIENT_NAME));
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1084 ASSERT_EQ("Test 4", t);
2662 47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1085
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1086 ASSERT_TRUE(IsSameTagValue(source, *modified, DICOM_TAG_STUDY_INSTANCE_UID));
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1087 ASSERT_TRUE(IsSameTagValue(source, *second, DICOM_TAG_STUDY_INSTANCE_UID));
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1088
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1089 ASSERT_FALSE(IsSameTagValue(source, *second, DICOM_TAG_SERIES_INSTANCE_UID));
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1090 ASSERT_TRUE(IsSameTagValue(modified, second, DICOM_TAG_SERIES_INSTANCE_UID));
47d812308d63 serialization of DicomModification Sebastien Jodogne <s.jodogne@gmail.com> parents: 2660 diff changeset	1091 }
2660 27b7884512be todo Sebastien Jodogne <s.jodogne@gmail.com> parents: 2659 diff changeset	1092 }
27b7884512be todo Sebastien Jodogne <s.jodogne@gmail.com> parents: 2659 diff changeset	1093
27b7884512be todo Sebastien Jodogne <s.jodogne@gmail.com> parents: 2659 diff changeset	1094
4687 fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1095 TEST(JobsSerialization, DicomModification2)
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1096 {
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1097 Json::Value s;
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1098
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1099 {
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1100 DicomModification modification;
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1101 modification.SetupAnonymization(DicomVersion_2017c);
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1102 modification.Remove(DicomPath(DICOM_TAG_REFERENCED_IMAGE_SEQUENCE, 1, DICOM_TAG_SOP_INSTANCE_UID));
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1103 modification.Replace(DicomPath(DICOM_TAG_REFERENCED_IMAGE_SEQUENCE, 1, DICOM_TAG_SOP_CLASS_UID), "Hello", true);
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1104 modification.Keep(DicomPath(DICOM_TAG_REFERENCED_IMAGE_SEQUENCE, 1, DICOM_TAG_PATIENT_NAME));
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1105
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1106 s = 42;
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1107 modification.Serialize(s);
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1108 }
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1109
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1110 {
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1111 DicomModification modification(s);
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1112
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1113 // Check idempotent serialization
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1114 Json::Value ss;
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1115 modification.Serialize(ss);
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1116 ASSERT_EQ(s.toStyledString(), ss.toStyledString());
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1117 }
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1118 }
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1119
fcd2dc7c8f31 "Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 4656 diff changeset	1120
2666 2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1121 TEST(JobsSerialization, Registry)
2540ac79ab6c SequenceOfOperationsJob serialization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2665 diff changeset	1122 {
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1123 Json::Value s;
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1124 std::string i1, i2;
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1125
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1126 {
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2924 diff changeset	1127 JobsRegistry registry(10);
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1128 registry.Submit(i1, new DummyJob(), 10);
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1129 registry.Submit(i2, new SequenceOfOperationsJob(), 30);
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1130 registry.Serialize(s);
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1131 }
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1132
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1133 {
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1134 DummyUnserializer unserializer;
2950 dc18d5804746 support of JobsHistorySize set to zero Sebastien Jodogne <s.jodogne@gmail.com> parents: 2924 diff changeset	1135 JobsRegistry registry(unserializer, s, 10);
2667 5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1136
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1137 Json::Value t;
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1138 registry.Serialize(t);
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1139 ASSERT_TRUE(CheckSameJson(s, t));
5fa2f2ce74f0 serialization of JobsRegistry Sebastien Jodogne <s.jodogne@gmail.com> parents: 2666 diff changeset	1140 }
2658 ce770f095092 todo Sebastien Jodogne <s.jodogne@gmail.com> parents: 2657 diff changeset	1141 }
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1142
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1143
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1144 TEST(JobsSerialization, TrailingStep)
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1145 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1146 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1147 Json::Value s;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1148
2860 8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	1149 DummyInstancesJob job;
3040 07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1150 ASSERT_EQ(0u, job.GetCommandsCount());
07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1151 ASSERT_EQ(0u, job.GetInstancesCount());
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1152
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1153 job.Start();
3040 07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1154 ASSERT_EQ(0u, job.GetPosition());
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1155 ASSERT_FALSE(job.HasTrailingStep());
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1156 ASSERT_FALSE(job.IsTrailingStepDone());
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1157
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1158 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1159 DummyUnserializer unserializer;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1160 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1161 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1162
3658 2d90dd30858c providing job ID to the IJob::Step() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	1163 ASSERT_EQ(JobStepCode_Success, job.Step("jobId").GetCode());
3040 07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1164 ASSERT_EQ(1u, job.GetPosition());
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1165 ASSERT_FALSE(job.IsTrailingStepDone());
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1166
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1167 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1168 DummyUnserializer unserializer;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1169 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1170 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1171
3658 2d90dd30858c providing job ID to the IJob::Step() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	1172 ASSERT_THROW(job.Step("jobId"), OrthancException);
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1173 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1174
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1175 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1176 Json::Value s;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1177
2860 8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	1178 DummyInstancesJob job;
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1179 job.AddInstance("hello");
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1180 job.AddInstance("world");
3040 07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1181 ASSERT_EQ(2u, job.GetCommandsCount());
07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1182 ASSERT_EQ(2u, job.GetInstancesCount());
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1183
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1184 job.Start();
3040 07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1185 ASSERT_EQ(0u, job.GetPosition());
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1186 ASSERT_FALSE(job.HasTrailingStep());
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1187 ASSERT_FALSE(job.IsTrailingStepDone());
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1188
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1189 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1190 DummyUnserializer unserializer;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1191 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1192 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1193
3658 2d90dd30858c providing job ID to the IJob::Step() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	1194 ASSERT_EQ(JobStepCode_Continue, job.Step("jobId").GetCode());
3040 07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1195 ASSERT_EQ(1u, job.GetPosition());
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1196 ASSERT_FALSE(job.IsTrailingStepDone());
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1197
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1198 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1199 DummyUnserializer unserializer;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1200 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1201 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1202
3658 2d90dd30858c providing job ID to the IJob::Step() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	1203 ASSERT_EQ(JobStepCode_Success, job.Step("jobId").GetCode());
3040 07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1204 ASSERT_EQ(2u, job.GetPosition());
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1205 ASSERT_FALSE(job.IsTrailingStepDone());
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1206
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1207 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1208 DummyUnserializer unserializer;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1209 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1210 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1211
3658 2d90dd30858c providing job ID to the IJob::Step() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	1212 ASSERT_THROW(job.Step("jobId"), OrthancException);
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1213 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1214
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1215 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1216 Json::Value s;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1217
2860 8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	1218 DummyInstancesJob job;
3040 07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1219 ASSERT_EQ(0u, job.GetInstancesCount());
07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1220 ASSERT_EQ(0u, job.GetCommandsCount());
2860 8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	1221 job.AddTrailingStep();
3040 07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1222 ASSERT_EQ(0u, job.GetInstancesCount());
07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1223 ASSERT_EQ(1u, job.GetCommandsCount());
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1224
2860 8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	1225 job.Start(); // This adds the trailing step
3040 07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1226 ASSERT_EQ(0u, job.GetPosition());
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1227 ASSERT_TRUE(job.HasTrailingStep());
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1228 ASSERT_FALSE(job.IsTrailingStepDone());
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1229
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1230 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1231 DummyUnserializer unserializer;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1232 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1233 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1234
3658 2d90dd30858c providing job ID to the IJob::Step() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	1235 ASSERT_EQ(JobStepCode_Success, job.Step("jobId").GetCode());
3040 07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1236 ASSERT_EQ(1u, job.GetPosition());
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1237 ASSERT_TRUE(job.IsTrailingStepDone());
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1238
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1239 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1240 DummyUnserializer unserializer;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1241 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1242 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1243
3658 2d90dd30858c providing job ID to the IJob::Step() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	1244 ASSERT_THROW(job.Step("jobId"), OrthancException);
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1245 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1246
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1247 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1248 Json::Value s;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1249
2860 8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	1250 DummyInstancesJob job;
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1251 job.AddInstance("hello");
3040 07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1252 ASSERT_EQ(1u, job.GetInstancesCount());
07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1253 ASSERT_EQ(1u, job.GetCommandsCount());
2860 8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	1254 job.AddTrailingStep();
3040 07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1255 ASSERT_EQ(1u, job.GetInstancesCount());
07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1256 ASSERT_EQ(2u, job.GetCommandsCount());
2860 8b00e4cb4a6b SetOfCommandsJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2853 diff changeset	1257
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1258 job.Start();
3040 07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1259 ASSERT_EQ(2u, job.GetCommandsCount());
07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1260 ASSERT_EQ(0u, job.GetPosition());
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1261 ASSERT_TRUE(job.HasTrailingStep());
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1262 ASSERT_FALSE(job.IsTrailingStepDone());
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1263
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1264 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1265 DummyUnserializer unserializer;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1266 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1267 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1268
3658 2d90dd30858c providing job ID to the IJob::Step() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	1269 ASSERT_EQ(JobStepCode_Continue, job.Step("jobId").GetCode());
3040 07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1270 ASSERT_EQ(1u, job.GetPosition());
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1271 ASSERT_FALSE(job.IsTrailingStepDone());
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1272
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1273 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1274 DummyUnserializer unserializer;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1275 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1276 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1277
3658 2d90dd30858c providing job ID to the IJob::Step() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	1278 ASSERT_EQ(JobStepCode_Success, job.Step("jobId").GetCode());
3040 07ab06af90ed preparing for release Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	1279 ASSERT_EQ(2u, job.GetPosition());
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1280 ASSERT_TRUE(job.IsTrailingStepDone());
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1281
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1282 {
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1283 DummyUnserializer unserializer;
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1284 ASSERT_TRUE(CheckIdempotentSetOfInstances(unserializer, job));
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1285 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1286
3658 2d90dd30858c providing job ID to the IJob::Step() methods Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 diff changeset	1287 ASSERT_THROW(job.Step("jobId"), OrthancException);
2842 ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1288 }
ff0ed5ea9e4e trailing step in SetOfInstancesJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2815 diff changeset	1289 }
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1290
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1291
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1292 TEST(JobsSerialization, RemoteModalityParameters)
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1293 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1294 Json::Value s;
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1295
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1296 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1297 RemoteModalityParameters modality;
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1298 ASSERT_FALSE(modality.IsAdvancedFormatNeeded());
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1299 modality.Serialize(s, false);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1300 ASSERT_EQ(Json::arrayValue, s.type());
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1301 ASSERT_FALSE(modality.IsDicomTlsEnabled());
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1302 ASSERT_FALSE(modality.HasTimeout());
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1303 ASSERT_EQ(0u, modality.GetTimeout());
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1304 }
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1305
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1306 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1307 RemoteModalityParameters modality(s);
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1308 ASSERT_FALSE(modality.IsAdvancedFormatNeeded());
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1309 ASSERT_EQ("ORTHANC", modality.GetApplicationEntityTitle());
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1310 ASSERT_EQ("127.0.0.1", modality.GetHost());
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1311 ASSERT_EQ(104u, modality.GetPortNumber());
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1312 ASSERT_EQ(ModalityManufacturer_Generic, modality.GetManufacturer());
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1313 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Echo));
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1314 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Find));
4888 8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1315 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_FindWorklist));
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1316 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Get));
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1317 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Store));
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1318 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Move));
3602 085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3561 diff changeset	1319 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NAction));
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1320 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NEventReport));
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3878 diff changeset	1321 ASSERT_TRUE(modality.IsTranscodingAllowed());
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1322 ASSERT_FALSE(modality.IsDicomTlsEnabled());
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1323 ASSERT_FALSE(modality.HasLocalAet());
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1324 ASSERT_THROW(modality.GetLocalAet(), OrthancException);
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1325 ASSERT_FALSE(modality.HasTimeout());
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1326 ASSERT_EQ(0u, modality.GetTimeout());
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1327 }
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1328
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1329 s = Json::nullValue;
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1330
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1331 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1332 RemoteModalityParameters modality;
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1333 ASSERT_THROW(modality.SetPortNumber(0), OrthancException);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1334 ASSERT_THROW(modality.SetPortNumber(65535), OrthancException);
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1335 modality.SetApplicationEntityTitle("HELLO");
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1336 modality.SetHost("world");
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1337 modality.SetPortNumber(45);
3561 bdafff1ce443 C-Find SCU at Instance level now sets the 0008,0052 tag to IMAGE per default (was INSTANCE). Source: https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!msg/orthanc-users/FYxHXzlaQ0M/rn6d0SowAAAJ Alain Mazy <alain@mazy.be> parents: 3240 diff changeset	1338 modality.SetManufacturer(ModalityManufacturer_GenericNoWildcardInDates);
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1339 ASSERT_FALSE(modality.IsAdvancedFormatNeeded());
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1340 modality.Serialize(s, true);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1341 ASSERT_EQ(Json::objectValue, s.type());
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1342 ASSERT_FALSE(modality.HasLocalAet());
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1343 ASSERT_FALSE(modality.HasTimeout());
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1344 ASSERT_EQ(0u, modality.GetTimeout());
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1345 }
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1346
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1347 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1348 RemoteModalityParameters modality(s);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1349 ASSERT_EQ("HELLO", modality.GetApplicationEntityTitle());
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1350 ASSERT_EQ("world", modality.GetHost());
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1351 ASSERT_EQ(45u, modality.GetPortNumber());
3561 bdafff1ce443 C-Find SCU at Instance level now sets the 0008,0052 tag to IMAGE per default (was INSTANCE). Source: https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!msg/orthanc-users/FYxHXzlaQ0M/rn6d0SowAAAJ Alain Mazy <alain@mazy.be> parents: 3240 diff changeset	1352 ASSERT_EQ(ModalityManufacturer_GenericNoWildcardInDates, modality.GetManufacturer());
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1353 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Echo));
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1354 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Find));
4888 8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1355 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_FindWorklist));
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1356 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Get));
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1357 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Store));
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1358 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Move));
3602 085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3561 diff changeset	1359 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NAction));
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1360 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NEventReport));
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3878 diff changeset	1361 ASSERT_TRUE(modality.IsTranscodingAllowed());
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1362 ASSERT_FALSE(modality.IsDicomTlsEnabled());
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1363 ASSERT_FALSE(modality.HasLocalAet());
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1364 ASSERT_FALSE(modality.HasTimeout());
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1365 ASSERT_EQ(0u, modality.GetTimeout());
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1366 }
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1367
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1368 s["Port"] = "46";
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1369
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1370 {
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1371 RemoteModalityParameters modality(s);
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1372 ASSERT_EQ(46u, modality.GetPortNumber());
6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1373 }
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1374
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1375 s["Port"] = -1; ASSERT_THROW(RemoteModalityParameters m(s), OrthancException);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1376 s["Port"] = 65535; ASSERT_THROW(RemoteModalityParameters m(s), OrthancException);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1377 s["Port"] = "nope"; ASSERT_THROW(RemoteModalityParameters m(s), OrthancException);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1378
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1379 std::set<DicomRequestType> operations;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1380 operations.insert(DicomRequestType_Echo);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1381 operations.insert(DicomRequestType_Find);
4888 8523078f3f4b added new configuration to authorize C-Find for worklist independently from other C-Find Alain Mazy <am@osimis.io> parents: 4870 diff changeset	1382 operations.insert(DicomRequestType_FindWorklist);
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1383 operations.insert(DicomRequestType_Get);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1384 operations.insert(DicomRequestType_Move);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1385 operations.insert(DicomRequestType_Store);
3602 085283445db0 AllowNAction in remote modality parameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3561 diff changeset	1386 operations.insert(DicomRequestType_NAction);
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1387 operations.insert(DicomRequestType_NEventReport);
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1388
4890 6d4e8d90ca02 fix unit test Sebastien Jodogne <s.jodogne@gmail.com> parents: 4888 diff changeset	1389 ASSERT_EQ(8u, operations.size());
2872 9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1390
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1391 for (std::set<DicomRequestType>::const_iterator
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1392 it = operations.begin(); it != operations.end(); ++it)
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1393 {
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1394 {
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1395 RemoteModalityParameters modality;
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1396 modality.SetRequestAllowed(*it, false);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1397 ASSERT_TRUE(modality.IsAdvancedFormatNeeded());
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1398
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1399 modality.Serialize(s, false);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1400 ASSERT_EQ(Json::objectValue, s.type());
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1401 }
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1402
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1403 {
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1404 RemoteModalityParameters modality(s);
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1405
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1406 ASSERT_FALSE(modality.IsRequestAllowed(*it));
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1407
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1408 for (std::set<DicomRequestType>::const_iterator
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1409 it2 = operations.begin(); it2 != operations.end(); ++it2)
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1410 {
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1411 if (it2 != it)
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1412 {
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1413 ASSERT_TRUE(modality.IsRequestAllowed(*it2));
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1414 }
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1415 }
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1416 }
9d08edde614b Possibility to restrict the allowed DICOM commands for each modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 2871 diff changeset	1417 }
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1418
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1419 s = Json::nullValue;
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1420
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1421 {
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1422 RemoteModalityParameters modality;
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1423 modality.SetLocalAet("hello");
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1424 modality.SetTimeout(42);
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1425 ASSERT_TRUE(modality.IsAdvancedFormatNeeded());
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1426 modality.Serialize(s, true);
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1427 ASSERT_EQ(Json::objectValue, s.type());
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1428 ASSERT_TRUE(modality.HasLocalAet());
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1429 ASSERT_TRUE(modality.HasTimeout());
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1430 ASSERT_EQ(42u, modality.GetTimeout());
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1431 }
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1432
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1433 {
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1434 RemoteModalityParameters modality(s);
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1435 ASSERT_TRUE(modality.HasLocalAet());
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1436 ASSERT_EQ("hello", modality.GetLocalAet());
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1437 ASSERT_TRUE(modality.HasTimeout());
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1438 ASSERT_EQ(42u, modality.GetTimeout());
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1439 }
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1440
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1441 {
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1442 Json::Value t;
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1443 t["AllowStorageCommitment"] = false;
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1444 t["AET"] = "AET";
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1445 t["Host"] = "host";
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1446 t["Port"] = "104";
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1447
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1448 RemoteModalityParameters modality(t);
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1449 ASSERT_TRUE(modality.IsAdvancedFormatNeeded());
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1450 ASSERT_EQ("AET", modality.GetApplicationEntityTitle());
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1451 ASSERT_EQ("host", modality.GetHost());
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1452 ASSERT_EQ(104u, modality.GetPortNumber());
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1453 ASSERT_FALSE(modality.IsRequestAllowed(DicomRequestType_NAction));
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1454 ASSERT_FALSE(modality.IsRequestAllowed(DicomRequestType_NEventReport));
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3878 diff changeset	1455 ASSERT_TRUE(modality.IsTranscodingAllowed());
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1456 ASSERT_FALSE(modality.IsDicomTlsEnabled());
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1457 ASSERT_FALSE(modality.HasLocalAet());
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1458 ASSERT_THROW(modality.GetLocalAet(), OrthancException);
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1459 ASSERT_FALSE(modality.HasTimeout());
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1460 ASSERT_EQ(0u, modality.GetTimeout());
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1461 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1462
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1463 {
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1464 Json::Value t;
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1465 t["AllowNAction"] = false;
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1466 t["AllowNEventReport"] = true;
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1467 t["AET"] = "AET";
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1468 t["Host"] = "host";
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1469 t["Port"] = "104";
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1470 t["AllowTranscoding"] = false;
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1471 t["UseDicomTls"] = true;
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1472 t["LocalAet"] = "world";
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1473 t["Timeout"] = 20;
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1474
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1475 RemoteModalityParameters modality(t);
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1476 ASSERT_TRUE(modality.IsAdvancedFormatNeeded());
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1477 ASSERT_EQ("AET", modality.GetApplicationEntityTitle());
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1478 ASSERT_EQ("host", modality.GetHost());
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1479 ASSERT_EQ(104u, modality.GetPortNumber());
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1480 ASSERT_FALSE(modality.IsRequestAllowed(DicomRequestType_NAction));
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1481 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NEventReport));
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3878 diff changeset	1482 ASSERT_FALSE(modality.IsTranscodingAllowed());
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1483 ASSERT_TRUE(modality.IsDicomTlsEnabled());
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1484 ASSERT_TRUE(modality.HasLocalAet());
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1485 ASSERT_EQ("world", modality.GetLocalAet());
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1486 ASSERT_TRUE(modality.HasTimeout());
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1487 ASSERT_EQ(20u, modality.GetTimeout());
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1488 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1489
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1490 {
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1491 Json::Value t;
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1492 t["AllowNAction"] = true;
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1493 t["AllowNEventReport"] = true;
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1494 t["AET"] = "AET";
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1495 t["Host"] = "host";
318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1496 t["Port"] = "104";
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1497
4204 318c16cfccab cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	1498 RemoteModalityParameters modality(t);
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1499 ASSERT_FALSE(modality.IsAdvancedFormatNeeded());
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1500 ASSERT_EQ("AET", modality.GetApplicationEntityTitle());
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1501 ASSERT_EQ("host", modality.GetHost());
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1502 ASSERT_EQ(104u, modality.GetPortNumber());
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1503 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NAction));
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1504 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NEventReport));
3894 8f7ad4989fec transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented Sebastien Jodogne <s.jodogne@gmail.com> parents: 3878 diff changeset	1505 ASSERT_TRUE(modality.IsTranscodingAllowed());
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1506 ASSERT_FALSE(modality.IsDicomTlsEnabled());
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1507 ASSERT_FALSE(modality.HasLocalAet());
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1508 ASSERT_THROW(modality.GetLocalAet(), OrthancException);
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3602 diff changeset	1509 }
2871 6eebc2eb3168 refactoring serialization of RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 2868 diff changeset	1510 }
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1511
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1512
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1513
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1514 TEST(JobsSerialization, DicomAssociationParameters)
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1515 {
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1516 {
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1517 DicomAssociationParameters a;
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1518
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1519 Json::Value v = Json::objectValue;
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1520 a.SerializeJob(v);
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1521 ASSERT_EQ(Json::objectValue, v.type());
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1522 ASSERT_EQ("ORTHANC", v["LocalAet"].asString());
4457 789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4451 diff changeset	1523 ASSERT_EQ(DicomAssociationParameters::GetDefaultTimeout(), v["Timeout"].asUInt());
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1524 ASSERT_TRUE(v.isMember("Remote"));
4451 f4dbdb2dcba6 new configuration option "MaximumPduLength" to tune the maximum PDU length Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	1525 ASSERT_TRUE(v.isMember("MaximumPduLength"));
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1526
4656 82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4518 diff changeset	1527 ASSERT_EQ(5u, v.getMemberNames().size());
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1528
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1529 DicomAssociationParameters b;
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1530 b.UnserializeJob(v);
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1531 ASSERT_EQ("ANY-SCP", b.GetRemoteModality().GetApplicationEntityTitle());
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1532 ASSERT_EQ("127.0.0.1", b.GetRemoteModality().GetHost());
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1533 ASSERT_EQ(104u, b.GetRemoteModality().GetPortNumber());
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1534 ASSERT_EQ("ORTHANC", b.GetLocalApplicationEntityTitle());
4451 f4dbdb2dcba6 new configuration option "MaximumPduLength" to tune the maximum PDU length Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	1535 ASSERT_EQ(DicomAssociationParameters::GetDefaultMaximumPduLength(), b.GetMaximumPduLength());
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1536 ASSERT_FALSE(b.GetRemoteModality().IsDicomTlsEnabled());
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1537 ASSERT_FALSE(b.GetRemoteModality().HasLocalAet());
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4457 diff changeset	1538 ASSERT_THROW(b.GetRemoteModality().GetLocalAet(), OrthancException);
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1539 ASSERT_FALSE(b.GetRemoteModality().HasTimeout());
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1540 ASSERT_EQ(0u, b.GetRemoteModality().GetTimeout());
4656 82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4518 diff changeset	1541 ASSERT_TRUE(b.IsRemoteCertificateRequired());
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1542 }
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1543
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1544 {
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1545 RemoteModalityParameters p;
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1546 p.SetApplicationEntityTitle("WORLD");
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1547 p.SetPortNumber(4242);
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1548 p.SetHost("hello.world.com");
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1549 p.SetDicomTlsEnabled(true);
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1550 p.SetTimeout(42);
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1551
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1552 DicomAssociationParameters a("HELLO", p);
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1553 a.SetOwnCertificatePath("key", "crt");
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1554 a.SetTrustedCertificatesPath("trusted");
4656 82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4518 diff changeset	1555 a.SetRemoteCertificateRequired(false);
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1556
4451 f4dbdb2dcba6 new configuration option "MaximumPduLength" to tune the maximum PDU length Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	1557 ASSERT_THROW(a.SetMaximumPduLength(4095), OrthancException);
f4dbdb2dcba6 new configuration option "MaximumPduLength" to tune the maximum PDU length Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	1558 ASSERT_THROW(a.SetMaximumPduLength(131073), OrthancException);
f4dbdb2dcba6 new configuration option "MaximumPduLength" to tune the maximum PDU length Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	1559 a.SetMaximumPduLength(4096);
f4dbdb2dcba6 new configuration option "MaximumPduLength" to tune the maximum PDU length Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	1560 a.SetMaximumPduLength(131072);
f4dbdb2dcba6 new configuration option "MaximumPduLength" to tune the maximum PDU length Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	1561
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1562 Json::Value v = Json::objectValue;
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1563 a.SerializeJob(v);
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1564
4656 82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4518 diff changeset	1565 ASSERT_EQ(8u, v.getMemberNames().size());
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1566
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1567 DicomAssociationParameters b = DicomAssociationParameters::UnserializeJob(v);
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1568
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1569 ASSERT_EQ("WORLD", b.GetRemoteModality().GetApplicationEntityTitle());
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1570 ASSERT_EQ("hello.world.com", b.GetRemoteModality().GetHost());
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1571 ASSERT_EQ(4242u, b.GetRemoteModality().GetPortNumber());
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1572 ASSERT_EQ("HELLO", b.GetLocalApplicationEntityTitle());
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1573 ASSERT_TRUE(b.GetRemoteModality().IsDicomTlsEnabled());
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1574 ASSERT_EQ("key", b.GetOwnPrivateKeyPath());
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1575 ASSERT_EQ("crt", b.GetOwnCertificatePath());
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1576 ASSERT_EQ("trusted", b.GetTrustedCertificatesPath());
4457 789676a8c96a Refactoring and improvements to the cache of DICOM files in ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 4451 diff changeset	1577 ASSERT_EQ(131072u, b.GetMaximumPduLength());
4518 cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1578 ASSERT_TRUE(b.GetRemoteModality().HasTimeout());
cb8fcecf1b02 new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	1579 ASSERT_EQ(42u, b.GetRemoteModality().GetTimeout());
4656 82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4518 diff changeset	1580 ASSERT_FALSE(b.IsRemoteCertificateRequired());
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1581 }
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	1582 }
4775 add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1583
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1584
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1585 TEST(SerializationToolbox, Numbers)
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1586 {
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1587 {
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1588 int32_t i;
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1589 ASSERT_FALSE(SerializationToolbox::ParseInteger32(i, ""));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1590 ASSERT_FALSE(SerializationToolbox::ParseInteger32(i, "ee"));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1591 ASSERT_TRUE(SerializationToolbox::ParseInteger32(i, "42")); ASSERT_EQ(42, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1592 ASSERT_TRUE(SerializationToolbox::ParseInteger32(i, "-42")); ASSERT_EQ(-42, i);
4779 4f368230f32b fix for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4775 diff changeset	1593 ASSERT_TRUE(SerializationToolbox::ParseInteger32(i, "-2147483648")); ASSERT_EQ(-2147483648l, i);
4f368230f32b fix for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4775 diff changeset	1594 ASSERT_TRUE(SerializationToolbox::ParseInteger32(i, "2147483647")); ASSERT_EQ(2147483647l, i);
4775 add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1595 ASSERT_FALSE(SerializationToolbox::ParseInteger32(i, "-2147483649"));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1596 ASSERT_FALSE(SerializationToolbox::ParseInteger32(i, "2147483648"));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1597 ASSERT_FALSE(SerializationToolbox::ParseInteger32(i, "-2\\-3\\-4"));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1598 ASSERT_TRUE(SerializationToolbox::ParseFirstInteger32(i, "-2\\-3\\-4")); ASSERT_EQ(-2, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1599 }
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1600
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1601 {
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1602 uint32_t i;
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1603 ASSERT_FALSE(SerializationToolbox::ParseUnsignedInteger32(i, ""));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1604 ASSERT_FALSE(SerializationToolbox::ParseUnsignedInteger32(i, "ee"));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1605 ASSERT_TRUE(SerializationToolbox::ParseUnsignedInteger32(i, "42")); ASSERT_EQ(42u, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1606 ASSERT_FALSE(SerializationToolbox::ParseUnsignedInteger32(i, "-42"));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1607 ASSERT_TRUE(SerializationToolbox::ParseUnsignedInteger32(i, "4294967295")); ASSERT_EQ(4294967295u, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1608 ASSERT_FALSE(SerializationToolbox::ParseUnsignedInteger32(i, "4294967296"));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1609 ASSERT_FALSE(SerializationToolbox::ParseUnsignedInteger32(i, "2\\3\\4"));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1610 ASSERT_TRUE(SerializationToolbox::ParseFirstUnsignedInteger32(i, "2\\3\\4")); ASSERT_EQ(2u, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1611 }
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1612
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1613 {
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1614 int64_t i;
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1615 ASSERT_FALSE(SerializationToolbox::ParseInteger64(i, ""));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1616 ASSERT_FALSE(SerializationToolbox::ParseInteger64(i, "ee"));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1617 ASSERT_TRUE(SerializationToolbox::ParseInteger64(i, "42")); ASSERT_EQ(42, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1618 ASSERT_TRUE(SerializationToolbox::ParseInteger64(i, "-42")); ASSERT_EQ(-42, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1619 ASSERT_TRUE(SerializationToolbox::ParseInteger64(i, "-2147483649")); ASSERT_EQ(-2147483649ll, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1620 ASSERT_TRUE(SerializationToolbox::ParseInteger64(i, "2147483648")); ASSERT_EQ(2147483648ll, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1621 ASSERT_FALSE(SerializationToolbox::ParseInteger64(i, "-2\\-3\\-4"));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1622 ASSERT_TRUE(SerializationToolbox::ParseFirstInteger64(i, "-2\\-3\\-4")); ASSERT_EQ(-2, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1623 }
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1624
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1625 {
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1626 uint64_t i;
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1627 ASSERT_FALSE(SerializationToolbox::ParseUnsignedInteger64(i, ""));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1628 ASSERT_FALSE(SerializationToolbox::ParseUnsignedInteger64(i, "ee"));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1629 ASSERT_TRUE(SerializationToolbox::ParseUnsignedInteger64(i, "42")); ASSERT_EQ(42u, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1630 ASSERT_FALSE(SerializationToolbox::ParseUnsignedInteger64(i, "-42"));
4779 4f368230f32b fix for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4775 diff changeset	1631 ASSERT_TRUE(SerializationToolbox::ParseUnsignedInteger64(i, "4294967296")); ASSERT_EQ(4294967296lu, i);
4775 add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1632 ASSERT_FALSE(SerializationToolbox::ParseUnsignedInteger64(i, "2\\3\\4"));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1633 ASSERT_TRUE(SerializationToolbox::ParseFirstUnsignedInteger64(i, "2\\3\\4")); ASSERT_EQ(2u, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1634 }
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1635
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1636 {
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1637 float i;
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1638 ASSERT_FALSE(SerializationToolbox::ParseFloat(i, ""));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1639 ASSERT_FALSE(SerializationToolbox::ParseFloat(i, "ee"));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1640 ASSERT_TRUE(SerializationToolbox::ParseFloat(i, "42")); ASSERT_FLOAT_EQ(42.0f, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1641 ASSERT_TRUE(SerializationToolbox::ParseFloat(i, "-42")); ASSERT_FLOAT_EQ(-42.0f, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1642 ASSERT_FALSE(SerializationToolbox::ParseFloat(i, "2\\3\\4"));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1643 ASSERT_TRUE(SerializationToolbox::ParseFirstFloat(i, "1.367\\2.367\\3.367")); ASSERT_FLOAT_EQ(1.367f, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1644
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1645 ASSERT_TRUE(SerializationToolbox::ParseFloat(i, "1.2")); ASSERT_FLOAT_EQ(1.2f, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1646 ASSERT_TRUE(SerializationToolbox::ParseFloat(i, "-1.2e+2")); ASSERT_FLOAT_EQ(-120.0f, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1647 ASSERT_TRUE(SerializationToolbox::ParseFloat(i, "-1e-2")); ASSERT_FLOAT_EQ(-0.01f, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1648 ASSERT_TRUE(SerializationToolbox::ParseFloat(i, "1.3671875")); ASSERT_FLOAT_EQ(1.3671875f, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1649 }
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1650
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1651 {
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1652 double i;
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1653 ASSERT_FALSE(SerializationToolbox::ParseDouble(i, ""));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1654 ASSERT_FALSE(SerializationToolbox::ParseDouble(i, "ee"));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1655 ASSERT_TRUE(SerializationToolbox::ParseDouble(i, "42")); ASSERT_DOUBLE_EQ(42.0, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1656 ASSERT_TRUE(SerializationToolbox::ParseDouble(i, "-42")); ASSERT_DOUBLE_EQ(-42.0, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1657 ASSERT_FALSE(SerializationToolbox::ParseDouble(i, "2\\3\\4"));
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1658 ASSERT_TRUE(SerializationToolbox::ParseFirstDouble(i, "1.367\\2.367\\3.367")); ASSERT_DOUBLE_EQ(1.367, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1659
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1660 ASSERT_TRUE(SerializationToolbox::ParseDouble(i, "1.2")); ASSERT_DOUBLE_EQ(1.2, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1661 ASSERT_TRUE(SerializationToolbox::ParseDouble(i, "-1.2e+2")); ASSERT_DOUBLE_EQ(-120.0, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1662 ASSERT_TRUE(SerializationToolbox::ParseDouble(i, "-1e-2")); ASSERT_DOUBLE_EQ(-0.01, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1663 ASSERT_TRUE(SerializationToolbox::ParseDouble(i, "1.3671875")); ASSERT_DOUBLE_EQ(1.3671875, i);
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1664 }
add0337b928a refactoring parsing of numbers Sebastien Jodogne <s.jodogne@gmail.com> parents: 4687 diff changeset	1665 }

Mercurial > hg > orthanc

annotate OrthancFramework/UnitTestsSources/JobsTests.cpp @ 5014:bedc27c0da5b