reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2024-12-29 08:05:50 +03:00
Code Issues Projects Releases Wiki Activity

unicode_strtools unit tests

Browse Source
This commit is contained in:
dreamstalker 2015-06-13 22:10:36 +04:00
parent 438726f462
commit f2e8610689
7 changed files with 154 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dep/cppunitlite/include/cppunitlite/Assertions.h
View File

@ -17,4 +17,6 @@ public:
static void CharEquals(std::string message, char expected, char actual, const char* fileName, long lineNumber);
static void DoubleEquals(std::string message, double expected, double actual, double epsilon, const char* fileName, long lineNumber);
static void MemoryEquals(std::string message, void* expected, void* actual, int size, const char* fileName, long lineNumber);
};

3
dep/cppunitlite/include/cppunitlite/Test.h
View File

@ -69,10 +69,11 @@ protected:
#define CHARS_EQUAL(msg,expected,actual)\
{ Assertions::CharEquals(msg,expected, actual, __FILE__, __LINE__); }
#define DOUBLES_EQUAL(msg, expected,actual,threshold)\
{ Assertions::DoubleEquals(msg,expected, actual, threshold, __FILE__, __LINE__); }
#define MEM_EQUAL(msg, expected,actual,size)\
{ Assertions::MemoryEquals(msg,expected, actual, size, __FILE__, __LINE__); }
#define FAIL(text) \

18
dep/cppunitlite/src/Assertions.cpp
View File

@ -63,3 +63,21 @@ void Assertions::DoubleEquals(std::string message, double expected, double actua
throw TestFailException(ss.str(), std::string(fileName), lineNumber);
}
}
void Assertions::MemoryEquals(std::string message, void* expected, void* actual, int size, const char* fileName, long lineNumber) {
if (memcmp(expected, actual, size)) {
std::stringstream ss;
ss << message << " (expected '";
for (int i = 0; i < size; i++) {
unsigned char b = *((unsigned char*)expected + i);
ss << std::hex << (unsigned int) b << " ";
}
ss << "', got '";
for (int i = 0; i < size; i++) {
unsigned char b = *((unsigned char*)actual + i);
ss << std::hex << (unsigned int)b << " ";
}
ss << "')";
throw TestFailException(ss.str(), std::string(fileName), lineNumber);
}
}

2
rehlds/engine/unicode_strtools.h
View File

@ -57,6 +57,8 @@ enum EStringConvertErrorPolicy {
qboolean Q_IsValidUChar32(uchar32 uVal);
int Q_UTF8ToUChar32(const char *pUTF8_, uchar32 &uValueOut, bool &bErrorOut);
int Q_UChar32ToUTF8(uchar32 uVal, char * pUTF8Out);
int Q_UChar32ToUTF8Len(uchar32 uVal);
qboolean Q_UnicodeValidate(const char *pUTF8);
char *Q_UnicodeAdvance(char *pUTF8, int nChars);
qboolean Q_StripUnprintableAndSpace(char *pch);;

21
rehlds/msvc/ReHLDS.vcxproj
View File

@ -228,7 +228,16 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Play|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Swds Play|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\unittests\crc32c_tests.cpp" />
<ClCompile Include="..\unittests\crc32c_tests.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Swds|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Play|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Swds Play|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Record|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Play|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Swds Play|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\unittests\delta_tests.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Swds|Win32'">true</ExcludedFromBuild>
@ -279,6 +288,16 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Play|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Swds Play|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\unittests\unicode_tests.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Swds|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Play|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Swds Play|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Record|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Play|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release Swds Play|Win32'">true</ExcludedFromBuild>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\common\beamdef.h" />

3
rehlds/msvc/ReHLDS.vcxproj.filters
View File

@ -334,6 +334,9 @@
<ClCompile Include="..\unittests\crc32c_tests.cpp">
<Filter>unittests</Filter>
</ClCompile>
<ClCompile Include="..\unittests\unicode_tests.cpp">
<Filter>unittests</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\hookers\memory.h">

107
rehlds/unittests/unicode_tests.cpp Normal file
View File

@ -0,0 +1,107 @@
#include "precompiled.h"
#include "cppunitlite/TestHarness.h"
TEST(UTF8ToFromUChar32, UNICODE_STRTOOLS, 1000)
{
struct testdata_t {
uint8 data[16];
bool err;
uint32 glyphId;
int charWidth;
};
testdata_t testData[] = {
{ { 0x61, 0 }, false, 0x61, 1 },
{ { 0x62, 0 }, false, 0x62, 1 },
{ { 0x63, 0 }, false, 0x63, 1 },
{ { 0x64, 0 }, false, 0x64, 1 },
{ { 0xCB, 0x85, 0 }, false, 0x2C5, 2 },
{ { 0xCB, 0x84, 0 }, false, 0x2C4, 2 },
{ { 0xE0, 0xBF, 0x80, 0 }, false, 0xFC0, 3 },
{ { 0xE0, 0xBF, 0x8F, 0 }, false, 0xFCF, 3 },
{ { 0xE1, 0x8E, 0x92, 0 }, false, 0x1392, 3 },
{ { 0xE1, 0xB5, 0xA6, 0 }, false, 0x1d66, 3 },
{ { 0xE2, 0x86, 0x80, 0 }, false, 0x2180, 3 },
{ { 0xE2, 0x8C, 0x82, 0 }, false, 0x2302, 3 },
{ { 0xE2, 0xB5, 0x98, 0 }, false, 0x2D58, 3 },
{ { 0xE3, 0x80, 0xB0, 0 }, false, 0x3030, 3 },
{ { 0xE7, 0xBF, 0xB0, 0 }, false, 0x7ff0, 3 },
{ { 0xE8, 0x80, 0x80, 0 }, false, 0x8000, 3 },
{ { 0xE8, 0x80, 0x90, 0 }, false, 0x8010, 3 },
{ { 0xEF, 0xBF, 0xA0, 0 }, false, 0xffe0, 3 },
{ { 0xF0, 0x90, 0x80, 0x80, 0 }, false, 0x10000, 4 },
{ { 0xF0, 0x90, 0x80, 0x90, 0 }, false, 0x10010, 4 },
{ { 0xF0, 0x90, 0x85, 0x80, 0 }, false, 0x10140, 4 },
{ { 0xF0, 0x90, 0xA0, 0x80, 0 }, false, 0x10800, 4 },
//Invalid sequences
{ { 0x81, 0 }, true, 0x00, 1 },
{ { 0xC1, 0 }, true, 0x00, 1 },
{ { 0xC1, 0xC1, 0 }, true, 0x00, 1 },
{ { 0xE1, 0 }, true, 0x00, 1 },
{ { 0xE1, 0xC1, 0 }, true, 0x00, 1 },
{ { 0xE1, 0x80, 0xC1, 0 }, true, 0x00, 2 },
};
for (int i = 0; i < ARRAYSIZE(testData); i++) {
testdata_t* d = &testData[i];
//UTF8 => Char32
{
uchar32 glyphId = 0xFFFFFFFF;
bool err = true;
int charWidth = Q_UTF8ToUChar32((char*)d->data, glyphId, err);
CHECK("UTF8 => Char32: Parsing error check", err == d->err);
UINT32_EQUALS("UTF8 => Char32: Char width check", d->charWidth, charWidth);
if (!err) {
UINT32_EQUALS("UTF8 => Char32: GlyphId check", d->glyphId, glyphId);
}
}
//Char32 => UTF8
if (!d->err) {
uint8 localBuf[8] = { 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC, 0xCC };
int charWidth = Q_UChar32ToUTF8(d->glyphId, (char*)&localBuf[1]);
UINT32_EQUALS("Char32 => UTF8: Char width check", d->charWidth, charWidth);
MEM_EQUAL("Char32 => UTF8: Bytes check", d->data, &localBuf[1], d->charWidth);
CHECK("Char32 => UTF8: pre guard byte check", localBuf[0] == 0xCC);
CHECK("Char32 => UTF8: post guard byte check", localBuf[1 + charWidth] == 0xCC);
}
//Char32 => UTF8 Length
if (!d->err) {
int charWidth = Q_UChar32ToUTF8Len(d->glyphId);
UINT32_EQUALS("Char32 => UTF8 Length: Char width check", d->charWidth, charWidth);
}
}
}
TEST(UnicodeValidateAndRepair, UNICODE_STRTOOLS, 1000)
{
struct testdata_t {
uint8 indata[16];
uint8 outdata[16];
bool valid;
};
testdata_t testData[] = {
{ { 0x61, 0x62, 0 }, { 0x61, 0x62, 0 }, true },
{ { 0x61, 0x81, 0x62, 0 }, { 0x61, 0x62, 0 }, false },
{ { 0x81, 0 }, { 0 }, false },
};
for (int i = 0; i < ARRAYSIZE(testData); i++) {
testdata_t* d = &testData[i];
char localbuf[256];
strcpy(localbuf, (char*) d->indata);
bool valid = Q_UnicodeValidate(localbuf);
CHECK("UnicodeValidate: invalid result", valid == d->valid);
Q_UnicodeRepair(localbuf);
ZSTR_EQUAL("UnicodeRepair: invalid result", (char*)d->outdata, localbuf);
}
}