orthanc: OrthancServer/UnitTestsSources/UnitTestsMain.cpp annotate

annotate OrthancServer/UnitTestsSources/UnitTestsMain.cpp @ 4997:1f93dc290628

fix compatibility with dcmtk 3.6.7

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 04 May 2022 17:29:58 +0200
parents	6eff25f70121
children	0ea402b4d901

rev	line source
827 3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	1 /**
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1102 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: 810 diff changeset	7 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	8 * This program is free software: you can redistribute it and/or
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	9 * modify it under the terms of the GNU General Public License as
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	10 * published by the Free Software Foundation, either version 3 of the
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	11 * License, or (at your option) any later version.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	12 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 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: 810 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: 810 diff changeset	15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	16 * General Public License for more details.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	17 *
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	18 * You should have received a copy of the GNU General Public License
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	20 **/
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	21
3d6f9b7d0add precompiled headers in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	22
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 827 diff changeset	23 #include "PrecompiledHeadersUnitTests.h"
4062 0953b3dc3261 pretty-printing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4059 diff changeset	24 #include <gtest/gtest.h>
4059 e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	25
4105 c02a2d9efbc2 move FromDcmtkBridge::ExecuteToDicom() to LuaFunctionCall, to remove dependency of DCMTK on Lua Sebastien Jodogne <s.jodogne@gmail.com> parents: 4062 diff changeset	26 #include "../../OrthancFramework/Sources/DicomFormat/DicomArray.h"
4059 e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	27 #include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h"
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	28 #include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h"
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	29 #include "../../OrthancFramework/Sources/DicomParsing/ToDcmtkBridge.h"
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	30 #include "../../OrthancFramework/Sources/EnumerationDictionary.h"
4046 7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	31 #include "../../OrthancFramework/Sources/Images/Image.h"
7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	32 #include "../../OrthancFramework/Sources/Images/PngWriter.h"
4059 e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	33 #include "../../OrthancFramework/Sources/Logging.h"
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	34 #include "../../OrthancFramework/Sources/OrthancException.h"
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	35 #include "../../OrthancFramework/Sources/Toolbox.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	37 #include "../Plugins/Engine/PluginsEnumerations.h"
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	38 #include "../Sources/DicomInstanceToStore.h"
4046 7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	39 #include "../Sources/OrthancConfiguration.h" // For the FontRegistry
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	40 #include "../Sources/OrthancInitialization.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	41 #include "../Sources/ServerEnumerations.h"
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	42 #include "../Sources/ServerToolbox.h"
4059 e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	43 #include "../Sources/StorageCommitmentReports.h"
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	44
4062 0953b3dc3261 pretty-printing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4059 diff changeset	45 #include <OrthancServerResources.h>
0953b3dc3261 pretty-printing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4059 diff changeset	46
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	47 #include <dcmtk/dcmdata/dcdeftag.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48
1337 afaa55d42ddd FreeBSD support jodogne parents: 1288 diff changeset	49
63 f1d0470ff334 renaming unittests Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	50 using namespace Orthanc;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	53 TEST(EnumerationDictionary, Simple)
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	54 {
3991 5d2348b39392 turning toolbox namespaces into classes to control visibility in shared libraries Sebastien Jodogne <s.jodogne@gmail.com> parents: 3987 diff changeset	55 EnumerationDictionary<MetadataType> d;
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	56
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	57 ASSERT_THROW(d.Translate("ReceptionDate"), OrthancException);
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	58 ASSERT_EQ(MetadataType_ModifiedFrom, d.Translate("5"));
436 d51186bf7602 read access to metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 435 diff changeset	59 ASSERT_EQ(256, d.Translate("256"));
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	60
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	61 d.Add(MetadataType_Instance_ReceptionDate, "ReceptionDate");
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	62
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	63 ASSERT_EQ(MetadataType_Instance_ReceptionDate, d.Translate("ReceptionDate"));
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	64 ASSERT_EQ(MetadataType_Instance_ReceptionDate, d.Translate("2"));
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	65 ASSERT_EQ("ReceptionDate", d.Translate(MetadataType_Instance_ReceptionDate));
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	66
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	67 ASSERT_THROW(d.Add(MetadataType_Instance_ReceptionDate, "Hello"), OrthancException);
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	68 ASSERT_THROW(d.Add(MetadataType_ModifiedFrom, "ReceptionDate"), OrthancException); // already used
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	69 ASSERT_THROW(d.Add(MetadataType_ModifiedFrom, "1024"), OrthancException); // cannot register numbers
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	70 d.Add(MetadataType_ModifiedFrom, "ModifiedFrom"); // ok
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	71 }
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	72
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	73
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	74 TEST(EnumerationDictionary, ServerEnumerations)
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	75 {
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	76 ASSERT_STREQ("Patient", EnumerationToString(ResourceType_Patient));
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	77 ASSERT_STREQ("Study", EnumerationToString(ResourceType_Study));
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	78 ASSERT_STREQ("Series", EnumerationToString(ResourceType_Series));
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	79 ASSERT_STREQ("Instance", EnumerationToString(ResourceType_Instance));
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	80
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	81 ASSERT_STREQ("ModifiedSeries", EnumerationToString(ChangeType_ModifiedSeries));
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	82
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	83 ASSERT_STREQ("Failure", EnumerationToString(StoreStatus_Failure));
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	84 ASSERT_STREQ("Success", EnumerationToString(StoreStatus_Success));
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	85
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	86 ASSERT_STREQ("CompletedSeries", EnumerationToString(ChangeType_CompletedSeries));
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	87
437 beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	88 ASSERT_EQ("IndexInSeries", EnumerationToString(MetadataType_Instance_IndexInSeries));
beca6747945e PUT on metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 436 diff changeset	89 ASSERT_EQ("LastUpdate", EnumerationToString(MetadataType_LastUpdate));
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	90
559 e0cfb413c86b find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 533 diff changeset	91 ASSERT_EQ(ResourceType_Patient, StringToResourceType("PATienT"));
e0cfb413c86b find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 533 diff changeset	92 ASSERT_EQ(ResourceType_Study, StringToResourceType("STudy"));
e0cfb413c86b find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 533 diff changeset	93 ASSERT_EQ(ResourceType_Series, StringToResourceType("SeRiEs"));
e0cfb413c86b find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 533 diff changeset	94 ASSERT_EQ(ResourceType_Instance, StringToResourceType("INStance"));
e0cfb413c86b find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 533 diff changeset	95 ASSERT_EQ(ResourceType_Instance, StringToResourceType("IMagE"));
e0cfb413c86b find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 533 diff changeset	96 ASSERT_THROW(StringToResourceType("heLLo"), OrthancException);
e0cfb413c86b find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 533 diff changeset	97
435 28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	98 ASSERT_EQ(2047, StringToMetadata("2047"));
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	99 ASSERT_THROW(StringToMetadata("Ceci est un test"), OrthancException);
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	100 ASSERT_THROW(RegisterUserMetadata(128, ""), OrthancException); // too low (< 1024)
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	101 ASSERT_THROW(RegisterUserMetadata(128000, ""), OrthancException); // too high (> 65535)
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	102 RegisterUserMetadata(2047, "Ceci est un test");
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	103 ASSERT_EQ(2047, StringToMetadata("2047"));
28ba73274919 registration of user-defined metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 434 diff changeset	104 ASSERT_EQ(2047, StringToMetadata("Ceci est un test"));
1429 7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	105
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1428 diff changeset	106 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("Generic")));
2319 ae6245053bcf made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards' amazy parents: 2313 diff changeset	107 ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("GenericNoWildcardInDates")));
2352 3ab96768d144 Fix issue 52 (DICOM level security association problems) Sebastien Jodogne <s.jodogne@gmail.com> parents: 2319 diff changeset	108 ASSERT_STREQ("GenericNoUniversalWildcard", EnumerationToString(StringToModalityManufacturer("GenericNoUniversalWildcard")));
1852 efbc3afd6cd3 Efilm and Vitrea manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1846 diff changeset	109 ASSERT_STREQ("Vitrea", EnumerationToString(StringToModalityManufacturer("Vitrea")));
2888 61a5667f37d9 New modality manufacturer: "GE" for GE Healthcare EA and AW Sebastien Jodogne <s.jodogne@gmail.com> parents: 2841 diff changeset	110 ASSERT_STREQ("GE", EnumerationToString(StringToModalityManufacturer("GE")));
2319 ae6245053bcf made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards' amazy parents: 2313 diff changeset	111 // backward compatibility tests (to remove once we make these manufacturer really obsolete)
ae6245053bcf made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards' amazy parents: 2313 diff changeset	112 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("MedInria")));
ae6245053bcf made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards' amazy parents: 2313 diff changeset	113 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("EFilm2")));
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: 3497 diff changeset	114 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("ClearCanvas")));
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: 3497 diff changeset	115 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("Dcm4Chee")));
2319 ae6245053bcf made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards' amazy parents: 2313 diff changeset	116 ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("SyngoVia")));
ae6245053bcf made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards' amazy parents: 2313 diff changeset	117 ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("AgfaImpax")));
4273 0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4177 diff changeset	118
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4177 diff changeset	119 ASSERT_STREQ("default", EnumerationToString(StringToVerbosity("default")));
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4177 diff changeset	120 ASSERT_STREQ("verbose", EnumerationToString(StringToVerbosity("verbose")));
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4177 diff changeset	121 ASSERT_STREQ("trace", EnumerationToString(StringToVerbosity("trace")));
0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4177 diff changeset	122 ASSERT_THROW(StringToVerbosity("nope"), OrthancException);
434 ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	123 }
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	124
ccf3a0a43dac EnumerationDictionary Sebastien Jodogne <s.jodogne@gmail.com> parents: 430 diff changeset	125
450 58b433bb9762 SharedMessageQueue Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	126
4046 7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	127 TEST(FontRegistry, Basic)
7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	128 {
7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	129 Orthanc::Image s(Orthanc::PixelFormat_RGB24, 640, 480, false);
7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	130 memset(s.GetBuffer(), 0, s.GetPitch() * s.GetHeight());
7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	131
7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	132 {
7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	133 Orthanc::OrthancConfiguration::ReaderLock lock;
7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	134 ASSERT_GE(1u, lock.GetConfiguration().GetFontRegistry().GetSize());
7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	135 lock.GetConfiguration().GetFontRegistry().GetFont(0).Draw
7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	136 (s, "Hello world É\n\rComment ça va ?\nq", 50, 60, 255, 0, 0);
7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	137 }
7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	138
7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	139 Orthanc::PngWriter w;
4311 cb9aef006229 turning IImageWriter into a pure interface Sebastien Jodogne <s.jodogne@gmail.com> parents: 4275 diff changeset	140 Orthanc::IImageWriter::WriteToFile(w, "UnitTestsResults/font.png", s);
4046 7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	141 }
7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	142
7ff1e6c80627 moving ImageTests.cpp to framework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	143
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	144 TEST(FromDcmtkBridge, ValueRepresentationConversions)
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	145 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	146 #if ORTHANC_ENABLE_PLUGINS == 1
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	147 ASSERT_EQ(1, ValueRepresentation_ApplicationEntity);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	148 ASSERT_EQ(1, OrthancPluginValueRepresentation_AE);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	149
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	150 for (int i = ValueRepresentation_ApplicationEntity;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	151 i <= ValueRepresentation_NotSupported; i++)
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	152 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	153 ValueRepresentation vr = static_cast<ValueRepresentation>(i);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	154
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	155 if (vr == ValueRepresentation_NotSupported)
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	156 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	157 ASSERT_THROW(ToDcmtkBridge::Convert(vr), OrthancException);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	158 ASSERT_THROW(Plugins::Convert(vr), OrthancException);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	159 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	160 else if (vr == ValueRepresentation_OtherDouble \|\|
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	161 vr == ValueRepresentation_OtherLong \|\|
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	162 vr == ValueRepresentation_UniversalResource \|\|
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	163 vr == ValueRepresentation_UnlimitedCharacters)
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	164 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	165 // These VR are not supported as of DCMTK 3.6.0
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	166 ASSERT_THROW(ToDcmtkBridge::Convert(vr), OrthancException);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	167 ASSERT_EQ(OrthancPluginValueRepresentation_UN, Plugins::Convert(vr));
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	168 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	169 else
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	170 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	171 ASSERT_EQ(vr, FromDcmtkBridge::Convert(ToDcmtkBridge::Convert(vr)));
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	172
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	173 OrthancPluginValueRepresentation plugins = Plugins::Convert(vr);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	174 ASSERT_EQ(vr, Plugins::Convert(plugins));
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	175 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	176 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	177
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	178 for (int i = OrthancPluginValueRepresentation_AE;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	179 i <= OrthancPluginValueRepresentation_UT; i++)
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	180 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	181 OrthancPluginValueRepresentation plugins = static_cast<OrthancPluginValueRepresentation>(i);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	182 ValueRepresentation orthanc = Plugins::Convert(plugins);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	183 ASSERT_EQ(plugins, Plugins::Convert(orthanc));
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	184 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	185 #endif
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	186 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	187
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	188
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	189
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	190 TEST(DicomMap, DicomAsJson)
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	191 {
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	192 // This is a Latin-1 test string: "crane" with a circumflex accent
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	193 const unsigned char raw[] = { 0x63, 0x72, 0xe2, 0x6e, 0x65 };
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	194 std::string latin1((char*) &raw[0], sizeof(raw) / sizeof(char));
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	195
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	196 std::string utf8 = Toolbox::ConvertToUtf8(latin1, Encoding_Latin1, false);
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	197
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	198 ParsedDicomFile dicom(false);
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	199 dicom.SetEncoding(Encoding_Latin1);
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	200 dicom.ReplacePlainString(DICOM_TAG_PATIENT_NAME, "Hello");
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	201 dicom.ReplacePlainString(DICOM_TAG_STUDY_DESCRIPTION, utf8);
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	202 dicom.ReplacePlainString(DICOM_TAG_SERIES_DESCRIPTION, std::string(ORTHANC_MAXIMUM_TAG_LENGTH, 'a'));
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	203 dicom.ReplacePlainString(DICOM_TAG_MANUFACTURER, std::string(ORTHANC_MAXIMUM_TAG_LENGTH + 1, 'a'));
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	204 dicom.ReplacePlainString(DICOM_TAG_PIXEL_DATA, "binary");
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	205 dicom.ReplacePlainString(DICOM_TAG_ROWS, "512");
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	206
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	207 DcmDataset& dataset = *dicom.GetDcmtkObject().getDataset();
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	208 dataset.insertEmptyElement(DCM_StudyID, OFFalse);
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	209
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	210 {
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	211 std::unique_ptr<DcmSequenceOfItems> sequence(new DcmSequenceOfItems(DCM_ReferencedSeriesSequence));
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	212
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	213 {
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	214 std::unique_ptr<DcmItem> item(new DcmItem);
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	215 item->putAndInsertString(DCM_ReferencedSOPInstanceUID, "nope", OFFalse);
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	216 ASSERT_TRUE(sequence->insert(item.release(), false, false).good());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	217 }
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	218
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	219 ASSERT_TRUE(dataset.insert(sequence.release(), false, false).good());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	220 }
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	221
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	222
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	223 // Check re-encoding
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	224 DcmElement* element = NULL;
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	225 ASSERT_TRUE(dataset.findAndGetElement(DCM_StudyDescription, element).good() &&
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	226 element != NULL);
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	227
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	228 char* c = NULL;
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	229 ASSERT_TRUE(element != NULL &&
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	230 element->isLeaf() &&
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	231 element->isaString() &&
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	232 element->getString(c).good());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	233 ASSERT_EQ(0, memcmp(c, raw, latin1.length()));
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	234
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	235 ASSERT_TRUE(dataset.findAndGetElement(DCM_Rows, element).good() &&
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	236 element != NULL &&
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	237 element->getTag().getEVR() == EVR_US);
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	238
4508 8f9090b137f1 Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4504 diff changeset	239 std::unique_ptr<DicomInstanceToStore> toStore(DicomInstanceToStore::CreateFromParsedDicomFile(dicom));
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	240
4504 7d1eabfac6e0 removed cached dicom-as-json from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	241 Json::Value dicomAsJson;
4508 8f9090b137f1 Optimization in C-STORE SCP by avoiding an unnecessary DICOM parsing Sebastien Jodogne <s.jodogne@gmail.com> parents: 4504 diff changeset	242 OrthancConfiguration::DefaultDicomDatasetToJson(dicomAsJson, toStore->GetParsedDicomFile());
4504 7d1eabfac6e0 removed cached dicom-as-json from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	243
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	244 DicomMap m;
4504 7d1eabfac6e0 removed cached dicom-as-json from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	245 m.FromDicomAsJson(dicomAsJson);
4057 8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	246
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	247 ASSERT_EQ("ISO_IR 100", m.GetValue(DICOM_TAG_SPECIFIC_CHARACTER_SET).GetContent());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	248
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	249 ASSERT_FALSE(m.GetValue(DICOM_TAG_PATIENT_NAME).IsBinary());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	250 ASSERT_EQ("Hello", m.GetValue(DICOM_TAG_PATIENT_NAME).GetContent());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	251
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	252 ASSERT_FALSE(m.GetValue(DICOM_TAG_STUDY_DESCRIPTION).IsBinary());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	253 ASSERT_EQ(utf8, m.GetValue(DICOM_TAG_STUDY_DESCRIPTION).GetContent());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	254
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	255 ASSERT_FALSE(m.HasTag(DICOM_TAG_MANUFACTURER)); // Too long
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	256 ASSERT_FALSE(m.HasTag(DICOM_TAG_PIXEL_DATA)); // Pixel data
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	257 ASSERT_FALSE(m.HasTag(DICOM_TAG_REFERENCED_SERIES_SEQUENCE)); // Sequence
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	258 ASSERT_EQ(DICOM_TAG_REFERENCED_SERIES_SEQUENCE.GetGroup(), DCM_ReferencedSeriesSequence.getGroup());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	259 ASSERT_EQ(DICOM_TAG_REFERENCED_SERIES_SEQUENCE.GetElement(), DCM_ReferencedSeriesSequence.getElement());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	260
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	261 ASSERT_TRUE(m.HasTag(DICOM_TAG_SERIES_DESCRIPTION)); // Maximum length
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	262 ASSERT_FALSE(m.GetValue(DICOM_TAG_SERIES_DESCRIPTION).IsBinary());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	263 ASSERT_EQ(ORTHANC_MAXIMUM_TAG_LENGTH,
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	264 static_cast<int>(m.GetValue(DICOM_TAG_SERIES_DESCRIPTION).GetContent().length()));
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	265
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	266 ASSERT_FALSE(m.GetValue(DICOM_TAG_ROWS).IsBinary());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	267 ASSERT_EQ("512", m.GetValue(DICOM_TAG_ROWS).GetContent());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	268
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	269 ASSERT_FALSE(m.GetValue(DICOM_TAG_STUDY_ID).IsNull());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	270 ASSERT_FALSE(m.GetValue(DICOM_TAG_STUDY_ID).IsBinary());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	271 ASSERT_EQ("", m.GetValue(DICOM_TAG_STUDY_ID).GetContent());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	272
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	273 DicomArray a(m);
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	274 ASSERT_EQ(6u, a.GetSize());
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	275
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	276
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	277 //dicom.SaveToFile("/tmp/test.dcm");
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	278 //std::cout << toStore.GetJson() << std::endl;
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	279 //a.Print(stdout);
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	280 }
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	281
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	282
8b7cd69806f2 move DicomMapTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4055 diff changeset	283
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	284 namespace Orthanc
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	285 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	286 // Namespace for the "FRIEND_TEST()" directive in "FromDcmtkBridge" to apply:
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	287 // https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuide.md#private-class-members
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	288
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	289 static const DicomTag REFERENCED_STUDY_SEQUENCE(0x0008, 0x1110);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	290 static const DicomTag REFERENCED_PATIENT_SEQUENCE(0x0008, 0x1120);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	291
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	292 static void CreateSampleJson(Json::Value& a)
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	293 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	294 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	295 Json::Value b = Json::objectValue;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	296 b["PatientName"] = "Hello";
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	297 b["PatientID"] = "World";
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	298 b["StudyDescription"] = "Toto";
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	299 a.append(b);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	300 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	301
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	302 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	303 Json::Value b = Json::objectValue;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	304 b["PatientName"] = "data:application/octet-stream;base64,SGVsbG8y"; // echo -n "Hello2" \| base64
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	305 b["PatientID"] = "World2";
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	306 a.append(b);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	307 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	308 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	309
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	310 TEST(FromDcmtkBridge, FromJson)
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	311 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	312 std::unique_ptr<DcmElement> element;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	313
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	314 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	315 Json::Value a;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	316 a = "Hello";
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	317 element.reset(FromDcmtkBridge::FromJson(DICOM_TAG_PATIENT_NAME, a, false, Encoding_Utf8, ""));
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	318
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	319 Json::Value b;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	320 std::set<DicomTag> ignoreTagLength;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	321 ignoreTagLength.insert(DICOM_TAG_PATIENT_ID);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	322
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	323 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	324 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength, 0);
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	325 ASSERT_TRUE(b.isMember("0010,0010"));
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	326 ASSERT_EQ("Hello", b["0010,0010"].asString());
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	327
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	328 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	329 DicomToJsonFlags_Default, 3, Encoding_Ascii, false, ignoreTagLength, 0);
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	330 ASSERT_TRUE(b["0010,0010"].isNull()); // "Hello" has more than 3 characters
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	331
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	332 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Full,
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	333 DicomToJsonFlags_Default, 3, Encoding_Ascii, false, ignoreTagLength, 0);
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	334 ASSERT_TRUE(b["0010,0010"].isObject());
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	335 ASSERT_EQ("PatientName", b["0010,0010"]["Name"].asString());
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	336 ASSERT_EQ("TooLong", b["0010,0010"]["Type"].asString());
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	337 ASSERT_TRUE(b["0010,0010"]["Value"].isNull());
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	338
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	339 ignoreTagLength.insert(DICOM_TAG_PATIENT_NAME);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	340 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	341 DicomToJsonFlags_Default, 3, Encoding_Ascii, false, ignoreTagLength, 0);
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	342 ASSERT_EQ("Hello", b["0010,0010"].asString());
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	343 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	344
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	345 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	346 Json::Value a;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	347 a = "Hello";
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	348 // Cannot assign a string to a sequence
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	349 ASSERT_THROW(element.reset(FromDcmtkBridge::FromJson(REFERENCED_STUDY_SEQUENCE, a, false, Encoding_Utf8, "")), OrthancException);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	350 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	351
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	352 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	353 Json::Value a = Json::arrayValue;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	354 a.append("Hello");
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	355 // Cannot assign an array to a string
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	356 ASSERT_THROW(element.reset(FromDcmtkBridge::FromJson(DICOM_TAG_PATIENT_NAME, a, false, Encoding_Utf8, "")), OrthancException);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	357 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	358
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	359 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	360 Json::Value a;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	361 a = "data:application/octet-stream;base64,SGVsbG8="; // echo -n "Hello" \| base64
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	362 element.reset(FromDcmtkBridge::FromJson(DICOM_TAG_PATIENT_NAME, a, true, Encoding_Utf8, ""));
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	363
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	364 Json::Value b;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	365 std::set<DicomTag> ignoreTagLength;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	366 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	367 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength, 0);
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	368 ASSERT_EQ("Hello", b["0010,0010"].asString());
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	369 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	370
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	371 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	372 Json::Value a = Json::arrayValue;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	373 CreateSampleJson(a);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	374 element.reset(FromDcmtkBridge::FromJson(REFERENCED_STUDY_SEQUENCE, a, true, Encoding_Utf8, ""));
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	375
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	376 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	377 Json::Value b;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	378 std::set<DicomTag> ignoreTagLength;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	379 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Short,
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	380 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength, 0);
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	381 ASSERT_EQ(Json::arrayValue, b["0008,1110"].type());
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	382 ASSERT_EQ(2u, b["0008,1110"].size());
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	383
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	384 Json::Value::ArrayIndex i = (b["0008,1110"][0]["0010,0010"].asString() == "Hello") ? 0 : 1;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	385
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	386 ASSERT_EQ(3u, b["0008,1110"][i].size());
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	387 ASSERT_EQ(2u, b["0008,1110"][1 - i].size());
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	388 ASSERT_EQ(b["0008,1110"][i]["0010,0010"].asString(), "Hello");
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	389 ASSERT_EQ(b["0008,1110"][i]["0010,0020"].asString(), "World");
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	390 ASSERT_EQ(b["0008,1110"][i]["0008,1030"].asString(), "Toto");
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	391 ASSERT_EQ(b["0008,1110"][1 - i]["0010,0010"].asString(), "Hello2");
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	392 ASSERT_EQ(b["0008,1110"][1 - i]["0010,0020"].asString(), "World2");
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	393 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	394
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	395 {
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	396 Json::Value b;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	397 std::set<DicomTag> ignoreTagLength;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	398 FromDcmtkBridge::ElementToJson(b, *element, DicomToJsonFormat_Full,
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4508 diff changeset	399 DicomToJsonFlags_Default, 0, Encoding_Ascii, false, ignoreTagLength, 0);
4055 9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	400
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	401 Json::Value c;
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	402 Toolbox::SimplifyDicomAsJson(c, b, DicomToJsonFormat_Human);
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	403
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	404 a[1]["PatientName"] = "Hello2"; // To remove the Data URI Scheme encoding
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	405 ASSERT_EQ(0, c["ReferencedStudySequence"].compare(a));
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	406 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	407 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	408 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	409 }
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	410
9214e3a7b0a2 moving FromDcmtkTests.cpp from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4046 diff changeset	411
4059 e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	412 TEST(StorageCommitmentReports, Basic)
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	413 {
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	414 Orthanc::StorageCommitmentReports reports(2);
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	415 ASSERT_EQ(2u, reports.GetMaxSize());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	416
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	417 {
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	418 Orthanc::StorageCommitmentReports::Accessor accessor(reports, "nope");
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	419 ASSERT_EQ("nope", accessor.GetTransactionUid());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	420 ASSERT_FALSE(accessor.IsValid());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	421 ASSERT_THROW(accessor.GetReport(), Orthanc::OrthancException);
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	422 }
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	423
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	424 reports.Store("a", new Orthanc::StorageCommitmentReports::Report("aet_a"));
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	425 reports.Store("b", new Orthanc::StorageCommitmentReports::Report("aet_b"));
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	426 reports.Store("c", new Orthanc::StorageCommitmentReports::Report("aet_c"));
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	427
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	428 {
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	429 Orthanc::StorageCommitmentReports::Accessor accessor(reports, "a");
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	430 ASSERT_FALSE(accessor.IsValid());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	431 }
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	432
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	433 {
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	434 Orthanc::StorageCommitmentReports::Accessor accessor(reports, "b");
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	435 ASSERT_TRUE(accessor.IsValid());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	436 ASSERT_EQ("aet_b", accessor.GetReport().GetRemoteAet());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	437 ASSERT_EQ(Orthanc::StorageCommitmentReports::Report::Status_Pending,
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	438 accessor.GetReport().GetStatus());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	439 }
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	440
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	441 {
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	442 Orthanc::StorageCommitmentReports::Accessor accessor(reports, "c");
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	443 ASSERT_EQ("aet_c", accessor.GetReport().GetRemoteAet());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	444 ASSERT_TRUE(accessor.IsValid());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	445 }
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	446
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	447 {
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	448 std::unique_ptr<Orthanc::StorageCommitmentReports::Report> report
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	449 (new Orthanc::StorageCommitmentReports::Report("aet"));
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	450 report->AddSuccess("class1", "instance1");
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	451 report->AddFailure("class2", "instance2",
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	452 Orthanc::StorageCommitmentFailureReason_ReferencedSOPClassNotSupported);
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	453 report->MarkAsComplete();
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	454 reports.Store("a", report.release());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	455 }
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	456
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	457 {
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	458 Orthanc::StorageCommitmentReports::Accessor accessor(reports, "a");
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	459 ASSERT_TRUE(accessor.IsValid());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	460 ASSERT_EQ("aet", accessor.GetReport().GetRemoteAet());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	461 ASSERT_EQ(Orthanc::StorageCommitmentReports::Report::Status_Failure,
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	462 accessor.GetReport().GetStatus());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	463 }
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	464
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	465 {
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	466 Orthanc::StorageCommitmentReports::Accessor accessor(reports, "b");
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	467 ASSERT_FALSE(accessor.IsValid());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	468 }
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	469
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	470 {
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	471 Orthanc::StorageCommitmentReports::Accessor accessor(reports, "c");
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	472 ASSERT_TRUE(accessor.IsValid());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	473 }
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	474
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	475 {
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	476 std::unique_ptr<Orthanc::StorageCommitmentReports::Report> report
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	477 (new Orthanc::StorageCommitmentReports::Report("aet"));
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	478 report->AddSuccess("class1", "instance1");
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	479 report->MarkAsComplete();
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	480 reports.Store("a", report.release());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	481 }
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	482
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	483 {
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	484 Orthanc::StorageCommitmentReports::Accessor accessor(reports, "a");
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	485 ASSERT_TRUE(accessor.IsValid());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	486 ASSERT_EQ("aet", accessor.GetReport().GetRemoteAet());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	487 ASSERT_EQ(Orthanc::StorageCommitmentReports::Report::Status_Success,
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	488 accessor.GetReport().GetStatus());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	489 }
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	490
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	491 {
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	492 Orthanc::StorageCommitmentReports::Accessor accessor(reports, "b");
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	493 ASSERT_FALSE(accessor.IsValid());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	494 }
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	495
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	496 {
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	497 Orthanc::StorageCommitmentReports::Accessor accessor(reports, "c");
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	498 ASSERT_TRUE(accessor.IsValid());
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	499 }
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	500 }
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	501
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	502
e241e5f3f088 moved LuaTests and MemoryCacheTests from OrthancServer to OrthancFramework Sebastien Jodogne <s.jodogne@gmail.com> parents: 4057 diff changeset	503
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	504 int main(int argc, char **argv)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	505 {
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	506 Logging::Initialize();
3581 4de1b019ca71 unit test DicomWebJson.PixelSpacing Sebastien Jodogne <s.jodogne@gmail.com> parents: 3561 diff changeset	507 Toolbox::InitializeGlobalLocale(NULL);
4273 0034f855c023 tuning log categories from command-line, and binary compat with orthanc framework 1.7.2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4177 diff changeset	508 SetGlobalVerbosity(Verbosity_Verbose);
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	509 Toolbox::DetectEndianness();
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2136 diff changeset	510 SystemToolbox::MakeDirectory("UnitTestsResults");
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	511 OrthancInitialize();
159 c08fbad40ddd less verbosity in unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	512
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	513 ::testing::InitGoogleTest(&argc, argv);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	514 int result = RUN_ALL_TESTS();
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	515
63 f1d0470ff334 renaming unittests Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	516 OrthancFinalize();
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	517 Logging::Finalize();
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1441 diff changeset	518
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	519 return result;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	520 }

Mercurial > hg > orthanc

annotate OrthancServer/UnitTestsSources/UnitTestsMain.cpp @ 4997:1f93dc290628