From 16849a341b72c0633be1e3c89498c883d6efb000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Mon, 13 Apr 2015 17:57:45 +0200
Subject: hide Thread<> and separate the Implementation object

---
 test/storage/http_reading.cpp | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'test/storage/http_reading.cpp')

diff --git a/test/storage/http_reading.cpp b/test/storage/http_reading.cpp
index 1ba34801cd..350a8eaa4b 100644
--- a/test/storage/http_reading.cpp
+++ b/test/storage/http_reading.cpp
@@ -3,7 +3,8 @@
 #include <uv.h>
 
 #include <mbgl/storage/default_file_source.hpp>
-#include <mbgl/util/thread.hpp>
+
+#include <future>
 
 TEST_F(Storage, HTTPReading) {
     SCOPED_TEST(HTTPTest)
@@ -11,13 +12,13 @@ TEST_F(Storage, HTTPReading) {
 
     using namespace mbgl;
 
-    util::Thread<DefaultFileSource> fs(nullptr);
+    DefaultFileSource fs(nullptr);
 
     auto &env = *static_cast<const Environment *>(nullptr);
 
     const auto mainThread = uv_thread_self();
 
-    fs->request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, uv_default_loop(), env,
+    fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, uv_default_loop(), env,
                [&](const Response &res) {
         EXPECT_EQ(uv_thread_self(), mainThread);
         EXPECT_EQ(Response::Successful, res.status);
@@ -29,7 +30,7 @@ TEST_F(Storage, HTTPReading) {
         HTTPTest.finish();
     });
 
-    fs->request({ Resource::Unknown, "http://127.0.0.1:3000/doesnotexist" }, uv_default_loop(),
+    fs.request({ Resource::Unknown, "http://127.0.0.1:3000/doesnotexist" }, uv_default_loop(),
                env, [&](const Response &res) {
         EXPECT_EQ(uv_thread_self(), mainThread);
         EXPECT_EQ(Response::Error, res.status);
@@ -48,11 +49,11 @@ TEST_F(Storage, HTTPNoCallback) {
 
     using namespace mbgl;
 
-    util::Thread<DefaultFileSource> fs(nullptr);
+    DefaultFileSource fs(nullptr);
 
     auto &env = *static_cast<const Environment *>(nullptr);
 
-    fs->request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, uv_default_loop(), env,
+    fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, uv_default_loop(), env,
                nullptr);
 
     uv_run(uv_default_loop(), UV_RUN_DEFAULT);
@@ -60,18 +61,21 @@ TEST_F(Storage, HTTPNoCallback) {
     HTTPTest.finish();
 }
 
-TEST_F(Storage, HTTPNoCallbackNoLoop) {
-    SCOPED_TEST(HTTPTest)
-
+TEST_F(Storage, HTTPCallbackNotOnLoop) {
     using namespace mbgl;
 
-    util::Thread<DefaultFileSource> fs(nullptr);
+    DefaultFileSource fs(nullptr);
+
+    SCOPED_TEST(HTTPTest)
 
     auto &env = *static_cast<const Environment *>(nullptr);
 
-    fs->request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, env, nullptr);
+    std::promise<void> promise;
+    fs.request({ Resource::Unknown, "http://127.0.0.1:3000/test" }, env, [&] (const Response &) {
+        promise.set_value();
+    });
 
-    uv_run(uv_default_loop(), UV_RUN_DEFAULT);
+    promise.get_future().get();
 
     HTTPTest.finish();
 }
-- 
cgit v1.2.1