openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Start building some unit tests using Catch test library

Browse Source 
- Current version of Catch is included in the repo at test/catch.hpp
This commit is contained in:
Celtic Minstrel
2015-07-01 00:01:32 -04:00
parent ee9c089829
commit d8b4ee9c56
10 changed files with 9747 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/fileio_scen.cpp
View File

@@ -42,6 +42,9 @@ static bool load_outdoors_v1(fs::path scen_file, location which_out,cOutdoors& t
static bool load_town_v1(fs::path scen_file,short which_town,cTown& the_town,legacy::scenario_data_type& scenario,std::vector<shop_info_t>& shops);
// Load new scenarios
static bool load_scenario_v2(fs::path file_to_load, cScenario& scenario, bool only_header);
// Some of these are non-static so that the test cases can access them.
ticpp::Document xmlDocFromStream(std::istream& stream, std::string name);
void readScenarioFromXml(ticpp::Document&& data, cScenario& scenario);
bool load_scenario(fs::path file_to_load, cScenario& scenario, bool only_header) {
// Before loading a scenario, we may need to pop scenario resource paths.
@@ -279,7 +282,7 @@ bool load_scenario_v1(fs::path file_to_load, cScenario& scenario, bool only_head
return true;
}
static ticpp::Document xmlDocFromStream(std::istream& stream, std::string name) {
ticpp::Document xmlDocFromStream(std::istream& stream, std::string name) {
std::string contents;
stream.seekg(0, std::ios::end);
contents.reserve(stream.tellg());
@@ -631,7 +634,7 @@ static void initialXmlRead(ticpp::Document& data, std::string root_tag, int& maj
throw xMissingAttr(type, "boes", data.FirstChildElement()->Row(), data.FirstChildElement()->Column(), fname);
}
static void readScenarioFromXml(ticpp::Document&& data, cScenario& scenario) {
void readScenarioFromXml(ticpp::Document&& data, cScenario& scenario) {
using namespace ticpp;
int maj, min, rev;
std::string fname, type, name, val;