Mercurial > hg > orthanc
comparison UnitTestsSources/DicomMapTests.cpp @ 1737:ec66a16aa398
removal of DicomStringValue and DicomNullValue
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 22 Oct 2015 07:52:24 +0200 |
parents | d2268c7a7ede |
children | e39716f71d67 |
comparison
equal
deleted
inserted
replaced
1736:b953c6eef28d | 1737:ec66a16aa398 |
---|---|
34 #include "gtest/gtest.h" | 34 #include "gtest/gtest.h" |
35 | 35 |
36 #include "../Core/Uuid.h" | 36 #include "../Core/Uuid.h" |
37 #include "../Core/OrthancException.h" | 37 #include "../Core/OrthancException.h" |
38 #include "../Core/DicomFormat/DicomMap.h" | 38 #include "../Core/DicomFormat/DicomMap.h" |
39 #include "../Core/DicomFormat/DicomNullValue.h" | |
40 #include "../OrthancServer/FromDcmtkBridge.h" | 39 #include "../OrthancServer/FromDcmtkBridge.h" |
41 | 40 |
42 #include <memory> | 41 #include <memory> |
43 | 42 |
44 using namespace Orthanc; | 43 using namespace Orthanc; |
101 | 100 |
102 ASSERT_FALSE(m.HasTag(DICOM_TAG_PATIENT_ID)); | 101 ASSERT_FALSE(m.HasTag(DICOM_TAG_PATIENT_ID)); |
103 m.SetValue(DICOM_TAG_PATIENT_ID, "PatientID"); | 102 m.SetValue(DICOM_TAG_PATIENT_ID, "PatientID"); |
104 ASSERT_TRUE(m.HasTag(0x0010, 0x0020)); | 103 ASSERT_TRUE(m.HasTag(0x0010, 0x0020)); |
105 m.SetValue(DICOM_TAG_PATIENT_ID, "PatientID2"); | 104 m.SetValue(DICOM_TAG_PATIENT_ID, "PatientID2"); |
106 ASSERT_EQ("PatientID2", m.GetValue(0x0010, 0x0020).AsString()); | 105 ASSERT_EQ("PatientID2", m.GetValue(0x0010, 0x0020).GetContent()); |
107 | 106 |
108 m.GetTags(s); | 107 m.GetTags(s); |
109 ASSERT_EQ(2u, s.size()); | 108 ASSERT_EQ(2u, s.size()); |
110 | 109 |
111 m.Remove(DICOM_TAG_PATIENT_ID); | 110 m.Remove(DICOM_TAG_PATIENT_ID); |
114 m.GetTags(s); | 113 m.GetTags(s); |
115 ASSERT_EQ(1u, s.size()); | 114 ASSERT_EQ(1u, s.size()); |
116 ASSERT_EQ(DICOM_TAG_PATIENT_NAME, *s.begin()); | 115 ASSERT_EQ(DICOM_TAG_PATIENT_NAME, *s.begin()); |
117 | 116 |
118 std::auto_ptr<DicomMap> mm(m.Clone()); | 117 std::auto_ptr<DicomMap> mm(m.Clone()); |
119 ASSERT_EQ("PatientName", mm->GetValue(DICOM_TAG_PATIENT_NAME).AsString()); | 118 ASSERT_EQ("PatientName", mm->GetValue(DICOM_TAG_PATIENT_NAME).GetContent()); |
120 | 119 |
121 m.SetValue(DICOM_TAG_PATIENT_ID, "Hello"); | 120 m.SetValue(DICOM_TAG_PATIENT_ID, "Hello"); |
122 ASSERT_THROW(mm->GetValue(DICOM_TAG_PATIENT_ID), OrthancException); | 121 ASSERT_THROW(mm->GetValue(DICOM_TAG_PATIENT_ID), OrthancException); |
123 mm->CopyTagIfExists(m, DICOM_TAG_PATIENT_ID); | 122 mm->CopyTagIfExists(m, DICOM_TAG_PATIENT_ID); |
124 ASSERT_EQ("Hello", mm->GetValue(DICOM_TAG_PATIENT_ID).AsString()); | 123 ASSERT_EQ("Hello", mm->GetValue(DICOM_TAG_PATIENT_ID).GetContent()); |
125 | 124 |
126 DicomNullValue v; | 125 DicomValue v; |
127 ASSERT_TRUE(v.IsNull()); | 126 ASSERT_TRUE(v.IsNull()); |
128 } | 127 } |
129 | 128 |
130 | 129 |
131 TEST(DicomMap, FindTemplates) | 130 TEST(DicomMap, FindTemplates) |