comparison UnitTestsSources/ServerIndexTests.cpp @ 1241:90d2f320862d

refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 05 Dec 2014 17:22:53 +0100
parents 92c6b3b57699
children 32fcc5dc7562
comparison
equal deleted inserted replaced
1240:62c35e4b67db 1241:90d2f320862d
154 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[4])); 154 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[4]));
155 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[5])); 155 ASSERT_EQ(ResourceType_Instance, index_->GetResourceType(a[5]));
156 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[6])); 156 ASSERT_EQ(ResourceType_Study, index_->GetResourceType(a[6]));
157 157
158 { 158 {
159 Json::Value t; 159 std::list<std::string> t;
160 index_->GetAllPublicIds(t, ResourceType_Patient); 160 index_->GetAllPublicIds(t, ResourceType_Patient);
161 161
162 ASSERT_EQ(1u, t.size()); 162 ASSERT_EQ(1u, t.size());
163 ASSERT_EQ("a", t[0u].asString()); 163 ASSERT_EQ("a", t.front());
164 164
165 index_->GetAllPublicIds(t, ResourceType_Series); 165 index_->GetAllPublicIds(t, ResourceType_Series);
166 ASSERT_EQ(1u, t.size()); 166 ASSERT_EQ(1u, t.size());
167 ASSERT_EQ("c", t[0u].asString()); 167 ASSERT_EQ("c", t.front());
168 168
169 index_->GetAllPublicIds(t, ResourceType_Study); 169 index_->GetAllPublicIds(t, ResourceType_Study);
170 ASSERT_EQ(2u, t.size()); 170 ASSERT_EQ(2u, t.size());
171 171
172 index_->GetAllPublicIds(t, ResourceType_Instance); 172 index_->GetAllPublicIds(t, ResourceType_Instance);
351 index_->AttachChild(a[1], a[6]); 351 index_->AttachChild(a[1], a[6]);
352 index_->AttachChild(a[0], a[5]); 352 index_->AttachChild(a[0], a[5]);
353 index_->AttachChild(a[5], a[7]); 353 index_->AttachChild(a[5], a[7]);
354 354
355 { 355 {
356 Json::Value j; 356 std::list<std::string> j;
357 index_->GetChildren(j, a[0]); 357 index_->GetChildren(j, a[0]);
358 ASSERT_EQ(2u, j.size()); 358 ASSERT_EQ(2u, j.size());
359 ASSERT_TRUE((j[0u] == "b" && j[1u] == "f") || 359 ASSERT_TRUE((j.front() == "b" && j.back() == "f") ||
360 (j[1u] == "b" && j[0u] == "f")); 360 (j.back() == "b" && j.front() == "f"));
361 361
362 index_->GetChildren(j, a[1]); 362 index_->GetChildren(j, a[1]);
363 ASSERT_EQ(2u, j.size()); 363 ASSERT_EQ(2u, j.size());
364 ASSERT_TRUE((j[0u] == "c" && j[1u] == "g") || 364 ASSERT_TRUE((j.front() == "c" && j.back() == "g") ||
365 (j[1u] == "c" && j[0u] == "g")); 365 (j.back() == "c" && j.front() == "g"));
366 366
367 index_->GetChildren(j, a[2]); 367 index_->GetChildren(j, a[2]);
368 ASSERT_EQ(2u, j.size()); 368 ASSERT_EQ(2u, j.size());
369 ASSERT_TRUE((j[0u] == "d" && j[1u] == "e") || 369 ASSERT_TRUE((j.front() == "d" && j.back() == "e") ||
370 (j[1u] == "d" && j[0u] == "e")); 370 (j.back() == "d" && j.front() == "e"));
371 371
372 index_->GetChildren(j, a[3]); ASSERT_EQ(0u, j.size()); 372 index_->GetChildren(j, a[3]); ASSERT_EQ(0u, j.size());
373 index_->GetChildren(j, a[4]); ASSERT_EQ(0u, j.size()); 373 index_->GetChildren(j, a[4]); ASSERT_EQ(0u, j.size());
374 index_->GetChildren(j, a[5]); ASSERT_EQ(1u, j.size()); ASSERT_EQ("h", j[0u].asString()); 374 index_->GetChildren(j, a[5]); ASSERT_EQ(1u, j.size()); ASSERT_EQ("h", j.front());
375 index_->GetChildren(j, a[6]); ASSERT_EQ(0u, j.size()); 375 index_->GetChildren(j, a[6]); ASSERT_EQ(0u, j.size());
376 index_->GetChildren(j, a[7]); ASSERT_EQ(0u, j.size()); 376 index_->GetChildren(j, a[7]); ASSERT_EQ(0u, j.size());
377 } 377 }
378 378
379 listener_->Reset(); 379 listener_->Reset();