more simple TCHARs fixes
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6047 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
a92fad7347
commit
64a0f32e52
38 changed files with 1831 additions and 1961 deletions
|
@ -11,35 +11,24 @@
|
|||
class WinCharTest : public CppUnit::TestFixture {
|
||||
|
||||
CPPUNIT_TEST_SUITE( WinCharTest );
|
||||
CPPUNIT_TEST( testFromAnsi );
|
||||
CPPUNIT_TEST( testToAnsi );
|
||||
CPPUNIT_TEST( testFromTchar );
|
||||
CPPUNIT_TEST( testStrCpy );
|
||||
CPPUNIT_TEST( testStrNCpy );
|
||||
CPPUNIT_TEST( testStrLen );
|
||||
CPPUNIT_TEST( testStrCmp );
|
||||
CPPUNIT_TEST( testStrDup );
|
||||
CPPUNIT_TEST( testStoi );
|
||||
CPPUNIT_TEST_SUITE_END();
|
||||
|
||||
public:
|
||||
void testFromAnsi() {
|
||||
void testFromTchar() {
|
||||
WCHAR test[] = { _x('t'), _x('e'), _x('s'), _x('t'), 0 };
|
||||
WCHAR *dyn = winchar_fromansi("test");
|
||||
WCHAR *dyn = winchar_fromTchar("test");
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL( 0, memcmp(test, dyn, 5) );
|
||||
|
||||
delete [] dyn;
|
||||
}
|
||||
|
||||
void testToAnsi() {
|
||||
WCHAR test[] = { _x('t'), _x('e'), _x('s'), _x('t'), 0 };
|
||||
char *dyn = winchar_toansi(test);
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL( 0, strcmp("test", dyn) );
|
||||
|
||||
delete [] dyn;
|
||||
}
|
||||
|
||||
void testStrCpy() {
|
||||
WCHAR a[] = { _x('t'), _x('e'), _x('s'), _x('t'), 0 };
|
||||
WCHAR b[5];
|
||||
|
@ -111,20 +100,6 @@ public:
|
|||
delete [] b;
|
||||
}
|
||||
|
||||
void testStoi() {
|
||||
srand(time(0));
|
||||
|
||||
for (int i = 0; i < 1000; i++)
|
||||
{
|
||||
int r = rand();
|
||||
char s[128];
|
||||
sprintf(s, "%d", r);
|
||||
WCHAR *ws = winchar_fromansi(s);
|
||||
CPPUNIT_ASSERT_EQUAL( r, winchar_stoi(ws) );
|
||||
delete [] ws;
|
||||
}
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
CPPUNIT_TEST_SUITE_REGISTRATION( WinCharTest );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue