Mercurial > hg > orthanc

changeset 3040:07ab06af90ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
preparing for release
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 20 Dec 2018 10:40:01 +0100
parents 0293cb3d8a37
children a6221e2bebd5 0d9e8ba20db8
files UnitTestsSources/DicomMapTests.cpp UnitTestsSources/MultiThreadingTests.cpp
diffstat 2 files changed, 25 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/UnitTestsSources/DicomMapTests.cpp	Thu Dec 20 09:26:09 2018 +0100
+++ b/UnitTestsSources/DicomMapTests.cpp	Thu Dec 20 10:40:01 2018 +0100
@@ -487,7 +487,8 @@
 
   ASSERT_TRUE(m.HasTag(DICOM_TAG_SERIES_DESCRIPTION));  // Maximum length
   ASSERT_FALSE(m.GetValue(DICOM_TAG_SERIES_DESCRIPTION).IsBinary());
-  ASSERT_EQ(ORTHANC_MAXIMUM_TAG_LENGTH, m.GetValue(DICOM_TAG_SERIES_DESCRIPTION).GetContent().length());
+  ASSERT_EQ(ORTHANC_MAXIMUM_TAG_LENGTH,
+            static_cast<int>(m.GetValue(DICOM_TAG_SERIES_DESCRIPTION).GetContent().length()));
 
   ASSERT_FALSE(m.GetValue(DICOM_TAG_ROWS).IsBinary());
   ASSERT_EQ("512", m.GetValue(DICOM_TAG_ROWS).GetContent());
--- a/UnitTestsSources/MultiThreadingTests.cpp	Thu Dec 20 09:26:09 2018 +0100
+++ b/UnitTestsSources/MultiThreadingTests.cpp	Thu Dec 20 10:40:01 2018 +0100
@@ -1733,11 +1733,11 @@
     Json::Value s;
     
     DummyInstancesJob job;
-    ASSERT_EQ(0, job.GetCommandsCount());
-    ASSERT_EQ(0, job.GetInstancesCount());
+    ASSERT_EQ(0u, job.GetCommandsCount());
+    ASSERT_EQ(0u, job.GetInstancesCount());
 
     job.Start();
-    ASSERT_EQ(0, job.GetPosition());
+    ASSERT_EQ(0u, job.GetPosition());
     ASSERT_FALSE(job.HasTrailingStep());
     ASSERT_FALSE(job.IsTrailingStepDone());
 
@@ -1747,7 +1747,7 @@
     }
     
     ASSERT_EQ(JobStepCode_Success, job.Step().GetCode());
-    ASSERT_EQ(1, job.GetPosition());
+    ASSERT_EQ(1u, job.GetPosition());
     ASSERT_FALSE(job.IsTrailingStepDone());
     
     {
@@ -1764,11 +1764,11 @@
     DummyInstancesJob job;
     job.AddInstance("hello");
     job.AddInstance("world");
-    ASSERT_EQ(2, job.GetCommandsCount());
-    ASSERT_EQ(2, job.GetInstancesCount());
+    ASSERT_EQ(2u, job.GetCommandsCount());
+    ASSERT_EQ(2u, job.GetInstancesCount());
 
     job.Start();
-    ASSERT_EQ(0, job.GetPosition());
+    ASSERT_EQ(0u, job.GetPosition());
     ASSERT_FALSE(job.HasTrailingStep());
     ASSERT_FALSE(job.IsTrailingStepDone());
 
@@ -1778,7 +1778,7 @@
     }
     
     ASSERT_EQ(JobStepCode_Continue, job.Step().GetCode());
-    ASSERT_EQ(1, job.GetPosition());
+    ASSERT_EQ(1u, job.GetPosition());
     ASSERT_FALSE(job.IsTrailingStepDone());
     
     {
@@ -1787,7 +1787,7 @@
     }
 
     ASSERT_EQ(JobStepCode_Success, job.Step().GetCode());
-    ASSERT_EQ(2, job.GetPosition());
+    ASSERT_EQ(2u, job.GetPosition());
     ASSERT_FALSE(job.IsTrailingStepDone());
     
     {
@@ -1802,14 +1802,14 @@
     Json::Value s;
     
     DummyInstancesJob job;
-    ASSERT_EQ(0, job.GetInstancesCount());
-    ASSERT_EQ(0, job.GetCommandsCount());
+    ASSERT_EQ(0u, job.GetInstancesCount());
+    ASSERT_EQ(0u, job.GetCommandsCount());
     job.AddTrailingStep();
-    ASSERT_EQ(0, job.GetInstancesCount());
-    ASSERT_EQ(1, job.GetCommandsCount());
+    ASSERT_EQ(0u, job.GetInstancesCount());
+    ASSERT_EQ(1u, job.GetCommandsCount());
 
     job.Start(); // This adds the trailing step
-    ASSERT_EQ(0, job.GetPosition());
+    ASSERT_EQ(0u, job.GetPosition());
     ASSERT_TRUE(job.HasTrailingStep());
     ASSERT_FALSE(job.IsTrailingStepDone());
 
@@ -1819,7 +1819,7 @@
     }
     
     ASSERT_EQ(JobStepCode_Success, job.Step().GetCode());
-    ASSERT_EQ(1, job.GetPosition());
+    ASSERT_EQ(1u, job.GetPosition());
     ASSERT_TRUE(job.IsTrailingStepDone());
     
     {
@@ -1835,15 +1835,15 @@
     
     DummyInstancesJob job;
     job.AddInstance("hello");
-    ASSERT_EQ(1, job.GetInstancesCount());
-    ASSERT_EQ(1, job.GetCommandsCount());
+    ASSERT_EQ(1u, job.GetInstancesCount());
+    ASSERT_EQ(1u, job.GetCommandsCount());
     job.AddTrailingStep();
-    ASSERT_EQ(1, job.GetInstancesCount());
-    ASSERT_EQ(2, job.GetCommandsCount());
+    ASSERT_EQ(1u, job.GetInstancesCount());
+    ASSERT_EQ(2u, job.GetCommandsCount());
     
     job.Start();
-    ASSERT_EQ(2, job.GetCommandsCount());
-    ASSERT_EQ(0, job.GetPosition());
+    ASSERT_EQ(2u, job.GetCommandsCount());
+    ASSERT_EQ(0u, job.GetPosition());
     ASSERT_TRUE(job.HasTrailingStep());
     ASSERT_FALSE(job.IsTrailingStepDone());
 
@@ -1853,7 +1853,7 @@
     }
     
     ASSERT_EQ(JobStepCode_Continue, job.Step().GetCode());
-    ASSERT_EQ(1, job.GetPosition());
+    ASSERT_EQ(1u, job.GetPosition());
     ASSERT_FALSE(job.IsTrailingStepDone());
     
     {
@@ -1862,7 +1862,7 @@
     }
 
     ASSERT_EQ(JobStepCode_Success, job.Step().GetCode());
-    ASSERT_EQ(2, job.GetPosition());
+    ASSERT_EQ(2u, job.GetPosition());
     ASSERT_TRUE(job.IsTrailingStepDone());
     
     {