refactor unit test in case of throw, the fclose will not be called. using…

refactor unit test in case of throw, the fclose will not be called. using unique_ptr with custom destructor will ensure that

refactor unit test in case of throw, the fclose will not be called. using…
a794cfdb · Jonathan Dumaresq · 91ff96a7 · a794cfdb
Commit a794cfdb authored Dec 12, 2018 by Jonathan Dumaresq
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 15 deletions

unit-testsuites.cpp test/src/unit-testsuites.cpp +10 -15

No files found.
--- a/test/src/unit-testsuites.cpp
+++ b/test/src/unit-testsuites.cpp
@@ -386,42 +386,37 @@ TEST_CASE("json.org examples")
    }
    SECTION("FILE 1.json")
    {
-        auto f = fopen("test/data/json.org/1.json", "r");
+        std::unique_ptr<FILE, decltype(&fclose)> f(fopen("test/data/json.org/1.json", "r"), &fclose);
        json j;
-        CHECK_NOTHROW(j.parse(f));
-        fclose(f);
+        CHECK_NOTHROW(j.parse(f.get()));
    }

    SECTION("FILE 2.json")
    {
-        auto f = fopen("test/data/json.org/2.json", "r");
+        std::unique_ptr<FILE, decltype(&fclose)> f(fopen("test/data/json.org/2.json", "r"), &fclose);
        json j;
-        CHECK_NOTHROW(j.parse(f));
-        fclose(f);
+        CHECK_NOTHROW(j.parse(f.get()));
    }

    SECTION("FILE 3.json")
    {
-        auto f = fopen("test/data/json.org/3.json", "r");
+        std::unique_ptr<FILE, decltype(&fclose)> f(fopen("test/data/json.org/3.json", "r"), &fclose);
        json j;
-        CHECK_NOTHROW(j.parse(f));
-        fclose(f);
+        CHECK_NOTHROW(j.parse(f.get()));
    }

    SECTION("FILE 4.json")
    {
-        auto f = fopen("test/data/json.org/4.json", "r");
+        std::unique_ptr<FILE, decltype(&fclose)> f(fopen("test/data/json.org/4.json", "r"), &fclose);
        json j;
-        CHECK_NOTHROW(j.parse(f));
-        fclose(f);
+        CHECK_NOTHROW(j.parse(f.get()));
    }

    SECTION("FILE 5.json")
    {
-        auto f = fopen("test/data/json.org/5.json", "r");
+        std::unique_ptr<FILE, decltype(&fclose)> f(fopen("test/data/json.org/5.json", "r"), &fclose);
        json j;
-        CHECK_NOTHROW(j.parse(f));
-        fclose(f);
+        CHECK_NOTHROW(j.parse(f.get()));
    }

 }