Mercurial > hg > orthanc

changeset 7109:823a4e5e9fc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
preparing DataSourceTests.cpp
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 14 Aug 2026 09:16:55 +0200
parents 247101bd4e74
children 5200f9e88bcd
files OrthancFramework/UnitTestsSources/CMakeLists.txt OrthancFramework/UnitTestsSources/DataSourceTests.cpp OrthancFramework/UnitTestsSources/JobsTests.cpp OrthancServer/CMakeLists.txt
diffstat 4 files changed, 63 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/UnitTestsSources/CMakeLists.txt	Fri Aug 14 08:37:38 2026 +0200
+++ b/OrthancFramework/UnitTestsSources/CMakeLists.txt	Fri Aug 14 09:16:55 2026 +0200
@@ -87,6 +87,7 @@
 add_executable(UnitTests
   ${CMAKE_SOURCE_DIR}/SharedLibraryUnitTests.cpp
 
+  ${CMAKE_SOURCE_DIR}/DataSourceTests.cpp
   ${CMAKE_SOURCE_DIR}/DicomMapTests.cpp
   ${CMAKE_SOURCE_DIR}/FileStorageTests.cpp
   ${CMAKE_SOURCE_DIR}/FrameworkTests.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OrthancFramework/UnitTestsSources/DataSourceTests.cpp	Fri Aug 14 09:16:55 2026 +0200
@@ -0,0 +1,39 @@
+/**
+ * Orthanc - A Lightweight, RESTful DICOM Store
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2023 Osimis S.A., Belgium
+ * Copyright (C) 2024-2026 Orthanc Team SRL, Belgium
+ * Copyright (C) 2021-2026 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ **/
+
+
+#if ORTHANC_UNIT_TESTS_LINK_FRAMEWORK == 1
+// Must be the first to be sure to use the Orthanc framework shared library
+#  include <OrthancFramework.h>
+#endif
+
+#include <gtest/gtest.h>
+
+#include "../Sources/DataSource/DataSourceReader.h"
+
+using namespace Orthanc;
+
+
+TEST(DataSources, Basic)
+{
+}
--- a/OrthancFramework/UnitTestsSources/JobsTests.cpp	Fri Aug 14 08:37:38 2026 +0200
+++ b/OrthancFramework/UnitTestsSources/JobsTests.cpp	Fri Aug 14 09:16:55 2026 +0200
@@ -29,25 +29,25 @@
 
 #include <gtest/gtest.h>
 
-#include "../../OrthancFramework/Sources/Compatibility.h"
-#include "../../OrthancFramework/Sources/DicomNetworking/DicomAssociationParameters.h"
-#include "../../OrthancFramework/Sources/DicomNetworking/RemoteModalityParameters.h"
-#include "../../OrthancFramework/Sources/DicomParsing/DicomModification.h"
-#include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h"
-#include "../../OrthancFramework/Sources/JobsEngine/GenericJobUnserializer.h"
-#include "../../OrthancFramework/Sources/JobsEngine/JobsEngine.h"
-#include "../../OrthancFramework/Sources/JobsEngine/Operations/JobOperationValues.h"
-#include "../../OrthancFramework/Sources/JobsEngine/Operations/LogJobOperation.h"
-#include "../../OrthancFramework/Sources/JobsEngine/Operations/NullOperationValue.h"
-#include "../../OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.h"
-#include "../../OrthancFramework/Sources/JobsEngine/Operations/StringOperationValue.h"
-#include "../../OrthancFramework/Sources/JobsEngine/SetOfInstancesJob.h"
-#include "../../OrthancFramework/Sources/Logging.h"
-#include "../../OrthancFramework/Sources/MultiThreading/BlockingSharedMessageQueue.h"
-#include "../../OrthancFramework/Sources/MultiThreading/SharedMessageQueue.h"
-#include "../../OrthancFramework/Sources/MultiThreading/ThreadPool.h"
-#include "../../OrthancFramework/Sources/OrthancException.h"
-#include "../../OrthancFramework/Sources/SerializationToolbox.h"
+#include "../Sources/Compatibility.h"
+#include "../Sources/DicomNetworking/DicomAssociationParameters.h"
+#include "../Sources/DicomNetworking/RemoteModalityParameters.h"
+#include "../Sources/DicomParsing/DicomModification.h"
+#include "../Sources/DicomParsing/ParsedDicomFile.h"
+#include "../Sources/JobsEngine/GenericJobUnserializer.h"
+#include "../Sources/JobsEngine/JobsEngine.h"
+#include "../Sources/JobsEngine/Operations/JobOperationValues.h"
+#include "../Sources/JobsEngine/Operations/LogJobOperation.h"
+#include "../Sources/JobsEngine/Operations/NullOperationValue.h"
+#include "../Sources/JobsEngine/Operations/SequenceOfOperationsJob.h"
+#include "../Sources/JobsEngine/Operations/StringOperationValue.h"
+#include "../Sources/JobsEngine/SetOfInstancesJob.h"
+#include "../Sources/Logging.h"
+#include "../Sources/MultiThreading/BlockingSharedMessageQueue.h"
+#include "../Sources/MultiThreading/SharedMessageQueue.h"
+#include "../Sources/MultiThreading/ThreadPool.h"
+#include "../Sources/OrthancException.h"
+#include "../Sources/SerializationToolbox.h"
 
 
 using namespace Orthanc;
--- a/OrthancServer/CMakeLists.txt	Fri Aug 14 08:37:38 2026 +0200
+++ b/OrthancServer/CMakeLists.txt	Fri Aug 14 09:16:55 2026 +0200
@@ -176,6 +176,10 @@
 
 if (BUILD_UNIT_TESTS)
   set(ORTHANC_FRAMEWORK_UNIT_TESTS
+    # If adding a file to this list, don't forget to also update
+    # "../OrthancFramework/UnitTestsSources/CMakeLists.txt" and
+    # https://orthanc.uclouvain.be/hg/orthanc-stone/file/default/OrthancStone/Resources/WebAssemblyUnitTests/CMakeLists.txt
+    ${CMAKE_SOURCE_DIR}/../OrthancFramework/UnitTestsSources/DataSourceTests.cpp
     ${CMAKE_SOURCE_DIR}/../OrthancFramework/UnitTestsSources/DicomMapTests.cpp
     ${CMAKE_SOURCE_DIR}/../OrthancFramework/UnitTestsSources/FileStorageTests.cpp
     ${CMAKE_SOURCE_DIR}/../OrthancFramework/UnitTestsSources/FrameworkTests.cpp