gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #985 : Unittest failed with MinGWx64. And few small improvement were done while looking for mistakes.

Browse Source 
Problem was because of Windows uses backslashes '\', not Unix '/'
This commit is contained in:
kyb 2017-06-15 12:36:20 +03:00
parent b596f4e990
commit 6e81d49b33
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/unittest/ostreamwrappertest.cpp
View File

@ -69,14 +69,15 @@ static void TestFileStream() {
const char* s = "Hello World!\n"; const char* s = "Hello World!\n";
{ {
ofstream ofs(filename, ios::out | ios::binary); FileStreamType ofs(filename, ios::out | ios::binary);
BasicOStreamWrapper<ofstream> osw(ofs); BasicOStreamWrapper<FileStreamType> osw(ofs);
for (const char* p = s; *p; p++) for (const char* p = s; *p; p++)
osw.Put(*p); osw.Put(*p);
osw.Flush(); osw.Flush();
} }
fp = fopen(filename, "r"); fp = fopen(filename, "r");
ASSERT_TRUE( fp != NULL );
for (const char* p = s; *p; p++) for (const char* p = s; *p; p++)
EXPECT_EQ(*p, static_cast<char>(fgetc(fp))); EXPECT_EQ(*p, static_cast<char>(fgetc(fp)));
fclose(fp); fclose(fp);

1
test/unittest/prettywritertest.cpp
View File

@ -167,6 +167,7 @@ TEST(PrettyWriter, OStreamWrapper) {
TEST(PrettyWriter, FileWriteStream) { TEST(PrettyWriter, FileWriteStream) {
char filename[L_tmpnam]; char filename[L_tmpnam];
FILE* fp = TempFile(filename); FILE* fp = TempFile(filename);
ASSERT_TRUE(fp!=NULL);
char buffer[16]; char buffer[16];
FileWriteStream os(fp, buffer, sizeof(buffer)); FileWriteStream os(fp, buffer, sizeof(buffer));
PrettyWriter<FileWriteStream> writer(os); PrettyWriter<FileWriteStream> writer(os);

2
test/unittest/unittest.h
View File

@ -78,7 +78,7 @@ inline Ch* StrDup(const Ch* str) {
} }
inline FILE* TempFile(char *filename) { inline FILE* TempFile(char *filename) {
#ifdef _MSC_VER #if defined(__WIN32__) || defined(_MSC_VER)
filename = tmpnam(filename); filename = tmpnam(filename);
// For Visual Studio, tmpnam() adds a backslash in front. Remove it. // For Visual Studio, tmpnam() adds a backslash in front. Remove it.