comparison UnitTestsSources/UnitTestsMain.cpp @ 2319:ae6245053bcf

made some manufacturer obsolete: MedInria (that was not used), Syngovia & AgfaImpax (replaced by GenericNoWildcardInDates) + added 'GenericNoWildcards'
author amazy
date Thu, 13 Jul 2017 12:37:55 +0200
parents d19e716b79fa
children 3ab96768d144
comparison
equal deleted inserted replaced
2318:e5fc5db6a84b 2319:ae6245053bcf
525 RegisterUserMetadata(2047, "Ceci est un test"); 525 RegisterUserMetadata(2047, "Ceci est un test");
526 ASSERT_EQ(2047, StringToMetadata("2047")); 526 ASSERT_EQ(2047, StringToMetadata("2047"));
527 ASSERT_EQ(2047, StringToMetadata("Ceci est un test")); 527 ASSERT_EQ(2047, StringToMetadata("Ceci est un test"));
528 528
529 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("Generic"))); 529 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("Generic")));
530 ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("GenericNoWildcardInDates")));
531 ASSERT_STREQ("GenericNoWildcards", EnumerationToString(StringToModalityManufacturer("GenericNoWildcards")));
530 ASSERT_STREQ("StoreScp", EnumerationToString(StringToModalityManufacturer("StoreScp"))); 532 ASSERT_STREQ("StoreScp", EnumerationToString(StringToModalityManufacturer("StoreScp")));
531 ASSERT_STREQ("ClearCanvas", EnumerationToString(StringToModalityManufacturer("ClearCanvas"))); 533 ASSERT_STREQ("ClearCanvas", EnumerationToString(StringToModalityManufacturer("ClearCanvas")));
532 ASSERT_STREQ("MedInria", EnumerationToString(StringToModalityManufacturer("MedInria")));
533 ASSERT_STREQ("Dcm4Chee", EnumerationToString(StringToModalityManufacturer("Dcm4Chee"))); 534 ASSERT_STREQ("Dcm4Chee", EnumerationToString(StringToModalityManufacturer("Dcm4Chee")));
534 ASSERT_STREQ("SyngoVia", EnumerationToString(StringToModalityManufacturer("SyngoVia")));
535 ASSERT_STREQ("AgfaImpax", EnumerationToString(StringToModalityManufacturer("AgfaImpax")));
536 ASSERT_STREQ("EFilm2", EnumerationToString(StringToModalityManufacturer("EFilm2")));
537 ASSERT_STREQ("Vitrea", EnumerationToString(StringToModalityManufacturer("Vitrea"))); 535 ASSERT_STREQ("Vitrea", EnumerationToString(StringToModalityManufacturer("Vitrea")));
536 // backward compatibility tests (to remove once we make these manufacturer really obsolete)
537 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("MedInria")));
538 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("EFilm2")));
539 ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("SyngoVia")));
540 ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("AgfaImpax")));
538 } 541 }
539 542
540 543
541 544
542 TEST(Toolbox, WriteFile) 545 TEST(Toolbox, WriteFile)