comparison UnitTestsSources/UnitTestsMain.cpp @ 3786:3801435e34a1 SylvainRouquette/fix-issue169-95b752c

integration Orthanc-1.6.0->SylvainRouquette
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 19 Mar 2020 11:48:30 +0100
parents 94f4a18a79cc
children e12c8ac6dc82
comparison
equal deleted inserted replaced
3785:763533d6dd67 3786:3801435e34a1
1 /** 1 /**
2 * Orthanc - A Lightweight, RESTful DICOM Store 2 * Orthanc - A Lightweight, RESTful DICOM Store
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
4 * Department, University Hospital of Liege, Belgium 4 * Department, University Hospital of Liege, Belgium
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium 5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
6 * 6 *
7 * This program is free software: you can redistribute it and/or 7 * This program is free software: you can redistribute it and/or
8 * modify it under the terms of the GNU General Public License as 8 * modify it under the terms of the GNU General Public License as
9 * published by the Free Software Foundation, either version 3 of the 9 * published by the Free Software Foundation, either version 3 of the
10 * License, or (at your option) any later version. 10 * License, or (at your option) any later version.
628 628
629 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("Generic"))); 629 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("Generic")));
630 ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("GenericNoWildcardInDates"))); 630 ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("GenericNoWildcardInDates")));
631 ASSERT_STREQ("GenericNoUniversalWildcard", EnumerationToString(StringToModalityManufacturer("GenericNoUniversalWildcard"))); 631 ASSERT_STREQ("GenericNoUniversalWildcard", EnumerationToString(StringToModalityManufacturer("GenericNoUniversalWildcard")));
632 ASSERT_STREQ("StoreScp", EnumerationToString(StringToModalityManufacturer("StoreScp"))); 632 ASSERT_STREQ("StoreScp", EnumerationToString(StringToModalityManufacturer("StoreScp")));
633 ASSERT_STREQ("ClearCanvas", EnumerationToString(StringToModalityManufacturer("ClearCanvas")));
634 ASSERT_STREQ("Dcm4Chee", EnumerationToString(StringToModalityManufacturer("Dcm4Chee")));
635 ASSERT_STREQ("Vitrea", EnumerationToString(StringToModalityManufacturer("Vitrea"))); 633 ASSERT_STREQ("Vitrea", EnumerationToString(StringToModalityManufacturer("Vitrea")));
636 ASSERT_STREQ("GE", EnumerationToString(StringToModalityManufacturer("GE"))); 634 ASSERT_STREQ("GE", EnumerationToString(StringToModalityManufacturer("GE")));
637 // backward compatibility tests (to remove once we make these manufacturer really obsolete) 635 // backward compatibility tests (to remove once we make these manufacturer really obsolete)
638 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("MedInria"))); 636 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("MedInria")));
639 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("EFilm2"))); 637 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("EFilm2")));
638 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("ClearCanvas")));
639 ASSERT_STREQ("Generic", EnumerationToString(StringToModalityManufacturer("Dcm4Chee")));
640 ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("SyngoVia"))); 640 ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("SyngoVia")));
641 ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("AgfaImpax"))); 641 ASSERT_STREQ("GenericNoWildcardInDates", EnumerationToString(StringToModalityManufacturer("AgfaImpax")));
642 } 642 }
643 643
644 644
1412 1412
1413 1413
1414 int main(int argc, char **argv) 1414 int main(int argc, char **argv)
1415 { 1415 {
1416 Logging::Initialize(); 1416 Logging::Initialize();
1417 Toolbox::InitializeGlobalLocale(NULL);
1417 Logging::EnableInfoLevel(true); 1418 Logging::EnableInfoLevel(true);
1418 Toolbox::DetectEndianness(); 1419 Toolbox::DetectEndianness();
1419 SystemToolbox::MakeDirectory("UnitTestsResults"); 1420 SystemToolbox::MakeDirectory("UnitTestsResults");
1420 OrthancInitialize(); 1421 OrthancInitialize();
1421 1422