mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-02 20:42:34 +02:00
Code Issues Projects Releases Wiki Activity

cleanup from cppcheck 1.62

Browse Source
This commit is contained in:
Mark Vejvoda
2013-11-14 16:42:22 +00:00
parent 7efb37b723
commit 9350b16c4a
8 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/tests/shared_lib/graphics/font_test.cpp
View File

@@ -57,7 +57,7 @@ public:
CPPUNIT_ASSERT_EQUAL( 45,(int)IntroText1.size() );
std::vector<std::pair<char, int> > result = Font::extract_mixed_LTR_RTL_map(IntroText1);
//CPPUNIT_ASSERT_EQUAL( 30, (int)result.size() );
CPPUNIT_ASSERT_EQUAL( 30, (int)result.size() );
#ifdef HAVE_FRIBIDI
IntroText1 = expected;
@@ -76,7 +76,7 @@ public:
CPPUNIT_ASSERT_EQUAL( 44,(int)LuaDisableSecuritySandbox.size() );
result = Font::extract_mixed_LTR_RTL_map(LuaDisableSecuritySandbox);
//CPPUNIT_ASSERT_EQUAL( 7, (int)result.size() );
CPPUNIT_ASSERT_EQUAL( 4, (int)result.size() );
//printf("Result: [%s]\n",LuaDisableSecuritySandbox.c_str());

12
source/tests/shared_lib/xml/xml_parser_test.cpp
View File

@@ -104,7 +104,7 @@ public:
CPPUNIT_ASSERT_EQUAL( false, newInstance.isInitialized() );
}
void test_load_file_missing() {
XmlNode *rootNode = XmlIo::getInstance().load("/some/path/that/does/not exist", std::map<string,string>());
XmlIo::getInstance().load("/some/path/that/does/not exist", std::map<string,string>());
}
void test_load_file_valid() {
const string test_filename = "xml_test_valid.xml";
@@ -121,7 +121,7 @@ public:
createMalformedXMLTestFile(test_filename);
SafeRemoveTestFile deleteFile(test_filename);
XmlNode *rootNode = XmlIo::getInstance().load(test_filename, std::map<string,string>());
XmlIo::getInstance().load(test_filename, std::map<string,string>());
}
void test_save_file_null_node() {
@@ -174,7 +174,7 @@ public:
CPPUNIT_ASSERT_EQUAL( false, newInstance.isInitialized() );
}
void test_load_file_missing() {
XmlNode *rootNode = XmlIoRapid::getInstance().load("/some/path/that/does/not exist", std::map<string,string>());
XmlIoRapid::getInstance().load("/some/path/that/does/not exist", std::map<string,string>());
}
void test_load_file_valid() {
const string test_filename = "xml_test_valid.xml";
@@ -190,7 +190,7 @@ public:
const string test_filename = "xml_test_malformed.xml";
createMalformedXMLTestFile(test_filename);
SafeRemoveTestFile deleteFile(test_filename);
XmlNode *rootNode = XmlIoRapid::getInstance().load(test_filename, std::map<string,string>());
XmlIoRapid::getInstance().load(test_filename, std::map<string,string>());
}
void test_save_file_null_node() {
@@ -548,7 +548,7 @@ public:
CPPUNIT_ASSERT_EQUAL( string(""),attr.getValue() );
attr.setValue("-123456");
int value = attr.getIntValue(1, 10);
attr.getIntValue(1, 10);
}
void test_node_attributes_float_outofrange() {
const string test_filename = "xml_test_valid.xml";
@@ -562,7 +562,7 @@ public:
XmlAttribute attr(node, mapTagReplacementValues);
attr.setValue("-123456.01");
float value = attr.getFloatValue(-123456.999f, -123456.123456f);
attr.getFloatValue(-123456.999f, -123456.123456f);
}
};