Search more paths for different build situations

test/unittest/documenttest.cpp

@@ -101,14 +101,21 @@ TEST(Document, Parse) {
 }
 
 static FILE* OpenEncodedFile(const char* filename) {
+    const char *paths[] = {
+        "encodings/%s",
+        "bin/encodings/%s",
+        "../bin/encodings/%s",
+        "../../bin/encodings/%s",
+        "../../../bin/encodings/%s"
+    };
     char buffer[1024];
-    sprintf(buffer, "encodings/%s", filename);
+    for (size_t i = 0; i < sizeof(paths) / sizeof(paths[0]); i++) {
+        sprintf(buffer, paths[i], filename);
         FILE *fp = fopen(buffer, "rb");
-    if (!fp) {
-        sprintf(buffer, "../../bin/encodings/%s", filename);
-        fp = fopen(buffer, "rb");
-    }
+        if (fp)
             return fp;
+    }
+    return 0;
 }
 
 TEST(Document, ParseStream_EncodedInputStream) {

test/unittest/encodedstreamtest.cpp

@@ -47,15 +47,22 @@ private:
     
 protected:
     static FILE* Open(const char* filename) {
+        const char *paths[] = {
+            "encodings/%s",
+            "bin/encodings/%s",
+            "../bin/encodings/%s",
+            "../../bin/encodings/%s",
+            "../../../bin/encodings/%s"
+        };
         char buffer[1024];
-        sprintf(buffer, "encodings/%s", filename);
+        for (size_t i = 0; i < sizeof(paths) / sizeof(paths[0]); i++) {
+            sprintf(buffer, paths[i], filename);
             FILE *fp = fopen(buffer, "rb");
-        if (!fp) {
-            sprintf(buffer, "../../bin/encodings/%s", filename);
-            fp = fopen(buffer, "rb");
-        }
+            if (fp)
                 return fp;
         }
+        return 0;
+    }
 
     static char *ReadFile(const char* filename, bool appendPath, size_t* outLength) {
         FILE *fp = appendPath ? Open(filename) : fopen(filename, "rb");

test/unittest/filestreamtest.cpp

@@ -31,9 +31,21 @@ public:
     FileStreamTest() : filename_(), json_(), length_() {}
 
     virtual void SetUp() {
-        FILE *fp = fopen(filename_ = "data/sample.json", "rb");
-        if (!fp) 
-            fp = fopen(filename_ = "../../bin/data/sample.json", "rb");
+        const char *paths[] = {
+            "data/sample.json",
+            "bin/data/sample.json",
+            "../bin/data/sample.json",
+            "../../bin/data/sample.json",
+            "../../../bin/data/sample.json"
+        };
+        FILE* fp = 0;
+        for (size_t i = 0; i < sizeof(paths) / sizeof(paths[0]); i++) {
+            fp = fopen(paths[i], "rb");
+            if (fp) {
+                filename_ = paths[i];
+                break;
+            }
+        }
         ASSERT_TRUE(fp != 0);
 
         fseek(fp, 0, SEEK_END);

test/unittest/jsoncheckertest.cpp

@@ -25,9 +25,22 @@
 using namespace rapidjson;
 
 static char* ReadFile(const char* filename, size_t& length) {
-    FILE *fp = fopen(filename, "rb");
-    if (!fp)
-        fp = fopen(filename, "rb");
+    const char *paths[] = {
+        "jsonchecker/%s",
+        "bin/jsonchecker/%s",
+        "../bin/jsonchecker/%s",
+        "../../bin/jsonchecker/%s",
+        "../../../bin/jsonchecker/%s"
+    };
+    char buffer[1024];
+    FILE *fp = 0;
+    for (size_t i = 0; i < sizeof(paths) / sizeof(paths[0]); i++) {
+        sprintf(buffer, paths[i], filename);
+        fp = fopen(buffer, "rb");
+        if (fp)
+            break;
+    }
+
     if (!fp)
         return 0;
 
@@ -51,18 +64,14 @@ TEST(JsonChecker, Reader) {
         if (i == 18)    // fail18.json is valid in rapidjson, which has no limitation on depth of nesting.
             continue;
 
-        sprintf(filename, "jsonchecker/fail%d.json", i);
+        sprintf(filename, "fail%d.json", i);
         size_t length;
         char* json = ReadFile(filename, length);
-        if (!json) {
-            sprintf(filename, "../../bin/jsonchecker/fail%d.json", i);
-            json = ReadFile(filename, length);
         if (!json) {
             printf("jsonchecker file %s not found", filename);
             ADD_FAILURE();
             continue;
         }
-        }
 
         GenericDocument<UTF8<>, CrtAllocator> document; // Use Crt allocator to check exception-safety (no memory leak)
         document.Parse((const char*)json);
@@ -76,17 +85,13 @@ TEST(JsonChecker, Reader) {
 
     // passX.json
     for (int i = 1; i <= 3; i++) {
-        sprintf(filename, "jsonchecker/pass%d.json", i);
+        sprintf(filename, "pass%d.json", i);
         size_t length;
         char* json = ReadFile(filename, length);
-        if (!json) {
-            sprintf(filename, "../../bin/jsonchecker/pass%d.json", i);
-            json = ReadFile(filename, length);
         if (!json) {
             printf("jsonchecker file %s not found", filename);
             continue;
         }
-        }
 
         GenericDocument<UTF8<>, CrtAllocator> document; // Use Crt allocator to check exception-safety (no memory leak)
         document.Parse((const char*)json);