diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2021-06-22 23:29:29 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-22 23:29:29 +0000 |
commit | 6a8fa13306b513ef9f2e338e43ff779308879656 (patch) | |
tree | 85693285a5bd3002f6c184315fdeb77308ce2c17 | |
parent | efd2e94077d63b7b6192546123d32d22fa821bd4 (diff) | |
parent | 05146ed64ac35002f58f3fcd53a66e13989d6f5a (diff) | |
download | net-6a8fa13306b513ef9f2e338e43ff779308879656.tar.gz |
Merge "Supports to add a response for the given headers" into sc-dev am: 05146ed64a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/15048201
Change-Id: I6bfe1ff153e9a1975a35f9f5dd4c61ea6d6b3ffc
-rw-r--r-- | common/testutils/devicetests/com/android/testutils/TestHttpServer.kt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/common/testutils/devicetests/com/android/testutils/TestHttpServer.kt b/common/testutils/devicetests/com/android/testutils/TestHttpServer.kt index 7aae8e3b..39ce4872 100644 --- a/common/testutils/devicetests/com/android/testutils/TestHttpServer.kt +++ b/common/testutils/devicetests/com/android/testutils/TestHttpServer.kt @@ -54,12 +54,12 @@ class TestHttpServer(host: String? = null) : NanoHTTPD(host, 0 /* auto-select th fun addResponse( uri: Uri, statusCode: Response.IStatus, - locationHeader: String? = null, + headers: Map<String, String>? = null, content: String = "" ) { addResponse(Request(uri.path ?: "", Method.GET, uri.query ?: ""), - statusCode, locationHeader, content) + statusCode, headers, content) } /** @@ -68,11 +68,13 @@ class TestHttpServer(host: String? = null) : NanoHTTPD(host, 0 /* auto-select th fun addResponse( request: Request, statusCode: Response.IStatus, - locationHeader: String? = null, + headers: Map<String, String>? = null, content: String = "" ) { val response = newFixedLengthResponse(statusCode, "text/plain", content) - locationHeader?.let { response.addHeader("Location", it) } + headers?.forEach { + (key, value) -> response.addHeader(key, value) + } responses[request] = response } |