remove any calls to httpbin.org

ikod · May 12, 2023 · b524d8a · b524d8a
1 parent 43a3478
commit b524d8a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/source/requests/httpbin.d b/source/requests/httpbin.d
@@ -11,6 +11,7 @@ version (httpbin)
 	import std.conv;
 	import std.range;
 	import std.string;
+	import std.stdio;
 	import core.thread;
 	import std.experimental.logger;
 
@@ -54,6 +55,10 @@ version (httpbin)
 			rs.headers["Content-Type"] = "application/json";
 			return rs;
 		}
+		auto anything(in App app, ref HTTPD_Request rq, RequestArgs args) {
+				auto rs = response(rq, buildReply(rq));
+				return rs;
+		}
 		auto get(in App app, ref HTTPD_Request rq, RequestArgs args) {
 			debug (httpd) trace("handler /get called");
 			auto rs = response(rq, buildReply(rq));
@@ -187,6 +192,7 @@ version (httpbin)
 			return rs;
 		}
 		server.addRoute(exactRoute(r"/",             &root)).
+				addRoute(regexRoute(r"/anything",   &anything)).
 				addRoute(exactRoute(r"/get",         &get)).
 				addRoute(exactRoute(r"/post",        &post)).
 				addRoute(exactRoute(r"/delete",      &del)).

diff --git a/source/requests/package.d b/source/requests/package.d
@@ -442,6 +442,21 @@ package unittest {
     rq.timeout = 1.seconds;
     assertThrown!TimeoutException(rq.get(httpbinUrl ~ "delay/3"));
 
+    info("Test ByLine interfaces");
+    auto rsp = getContentByLine(httpbinUrl ~ "stream/50");
+    assert(rsp.count == 50);
+    rsp = getContentByLine(httpbinUrl ~ "stream/0");
+    assert(rsp.count == 0);
+    rsp = getContentByLine(httpbinUrl ~ "anything", ["1":"1"]);
+    assert(rsp.map!"cast(string)a".filter!(a => a.canFind("data")).count == 1);
+    rsp = getContentByLine(httpbinUrl ~ "anything", queryParams("1","1"));
+    assert(rsp.map!"cast(string)a".filter!(a => a.canFind("data")).count == 1);
+    rsp = postContentByLine(httpbinUrl ~ "anything", "123");
+    assert(rsp.map!"cast(string)a".filter!(a => a.canFind("data")).count == 1);
+    rsp = putContentByLine(httpbinUrl ~ "anything", "123");
+    assert(rsp.map!"cast(string)a".filter!(a => a.canFind("data")).count == 1);
+
+
     info("Test get in parallel");
     {
         import std.stdio;
@@ -609,22 +624,4 @@ public auto patchContent(A...)(string url, A args) {
     auto rq = Request();
     auto rs = rq.patch(url, args);
     return rs.responseBody;
-}
-
-unittest
-{
-    import std.algorithm;
-    info("Test ByLine interfaces");
-    auto r = getContentByLine("https://httpbin.org/stream/50");
-    assert(r.count == 50);
-    r = getContentByLine("https://httpbin.org/stream/0");
-    assert(r.count == 0);
-    r = getContentByLine("https://httpbin.org/anything", ["1":"1"]);
-    assert(r.map!"cast(string)a".filter!(a => a.canFind("data")).count == 1);
-    r = getContentByLine("https://httpbin.org/anything", queryParams("1","1"));
-    assert(r.map!"cast(string)a".filter!(a => a.canFind("data")).count == 1);
-    r = postContentByLine("https://httpbin.org/anything", "123");
-    assert(r.map!"cast(string)a".filter!(a => a.canFind("data")).count == 1);
-    r = putContentByLine("https://httpbin.org/anything", "123");
-    assert(r.map!"cast(string)a".filter!(a => a.canFind("data")).count == 1);
-}
+}