Async resolver tests now use igloo.

glynos · glynos · commit b8950628c61a · 2013-09-05T22:05:21.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -134,6 +134,10 @@ if(CPP-NETLIB_BUILD_TESTS)
   set(GMOCK_LIBRARIES {$GTEST_LIBRARIES} gmock)
   set(GMOCK_MAIN_LIBRARIES gmock_main)
   set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARIES} ${GMOCK_MAIN_LIBRARIES})
+
+  set(IGLOO_ROOT ${CPP-NETLIB_SOURCE_DIR}/deps/igloo)
+  set(IGLOO_FOUND ON)
+  set(IGLOO_INCLUDE_DIR ${IGLOO_ROOT})
 endif()
 
 if(CPP-NETLIB_BUILD_SINGLE_LIB)
diff --git a/http/src/network/http/v2/client/connection/async_resolver_delegate.hpp b/http/src/network/http/v2/client/connection/async_resolver_delegate.hpp
@@ -64,17 +64,12 @@ namespace network {
               resolver_strand_->wrap(
 	          [=](const boost::system::error_code &ec,
 		      resolver_iterator endpoint_iterator) {
+
+		    auto resolvers = std::make_pair(endpoint_iterator, resolver_iterator());
 		    if (!ec && cache_resolved_) {
-		      endpoint_cache::iterator cache_it;
-		      bool inserted = false;
-		      std::tie(cache_it, inserted) = endpoint_cache_.insert(
-			  std::make_pair(host,
-			      std::make_pair(endpoint_iterator, resolver_iterator())));
-		      on_resolved(ec, cache_it->second);
-		    }
-		    else {
-		      on_resolved(ec, std::make_pair(endpoint_iterator, resolver_iterator()));
+		      endpoint_cache_.insert(std::make_pair(host, resolvers));
 		    }
+		    on_resolved(ec, resolvers);
 		  }));
 	}
 
@@ -88,8 +83,7 @@ namespace network {
       private:
 
 	typedef boost::asio::io_service::strand strand;
-	typedef std::unordered_map<
-	  std::string, boost::iterator_range<resolver_iterator>> endpoint_cache;
+	typedef std::unordered_map<std::string, resolver_iterator_range> endpoint_cache;
 
 	resolver resolver_;
 	std::unique_ptr<strand> resolver_strand_;
diff --git a/http/src/network/http/v2/client/connection/resolver_delegate.hpp b/http/src/network/http/v2/client/connection/resolver_delegate.hpp
@@ -24,6 +24,7 @@ namespace network {
 
 	typedef boost::asio::ip::tcp::resolver resolver;
 	typedef resolver::iterator resolver_iterator;
+	typedef boost::iterator_range<resolver_iterator> resolver_iterator_range;
 	typedef std::function<void (const boost::system::error_code &,
 				    boost::iterator_range<resolver_iterator>)> on_resolved_fn;
 
diff --git a/http/test/CMakeLists.txt b/http/test/CMakeLists.txt
@@ -11,6 +11,7 @@ include_directories(
   ${CPP-NETLIB_SOURCE_DIR}/logging/src
   ${CPP-NETLIB_SOURCE_DIR}/http/src
   ${GTEST_INCLUDE_DIRS}
+  ${IGLOO_INCLUDE_DIR}
   ${CPP-NETLIB_SOURCE_DIR})
 
 add_subdirectory(v2)
diff --git a/http/test/v2/CMakeLists.txt b/http/test/v2/CMakeLists.txt
@@ -4,4 +4,4 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 
 add_subdirectory(units)
-#add_subdirectory(features)
+add_subdirectory(features)
diff --git a/http/test/v2/features/CMakeLists.txt b/http/test/v2/features/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Copyright (C) 2013 by Glyn Matthews
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+add_subdirectory(client)
diff --git a/http/test/v2/features/client/CMakeLists.txt b/http/test/v2/features/client/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Copyright (C) 2013 by Glyn Matthews
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+set(CPP-NETLIB_CLIENT_TESTS
+  async_resolver_test
+  )
+
+foreach(test ${CPP-NETLIB_CLIENT_TESTS})
+  if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
+    set_source_files_properties(${test}.cpp
+      PROPERTIES COMPILE_FLAGS "-Wall")
+  endif()
+
+  add_executable(cpp-netlib-http-v2-${test} ${test}.cpp)
+  target_link_libraries(cpp-netlib-http-v2-${test}
+    cppnetlib-uri
+    network-http-constants-v2
+    network-http-client-v2
+    ${Boost_LIBRARIES}
+    ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT}
+    )
+  set_target_properties(cpp-netlib-http-v2-${test}
+    PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
+  add_test(cpp-netlib-http-v2-${test}
+    ${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-http-v2-${test})
+
+endforeach(test)
diff --git a/http/test/v2/features/client/async_resolver_test.cpp b/http/test/v2/features/client/async_resolver_test.cpp
@@ -0,0 +1,44 @@
+// Copyright (C) 2013 by Glyn Matthews
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <iostream>
+#include <igloo/igloo_alt.h>
+#include <boost/asio.hpp>
+#include "network/http/v2/client/connection/async_resolver_delegate.hpp"
+
+using namespace igloo;
+namespace http = network::http::v2;
+
+Describe(async_resolver) {
+
+  void SetUp() {
+    io_service_.reset(new boost::asio::io_service);
+    resolver_.reset(new http::async_resolver_delegate(*io_service_));
+  }
+
+  It(resolves_localhost) {
+    // An HTTP server must be running on 127.0.0.1:80
+    // maybe execute a script
+
+    resolver_->resolve("127.0.0.1", 80,
+		       [] (const boost::system::error_code &ec,
+			   const http::async_resolver_delegate::resolver_iterator_range &endpoints) {
+			 for (auto endpoint : endpoints) {
+			   Assert::That(endpoint.endpoint().address().to_string(), Equals("127.0.0.1"));
+			   Assert::That(endpoint.endpoint().port(), Equals(80));
+			 }
+		       });
+    io_service_->run_one();
+  }
+
+  std::unique_ptr<boost::asio::io_service> io_service_;
+  std::unique_ptr<http::async_resolver_delegate> resolver_;
+
+};
+
+int
+main(int argc, char *argv[]) {
+  return TestRunner::RunAllTests(argc, const_cast<const char **>(argv));
+}
diff --git a/http/test/v2/units/client/CMakeLists.txt b/http/test/v2/units/client/CMakeLists.txt
@@ -9,7 +9,6 @@ set(CPP-NETLIB_CLIENT_TESTS
   byte_source_test
   response_test
   request_test
-  async_resolver_test
   normal_connection_test
   client_test
   )
diff --git a/http/test/v2/units/client/async_resolver_test.cpp b/http/test/v2/units/client/async_resolver_test.cpp

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ set(CPP-NETLIB_CLIENT_TESTS`
`9`	`9`	`byte_source_test`
`10`	`10`	`response_test`
`11`	`11`	`request_test`
`12`		`- async_resolver_test`
`13`	`12`	`normal_connection_test`
`14`	`13`	`client_test`
`15`	`14`	`)`