BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The tests seems to work under boost 1.59 but test explorer window is broken in 1.60. also changed ResourceManagerTest.cpp

Browse Source
This commit is contained in:
verysecrethero
2015-12-18 11:37:02 +01:00
parent 13f7fb2561
commit 1e5e24a036
6 changed files with 38 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tests/EventFixture.h → include/Tests/EventFixture.h
View File
src/Tests/OctTreeTestGameClass.h → include/Tests/OctTreeTestGameClass.h
View File
src/Tests/OctTreeTestHardCodedTestWorld.h → include/Tests/OctTreeTestHardCodedTestWorld.h
View File
src/Tests/CMakeLists.txt
+1
View File
@@ -12,6 +12,7 @@ include_directories(
)
file(GLOB SOURCE_FILES
"${INCLUDE_PATH}/Tests/*.h"
"*.cpp"
)
src/Tests/ConfigFileTest.cpp
+35 -38
View File
@@ -16,53 +16,50 @@ BOOST_AUTO_TEST_SUITE(confTest)
BOOST_AUTO_TEST_CASE(configFileTest)
{
////note: this ConfigFileclass currently has memleaks!
//note: this ConfigFileclass currently has memleaks!
//ResourceManager::RegisterType<ConfigFile>("ConfigFile");
//auto m_Config = ResourceManager::Load<ConfigFile>("ConfigTest.ini");
ResourceManager::RegisterType<ConfigFile>("ConfigFile");
auto m_Config = ResourceManager::Load<ConfigFile>("ConfigTest.ini");
////bägge måste vara av samma typ, T typen är string
////http://www.boost.org/doc/libs/1_42_0/doc/html/boost_propertytree/tutorial.html
////"Note that we construct the path to the value by separating the individual keys with dots"
//bägge måste vara av samma typ, T typen är string
//http://www.boost.org/doc/libs/1_42_0/doc/html/boost_propertytree/tutorial.html
//"Note that we construct the path to the value by separating the individual keys with dots"
////get from tree tests
//auto getSomething = m_Config->Get("Test.Test1", 0);
//BOOST_CHECK(getSomething == 423);
//get from tree tests
auto getSomething = m_Config->Get("Test.Test1", 0);
BOOST_CHECK(getSomething == 423);
//auto getSomething2 = m_Config->Get("fsdfdsfd.T", std::string(""));
//BOOST_CHECK(getSomething2 == "\"gfdjakflsdl!\"");
auto getSomething2 = m_Config->Get("fsdfdsfd.T", std::string(""));
BOOST_CHECK(getSomething2 == "\"gfdjakflsdl!\"");
////set/get tests
//m_Config->Set("Test.4321", 123);
//auto getSomething3 = m_Config->Get("Test.4321", 0);
//BOOST_CHECK(getSomething3 == 123);
//set/get tests
m_Config->Set("Test.4321", 123);
auto getSomething3 = m_Config->Get("Test.4321", 0);
BOOST_CHECK(getSomething3 == 123);
//m_Config->Set("3_2_1_0_5", "t454j54hj5k32");
//auto getSomething4 = m_Config->Get("3_2_1_0_5", std::string(""));
//BOOST_CHECK(getSomething4 == "t454j54hj5k32");
m_Config->Set("3_2_1_0_5", "t454j54hj5k32");
auto getSomething4 = m_Config->Get("3_2_1_0_5", std::string(""));
BOOST_CHECK(getSomething4 == "t454j54hj5k32");
////***check so outputwindow says: EE: Failed to find "DefaultConfigTestNotExists.ini"! Relying on hardcoded default values!
//auto m_Config2 = ResourceManager::Load<ConfigFile>("ConfigTestNotExists.ini");
//***check so outputwindow says: EE: Failed to find "DefaultConfigTestNotExists.ini"! Relying on hardcoded default values!
auto m_Config2 = ResourceManager::Load<ConfigFile>("ConfigTestNotExists.ini");
////set value/savetodisk/load/checkvalue...
//m_Config->SaveToDisk();
//m_Config->Set("Test.4321", 145);
//m_Config->SaveToDisk();
//auto m_Config3 = ResourceManager::Load<ConfigFile>("ConfigTest.ini");
//auto getSomething5 = m_Config->Get("Test.4321", 0);
//BOOST_CHECK(getSomething5 == 145);
//
////***check so outputwindow says: EE: Failed to parse "DefaultConfigTestFailed.ini"
////***check so outputwindow says: EE: Failed to parse "ConfigTestFailed.ini":
//auto m_Config4 = ResourceManager::Load<ConfigFile>("ConfigTestFailed.ini");
//set value/savetodisk/load/checkvalue...
m_Config->SaveToDisk();
m_Config->Set("Test.4321", 145);
m_Config->SaveToDisk();
auto m_Config3 = ResourceManager::Load<ConfigFile>("ConfigTest.ini");
auto getSomething5 = m_Config->Get("Test.4321", 0);
BOOST_CHECK(getSomething5 == 145);
//***check so outputwindow says: EE: Failed to parse "DefaultConfigTestFailed.ini"
//***check so outputwindow says: EE: Failed to parse "ConfigTestFailed.ini":
auto m_Config4 = ResourceManager::Load<ConfigFile>("ConfigTestFailed.ini");
////test to try to fix memleaks - failed, probably something else
////ResourceManager::Release(std::string("ConfigFile"), std::string("ConfigTest.ini"));
////ResourceManager::Release(std::string("ConfigFile"), std::string("ConfigTestNotExists.ini"));
////ResourceManager::Release(std::string("ConfigFile"), std::string("ConfigTest.ini"));
////ResourceManager::Release(std::string("ConfigFile"), std::string("ConfigTestFailed.ini"));
////reload,onchildreload unimplemented
//_CrtDumpMemoryLeaks();
//reload,onchildreload unimplemented
//NOTE:still massive amount of memoryleaks from this method
_CrtDumpMemoryLeaks();
}
BOOST_AUTO_TEST_SUITE_END()
src/Tests/ResourceManagerTest.cpp
+2 -22
View File
@@ -1,25 +1,15 @@
#include <boost/test/unit_test.hpp>
#include "Core/World.h"
//private->public hack doesnt work, tons of link errors
//so there is currently no good way to test this class
//#define private public
#include "Core/ResourceManager.h"
#include "Core/ConfigFile.h"
#include "Rendering/Renderer.h"
#include "Core/EntityXMLFile.h"
#include "Engine\Rendering\Texture.h"
//#include "Core/EventBroker.h"
//#include "Core/InputManager.h"
//#include "GUI/Frame.h"
//#include "Rendering/RenderQueueFactory.h"
//#include "Core/EKeyDown.h"
//#include "Core/SystemPipeline.h"
//#include "RaptorCopterSystem.h"
BOOST_AUTO_TEST_SUITE(resourceManagerTests)
BOOST_AUTO_TEST_CASE(resourceManagerTest)
@@ -28,10 +18,6 @@ BOOST_AUTO_TEST_CASE(resourceManagerTest)
//private static metoder/variabler
//ugly private->public hack doesnt work, tons of link errors. hence cant test it properly
//its not my job to implement testfunctions for unittests in the class either
//craptests ahead:
ResourceManager::RegisterType<ConfigFile>("ConfigFile");
BOOST_CHECK(!ResourceManager::IsResourceLoaded("ConfigFile", "Config.ini"));
auto m_Config = ResourceManager::Load<ConfigFile>("Config.ini");
@@ -45,12 +31,6 @@ BOOST_AUTO_TEST_CASE(resourceManagerTest)
BOOST_CHECK(!ResourceManager::IsResourceLoaded("Model", "Models/Core/ScreenQuad.obj"));
//there is no error feedback to check if you try to release the wrong resources - hence that cant be tested either
//registertype (bind with function)
//m_CompilerTypenameToResourceType = global...
//m_FactoryFunctions = global...
//BOOST_CHECK(ResourceManager::m_CompilerTypenameToResourceType.size() != 0);
//BOOST_CHECK(ResourceManager::m_FactoryFunctions.size() != 0);
}
BOOST_AUTO_TEST_SUITE_END()