diff --git a/test/CMapEditManagerTest.cpp b/test/CMapEditManagerTest.cpp index b1e2fd735..a60fad8bd 100644 --- a/test/CMapEditManagerTest.cpp +++ b/test/CMapEditManagerTest.cpp @@ -23,7 +23,7 @@ BOOST_AUTO_TEST_CASE(CMapEditManager_DrawTerrain_Type) { - logGlobal->infoStream() << "CMapEditManager_DrawTerrain_Type start"; + logGlobal->info("CMapEditManager_DrawTerrain_Type start"); try { auto map = make_unique(); @@ -103,21 +103,22 @@ BOOST_AUTO_TEST_CASE(CMapEditManager_DrawTerrain_Type) } catch(const std::exception & e) { - logGlobal->errorStream() << "CMapEditManager_DrawTerrain_Type crash" << "\n" << e.what(); + logGlobal->error("CMapEditManager_DrawTerrain_Type crash"); + logGlobal->error(e.what()); throw; } - logGlobal->infoStream() << "CMapEditManager_DrawTerrain_Type finish"; + logGlobal->info("CMapEditManager_DrawTerrain_Type finish"); } BOOST_AUTO_TEST_CASE(CMapEditManager_DrawTerrain_View) { - logGlobal->infoStream() << "CMapEditManager_DrawTerrain_View start"; + logGlobal->info("CMapEditManager_DrawTerrain_View start"); try { // Load maps and json config const auto originalMap = CMapService::loadMap("test/TerrainViewTest"); auto map = CMapService::loadMap("test/TerrainViewTest"); - logGlobal->infoStream() << "Loaded test map successfully."; + logGlobal->info("Loaded test map successfully."); // Validate edit manager auto editManager = map->getEditManager(); @@ -163,14 +164,16 @@ BOOST_AUTO_TEST_CASE(CMapEditManager_DrawTerrain_View) } } BOOST_CHECK(isInRange); - if(!isInRange) logGlobal->errorStream() << "No or invalid pattern found for current position."; + if(!isInRange) + logGlobal->error("No or invalid pattern found for current position."); } } } catch(const std::exception & e) { - logGlobal->infoStream() << "CMapEditManager_DrawTerrain_View crash"<< "\n" << e.what(); + logGlobal->info("CMapEditManager_DrawTerrain_View crash"); + logGlobal->info(e.what()); throw; } - logGlobal->infoStream() << "CMapEditManager_DrawTerrain_View finish"; + logGlobal->info("CMapEditManager_DrawTerrain_View finish"); } diff --git a/test/CMapFormatTest.cpp b/test/CMapFormatTest.cpp index 9e4ace40d..2fa859b86 100644 --- a/test/CMapFormatTest.cpp +++ b/test/CMapFormatTest.cpp @@ -78,7 +78,8 @@ BOOST_AUTO_TEST_CASE(CMapFormatVCMI_Simple) tmp.flush(); tmp.close(); - logGlobal->infoStream() << "Test map has been saved to " << path; + logGlobal->info("Test map has been saved to:"); + logGlobal->info(path.string()); } BOOST_TEST_CHECKPOINT("CMapFormatVCMI_Simple saved"); diff --git a/test/CVcmiTestConfig.cpp b/test/CVcmiTestConfig.cpp index 96a36ddfd..7497bbc64 100644 --- a/test/CVcmiTestConfig.cpp +++ b/test/CVcmiTestConfig.cpp @@ -31,7 +31,7 @@ CVcmiTestConfig::CVcmiTestConfig() settings.init(); logConfig.configure(); loadDLLClasses(); - logGlobal->infoStream() << "Initialized global test setup."; + logGlobal->info("Initialized global test setup."); const std::string TEST_DATA_DIR = "test/";