Skip to content

Commit 47e6453

Browse files
committed
Add tracking and HttpResponse overload to FakeHttpClient
Adds RequestMade(string_view) to inspect requested URLs and SetResponse(HttpResponse<string>) overload. Assisted-by: Jetski:Gemini Next
1 parent c77a6c5 commit 47e6453

2 files changed

Lines changed: 24 additions & 2 deletions

File tree

base/cvd/cuttlefish/host/libs/web/http_client/fake_http_client.cc

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,27 @@ void FakeHttpClient::SetResponse(std::string data, std::string url) {
3131
.http_code = 200,
3232
.headers = {},
3333
};
34-
auto handler = [res = std::move(res)](const HttpRequest&) { return res; };
34+
SetResponse(std::move(res), std::move(url));
35+
}
36+
37+
void FakeHttpClient::SetResponse(HttpResponse<std::string> response,
38+
std::string url) {
39+
auto handler = [res = std::move(response)](const HttpRequest&) {
40+
return res;
41+
};
3542
SetResponse(std::move(handler), std::move(url));
3643
}
3744

45+
bool FakeHttpClient::RequestMade(std::string_view url) const {
46+
std::lock_guard lock(mutex_);
47+
for (const auto& requested : requested_urls_) {
48+
if (requested.find(url) != std::string_view::npos) {
49+
return true;
50+
}
51+
}
52+
return false;
53+
}
54+
3855
void FakeHttpClient::SetResponse(FakeHttpClient::Handler handler,
3956
std::string url) {
4057
std::lock_guard lock(mutex_);
@@ -60,6 +77,7 @@ const FakeHttpClient::Handler* FakeHttpClient::FindHandler(
6077
Result<HttpResponse<void>> FakeHttpClient::DownloadToCallback(
6178
HttpRequest request, HttpClient::DataCallback callback) {
6279
std::lock_guard lock(mutex_);
80+
requested_urls_.push_back(request.url);
6381
CF_EXPECT(callback(nullptr, 0));
6482
const Handler* handler = FindHandler(request.url);
6583
HttpResponse<void> response;

base/cvd/cuttlefish/host/libs/web/http_client/fake_http_client.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <string>
2121
#include <string_view>
2222
#include <unordered_map>
23+
#include <vector>
2324

2425
#include "cuttlefish/host/libs/web/http_client/http_client.h"
2526
#include "cuttlefish/result/result.h"
@@ -33,16 +34,19 @@ class FakeHttpClient : public HttpClient {
3334
// The longest string that is a complete substring of `url` is used to match
3435
// requests.
3536
void SetResponse(std::string data, std::string url = "");
37+
void SetResponse(HttpResponse<std::string> response, std::string url = "");
3638
void SetResponse(Handler handler, std::string url = "");
39+
bool RequestMade(std::string_view url) const;
3740
// Returns response's status code.
3841
Result<HttpResponse<void>> DownloadToCallback(
3942
HttpRequest request, HttpClient::DataCallback callback) override;
4043

4144
private:
4245
const Handler* FindHandler(std::string_view url) const;
4346

44-
std::mutex mutex_;
47+
mutable std::mutex mutex_;
4548
std::unordered_map<std::string, Handler> responses_;
49+
std::vector<std::string> requested_urls_;
4650
};
4751

4852
} // namespace cuttlefish

0 commit comments

Comments
 (0)