Mercurial > hg > orthanc
comparison UnitTests/ServerIndex.cpp @ 185:5185ae1d9af5
fix for msvc
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 12 Nov 2012 15:11:43 +0100 |
parents | d4e967d401d3 |
children | 090cefdab1d1 |
comparison
equal
deleted
inserted
replaced
184:d4e967d401d3 | 185:5185ae1d9af5 |
---|---|
70 ASSERT_TRUE(index.GetParentPublicId(s, a[2])); ASSERT_EQ("b", s); | 70 ASSERT_TRUE(index.GetParentPublicId(s, a[2])); ASSERT_EQ("b", s); |
71 ASSERT_TRUE(index.GetParentPublicId(s, a[3])); ASSERT_EQ("c", s); | 71 ASSERT_TRUE(index.GetParentPublicId(s, a[3])); ASSERT_EQ("c", s); |
72 ASSERT_TRUE(index.GetParentPublicId(s, a[4])); ASSERT_EQ("c", s); | 72 ASSERT_TRUE(index.GetParentPublicId(s, a[4])); ASSERT_EQ("c", s); |
73 ASSERT_TRUE(index.GetParentPublicId(s, a[5])); ASSERT_EQ("g", s); | 73 ASSERT_TRUE(index.GetParentPublicId(s, a[5])); ASSERT_EQ("g", s); |
74 | 74 |
75 /* | 75 std::list<std::string> l; |
76 std::list<std::string> l; | |
77 index.GetChildrenPublicId(l, a[0]); ASSERT_EQ(1, l.size()); ASSERT_EQ("b", l.front()); | 76 index.GetChildrenPublicId(l, a[0]); ASSERT_EQ(1, l.size()); ASSERT_EQ("b", l.front()); |
78 index.GetChildrenPublicId(l, a[1]); ASSERT_EQ(1, l.size()); ASSERT_EQ("c", l.front()); | 77 index.GetChildrenPublicId(l, a[1]); ASSERT_EQ(1, l.size()); ASSERT_EQ("c", l.front()); |
79 index.GetChildrenPublicId(l, a[3]); ASSERT_EQ(0, l.size()); | 78 index.GetChildrenPublicId(l, a[3]); ASSERT_EQ(0, l.size()); |
80 index.GetChildrenPublicId(l, a[4]); ASSERT_EQ(0, l.size()); | 79 index.GetChildrenPublicId(l, a[4]); ASSERT_EQ(0, l.size()); |
81 index.GetChildrenPublicId(l, a[5]); ASSERT_EQ(0, l.size()); | 80 index.GetChildrenPublicId(l, a[5]); ASSERT_EQ(0, l.size()); |
89 else | 88 else |
90 { | 89 { |
91 ASSERT_EQ("d", l.back()); | 90 ASSERT_EQ("d", l.back()); |
92 ASSERT_EQ("e", l.front()); | 91 ASSERT_EQ("e", l.front()); |
93 } | 92 } |
94 */ | |
95 | 93 |
96 index.AttachFile(a[4], "_json", "my json file", 21, 42, CompressionType_Zlib); | 94 index.AttachFile(a[4], "_json", "my json file", 21, 42, CompressionType_Zlib); |
97 index.AttachFile(a[4], "_dicom", "my dicom file", 42); | 95 index.AttachFile(a[4], "_dicom", "my dicom file", 42); |
98 index.AttachFile(a[6], "_hello", "world", 44); | 96 index.AttachFile(a[6], "_hello", "world", 44); |
99 index.SetMetadata(a[4], MetadataType_Instance_RemoteAet, "PINNACLE"); | 97 index.SetMetadata(a[4], MetadataType_Instance_RemoteAet, "PINNACLE"); |
137 ASSERT_EQ(1, index.GetTableRecordCount("Metadata")); | 135 ASSERT_EQ(1, index.GetTableRecordCount("Metadata")); |
138 ASSERT_EQ(1, index.GetTableRecordCount("MainDicomTags")); | 136 ASSERT_EQ(1, index.GetTableRecordCount("MainDicomTags")); |
139 index.DeleteResource(a[0]); | 137 index.DeleteResource(a[0]); |
140 | 138 |
141 ASSERT_EQ(2, listener.deletedFiles_.size()); | 139 ASSERT_EQ(2, listener.deletedFiles_.size()); |
142 ASSERT_NE(listener.deletedFiles_.end(), listener.deletedFiles_.find("my json file")); | 140 ASSERT_FALSE(listener.deletedFiles_.find("my json file") == listener.deletedFiles_.end()); |
143 ASSERT_NE(listener.deletedFiles_.end(), listener.deletedFiles_.find("my dicom file")); | 141 ASSERT_FALSE(listener.deletedFiles_.find("my dicom file") == listener.deletedFiles_.end()); |
144 | 142 |
145 ASSERT_EQ(2, index.GetTableRecordCount("Resources")); | 143 ASSERT_EQ(2, index.GetTableRecordCount("Resources")); |
146 ASSERT_EQ(0, index.GetTableRecordCount("Metadata")); | 144 ASSERT_EQ(0, index.GetTableRecordCount("Metadata")); |
147 ASSERT_EQ(1, index.GetTableRecordCount("AttachedFiles")); | 145 ASSERT_EQ(1, index.GetTableRecordCount("AttachedFiles")); |
148 ASSERT_EQ(0, index.GetTableRecordCount("MainDicomTags")); | 146 ASSERT_EQ(0, index.GetTableRecordCount("MainDicomTags")); |
150 ASSERT_EQ(0, index.GetTableRecordCount("Resources")); | 148 ASSERT_EQ(0, index.GetTableRecordCount("Resources")); |
151 ASSERT_EQ(0, index.GetTableRecordCount("AttachedFiles")); | 149 ASSERT_EQ(0, index.GetTableRecordCount("AttachedFiles")); |
152 ASSERT_EQ(1, index.GetTableRecordCount("GlobalProperties")); | 150 ASSERT_EQ(1, index.GetTableRecordCount("GlobalProperties")); |
153 | 151 |
154 ASSERT_EQ(3, listener.deletedFiles_.size()); | 152 ASSERT_EQ(3, listener.deletedFiles_.size()); |
155 ASSERT_NE(listener.deletedFiles_.end(), listener.deletedFiles_.find("world")); | 153 ASSERT_FALSE(listener.deletedFiles_.find("world") == listener.deletedFiles_.end()); |
156 } | 154 } |
157 | 155 |
158 | 156 |
159 | 157 |
160 | 158 |