Mercurial > hg > orthanc

comparison UnitTestsSources/ServerIndexTests.cpp @ 1492:9f66a12eb8fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix warnings for gcc 5
author jodogne
date Tue, 04 Aug 2015 14:47:35 +0200
parents f967bdf8534e
children d73a2178b319
comparison
equal deleted inserted replaced
1491:e460341872dc 1492:9f66a12eb8fc
191 { 191 {
192 case DatabaseWrapperClass_SQLite: 192 case DatabaseWrapperClass_SQLite:
193 { 193 {
194 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); 194 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get());
195 sqlite->GetChildren(j, id); 195 sqlite->GetChildren(j, id);
196 ASSERT_EQ(0, j.size()); 196 ASSERT_EQ(0u, j.size());
197 break; 197 break;
198 } 198 }
199 199
200 default: 200 default:
201 throw OrthancException(ErrorCode_InternalError); 201 throw OrthancException(ErrorCode_InternalError);
210 { 210 {
211 case DatabaseWrapperClass_SQLite: 211 case DatabaseWrapperClass_SQLite:
212 { 212 {
213 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); 213 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get());
214 sqlite->GetChildren(j, id); 214 sqlite->GetChildren(j, id);
215 ASSERT_EQ(1, j.size()); 215 ASSERT_EQ(1u, j.size());
216 ASSERT_EQ(expected, j.front()); 216 ASSERT_EQ(expected, j.front());
217 break; 217 break;
218 } 218 }
219 219
220 default: 220 default:
232 { 232 {
233 case DatabaseWrapperClass_SQLite: 233 case DatabaseWrapperClass_SQLite:
234 { 234 {
235 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get()); 235 DatabaseWrapper* sqlite = dynamic_cast<DatabaseWrapper*>(index_.get());
236 sqlite->GetChildren(j, id); 236 sqlite->GetChildren(j, id);
237 ASSERT_EQ(2, j.size()); 237 ASSERT_EQ(2u, j.size());
238 ASSERT_TRUE((expected1 == j.front() && expected2 == j.back()) || 238 ASSERT_TRUE((expected1 == j.front() && expected2 == j.back()) ||
239 (expected1 == j.back() && expected2 == j.front())); 239 (expected1 == j.back() && expected2 == j.front()));
240 break; 240 break;
241 } 241 }
242 242
753 instance.SetValue(DICOM_TAG_SOP_INSTANCE_UID, "instance-" + id); 753 instance.SetValue(DICOM_TAG_SOP_INSTANCE_UID, "instance-" + id);
754 754
755 std::map<MetadataType, std::string> instanceMetadata; 755 std::map<MetadataType, std::string> instanceMetadata;
756 ServerIndex::MetadataMap metadata; 756 ServerIndex::MetadataMap metadata;
757 ASSERT_EQ(StoreStatus_Success, index.Store(instanceMetadata, instance, attachments, "", metadata)); 757 ASSERT_EQ(StoreStatus_Success, index.Store(instanceMetadata, instance, attachments, "", metadata));
758 ASSERT_EQ(2, instanceMetadata.size()); 758 ASSERT_EQ(2u, instanceMetadata.size());
759 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_RemoteAet) != instanceMetadata.end()); 759 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_RemoteAet) != instanceMetadata.end());
760 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end()); 760 ASSERT_TRUE(instanceMetadata.find(MetadataType_Instance_ReceptionDate) != instanceMetadata.end());
761 761
762 DicomInstanceHasher hasher(instance); 762 DicomInstanceHasher hasher(instance);
763 ids.push_back(hasher.HashPatient()); 763 ids.push_back(hasher.HashPatient());