Mercurial > hg > orthanc

comparison OrthancFramework/UnitTestsSources/LoggingTests.cpp @ 4294:0923247e69f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
log categories: rest -> http + added lua & jobs
author Alain Mazy <alain@mazy.be>
date Thu, 05 Nov 2020 11:43:32 +0100
parents 68e24935f258
children 3f85db78c441
comparison
equal deleted inserted replaced
4293:29729b7eb6ab 4294:0923247e69f6
366 using namespace Orthanc; 366 using namespace Orthanc;
367 367
368 Logging::LogCategory c; 368 Logging::LogCategory c;
369 ASSERT_TRUE(Logging::LookupCategory(c, "generic")); ASSERT_EQ(Logging::LogCategory_GENERIC, c); 369 ASSERT_TRUE(Logging::LookupCategory(c, "generic")); ASSERT_EQ(Logging::LogCategory_GENERIC, c);
370 ASSERT_TRUE(Logging::LookupCategory(c, "plugins")); ASSERT_EQ(Logging::LogCategory_PLUGINS, c); 370 ASSERT_TRUE(Logging::LookupCategory(c, "plugins")); ASSERT_EQ(Logging::LogCategory_PLUGINS, c);
371 ASSERT_TRUE(Logging::LookupCategory(c, "rest")); ASSERT_EQ(Logging::LogCategory_REST, c); 371 ASSERT_TRUE(Logging::LookupCategory(c, "http")); ASSERT_EQ(Logging::LogCategory_HTTP, c);
372 ASSERT_TRUE(Logging::LookupCategory(c, "sqlite")); ASSERT_EQ(Logging::LogCategory_SQLITE, c); 372 ASSERT_TRUE(Logging::LookupCategory(c, "sqlite")); ASSERT_EQ(Logging::LogCategory_SQLITE, c);
373 ASSERT_TRUE(Logging::LookupCategory(c, "dicom")); ASSERT_EQ(Logging::LogCategory_DICOM, c); 373 ASSERT_TRUE(Logging::LookupCategory(c, "dicom")); ASSERT_EQ(Logging::LogCategory_DICOM, c);
374 ASSERT_TRUE(Logging::LookupCategory(c, "jobs")); ASSERT_EQ(Logging::LogCategory_JOBS, c);
375 ASSERT_TRUE(Logging::LookupCategory(c, "lua")); ASSERT_EQ(Logging::LogCategory_LUA, c);
374 ASSERT_FALSE(Logging::LookupCategory(c, "nope")); 376 ASSERT_FALSE(Logging::LookupCategory(c, "nope"));
375 377
376 ASSERT_EQ(5u, Logging::GetCategoriesCount()); 378 ASSERT_EQ(7u, Logging::GetCategoriesCount());
377 379
378 std::set<std::string> s; 380 std::set<std::string> s;
379 for (size_t i = 0; i < Logging::GetCategoriesCount(); i++) 381 for (size_t i = 0; i < Logging::GetCategoriesCount(); i++)
380 { 382 {
381 Logging::LogCategory c; 383 Logging::LogCategory c;
382 ASSERT_TRUE(Logging::LookupCategory(c, Logging::GetCategoryName(i))); 384 ASSERT_TRUE(Logging::LookupCategory(c, Logging::GetCategoryName(i)));
383 s.insert(Logging::GetCategoryName(i)); 385 s.insert(Logging::GetCategoryName(i));
384 } 386 }
385 387
386 ASSERT_EQ(5u, s.size()); 388 ASSERT_EQ(7u, s.size());
387 ASSERT_TRUE(s.find("generic") != s.end()); 389 ASSERT_TRUE(s.find("generic") != s.end());
388 ASSERT_TRUE(s.find("plugins") != s.end()); 390 ASSERT_TRUE(s.find("plugins") != s.end());
389 ASSERT_TRUE(s.find("rest") != s.end()); 391 ASSERT_TRUE(s.find("http") != s.end());
390 ASSERT_TRUE(s.find("sqlite") != s.end()); 392 ASSERT_TRUE(s.find("sqlite") != s.end());
391 ASSERT_TRUE(s.find("dicom") != s.end()); 393 ASSERT_TRUE(s.find("dicom") != s.end());
394 ASSERT_TRUE(s.find("lua") != s.end());
395 ASSERT_TRUE(s.find("jobs") != s.end());
392 396
393 ASSERT_THROW(Logging::GetCategoryName(Logging::GetCategoriesCount()), OrthancException); 397 ASSERT_THROW(Logging::GetCategoryName(Logging::GetCategoriesCount()), OrthancException);
394 398
395 ASSERT_STREQ("generic", Logging::GetCategoryName(Logging::LogCategory_GENERIC)); 399 ASSERT_STREQ("generic", Logging::GetCategoryName(Logging::LogCategory_GENERIC));
396 ASSERT_STREQ("plugins", Logging::GetCategoryName(Logging::LogCategory_PLUGINS)); 400 ASSERT_STREQ("plugins", Logging::GetCategoryName(Logging::LogCategory_PLUGINS));
397 ASSERT_STREQ("rest", Logging::GetCategoryName(Logging::LogCategory_REST)); 401 ASSERT_STREQ("http", Logging::GetCategoryName(Logging::LogCategory_HTTP));
398 ASSERT_STREQ("sqlite", Logging::GetCategoryName(Logging::LogCategory_SQLITE)); 402 ASSERT_STREQ("sqlite", Logging::GetCategoryName(Logging::LogCategory_SQLITE));
399 ASSERT_STREQ("dicom", Logging::GetCategoryName(Logging::LogCategory_DICOM)); 403 ASSERT_STREQ("dicom", Logging::GetCategoryName(Logging::LogCategory_DICOM));
400 } 404 ASSERT_STREQ("lua", Logging::GetCategoryName(Logging::LogCategory_LUA));
405 ASSERT_STREQ("jobs", Logging::GetCategoryName(Logging::LogCategory_JOBS));
406 }