Mercurial > hg > orthanc-stone

diff UnitTestsSources/UnitTestsMain.cpp @ 1591:5887a4f8594b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moving platform-specific files out of the "OrthancStone" folder
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 23 Oct 2020 13:15:03 +0200
parents a1405ab3a91c
children 4fb8fdf03314
line wrap: on
line diff
--- a/UnitTestsSources/UnitTestsMain.cpp	Thu Oct 22 18:39:03 2020 +0200
+++ b/UnitTestsSources/UnitTestsMain.cpp	Fri Oct 23 13:15:03 2020 +0200
@@ -23,9 +23,9 @@
 
 #include "../OrthancStone/Sources/StoneInitialization.h"
 #include "../OrthancStone/Sources/Toolbox/FiniteProjectiveCamera.h"
+#include "../OrthancStone/Sources/Toolbox/GenericToolbox.h"
 #include "../OrthancStone/Sources/Toolbox/GeometryToolbox.h"
 #include "../OrthancStone/Sources/Volumes/ImageBuffer3D.h"
-#include "../OrthancStone/Sources/Loaders/LoaderCache.h"
 
 #include <Images/ImageProcessing.h>
 #include <Logging.h>
@@ -811,69 +811,69 @@
   ASSERT_DOUBLE_EQ(1.3671875, v[1]); 
 }
 
-TEST(LoaderCache, NormalizeUuid)
+TEST(GenericToolbox, NormalizeUuid)
 {
   std::string ref("44ca5051-14ef-4d2f-8bd7-db20bfb61fbb");
 
   {
     std::string u("44ca5051-14ef-4d2f-8bd7-db20bfb61fbb");
-    OrthancStone::LoaderCache::NormalizeUuid(u);
+    OrthancStone::GenericToolbox::NormalizeUuid(u);
     ASSERT_EQ(ref, u);
   }
 
   // space left
   {
     std::string u("  44ca5051-14ef-4d2f-8bd7-db20bfb61fbb");
-    OrthancStone::LoaderCache::NormalizeUuid(u);
+    OrthancStone::GenericToolbox::NormalizeUuid(u);
     ASSERT_EQ(ref, u);
   }
 
   // space right
   {
     std::string u("44ca5051-14ef-4d2f-8bd7-db20bfb61fbb  ");
-    OrthancStone::LoaderCache::NormalizeUuid(u);
+    OrthancStone::GenericToolbox::NormalizeUuid(u);
     ASSERT_EQ(ref, u);
   }
 
   // space l & r 
   {
     std::string u("  44ca5051-14ef-4d2f-8bd7-db20bfb61fbb  ");
-    OrthancStone::LoaderCache::NormalizeUuid(u);
+    OrthancStone::GenericToolbox::NormalizeUuid(u);
     ASSERT_EQ(ref, u);
   }
 
   // space left + case 
   {
     std::string u("  44CA5051-14ef-4d2f-8bd7-dB20bfb61fbb");
-    OrthancStone::LoaderCache::NormalizeUuid(u);
+    OrthancStone::GenericToolbox::NormalizeUuid(u);
     ASSERT_EQ(ref, u);
   }
 
   // space right + case 
   {
     std::string u("44ca5051-14EF-4D2f-8bd7-db20bfb61fbB  ");
-    OrthancStone::LoaderCache::NormalizeUuid(u);
+    OrthancStone::GenericToolbox::NormalizeUuid(u);
     ASSERT_EQ(ref, u);
   }
 
   // space l & r + case
   {
     std::string u("  44cA5051-14Ef-4d2f-8bD7-db20bfb61fbb  ");
-    OrthancStone::LoaderCache::NormalizeUuid(u);
+    OrthancStone::GenericToolbox::NormalizeUuid(u);
     ASSERT_EQ(ref, u);
   }
 
   // no
   {
     std::string u("  44ca5051-14ef-4d2f-8bd7-  db20bfb61fbb");
-    OrthancStone::LoaderCache::NormalizeUuid(u);
+    OrthancStone::GenericToolbox::NormalizeUuid(u);
     ASSERT_NE(ref, u);
   }
 
   // no
   {
     std::string u("44ca5051-14ef-4d2f-8bd7-db20bfb61fb");
-    OrthancStone::LoaderCache::NormalizeUuid(u);
+    OrthancStone::GenericToolbox::NormalizeUuid(u);
     ASSERT_NE(ref, u);
   }
 }