Const-ify FakeStream methods where appropriate

Signed-off-by: Mikhail Krinkin <[email protected]>

Author: krinkinmu

test/integration/fake_upstream.cc

@@ -57,8 +57,8 @@ void FakeStream::decodeHeaders(Http::RequestHeaderMapSharedPtr&& headers, bool e
 }
 
 void FakeStream::decodeData(Buffer::Instance& data, bool end_stream) {
-  received_data_ = true;
   absl::MutexLock lock(&lock_);
+  received_data_ = true;
   body_.add(data);
   setEndStream(end_stream);
 }

test/integration/fake_upstream.h

@@ -71,16 +71,16 @@ class FakeStream : public Http::RequestDecoder,
   FakeStream(FakeHttpConnection& parent, Http::ResponseEncoder& encoder,
              Event::TestTimeSystem& time_system);
 
-  uint64_t bodyLength() {
+  uint64_t bodyLength() const {
     absl::MutexLock lock(&lock_);
     return body_.length();
   }
-  std::unique_ptr<Buffer::Instance> body() {
+  std::unique_ptr<Buffer::Instance> body() const {
     absl::MutexLock lock(&lock_);
-    auto body = std::make_unique<Buffer::OwnedImpl>(static_cast<Buffer::Instance&>(body_));
+    auto body = std::make_unique<Buffer::OwnedImpl>(static_cast<const Buffer::Instance&>(body_));
     return body;
   }
-  bool complete() {
+  bool complete() const {
     absl::MutexLock lock(&lock_);
     return end_stream_;
   }
@@ -98,18 +98,21 @@ class FakeStream : public Http::RequestDecoder,
   void encodeResetStream();
   void encodeMetadata(const Http::MetadataMapVector& metadata_map_vector);
   void readDisable(bool disable);
-  Http::RequestHeaderMapConstSharedPtr headers() {
+  Http::RequestHeaderMapConstSharedPtr headers() const {
     absl::MutexLock lock(&lock_);
     Http::RequestHeaderMapConstSharedPtr headers{headers_};
     return headers;
   }
   void setAddServedByHeader(bool add_header) { add_served_by_header_ = add_header; }
-  Http::RequestTrailerMapConstSharedPtr trailers() {
+  Http::RequestTrailerMapConstSharedPtr trailers() const {
     absl::MutexLock lock(&lock_);
     Http::RequestTrailerMapConstSharedPtr trailers{trailers_};
     return trailers;
   }
-  bool receivedData() { return received_data_; }
+  bool receivedData() const {
+    absl::MutexLock lock(&lock_);
+    return received_data_;
+  }
   Http::Http1StreamEncoderOptionsOptRef http1StreamEncoderOptions() {
     return encoder_.http1StreamEncoderOptions();
   }
@@ -256,7 +259,7 @@ class FakeStream : public Http::RequestDecoder,
   }
 
 protected:
-  absl::Mutex lock_;
+  mutable absl::Mutex lock_;
   Http::RequestHeaderMapSharedPtr headers_ ABSL_GUARDED_BY(lock_);
   Buffer::OwnedImpl body_ ABSL_GUARDED_BY(lock_);
   FakeHttpConnection& parent_;
@@ -274,7 +277,7 @@ class FakeStream : public Http::RequestDecoder,
   absl::node_hash_map<std::string, uint64_t> duplicated_metadata_key_count_;
   std::shared_ptr<StreamInfo::StreamInfo> stream_info_;
   AccessLog::InstanceSharedPtrVector access_log_handlers_;
-  bool received_data_{false};
+  bool received_data_ ABSL_GUARDED_BY(lock_) {false};
   bool grpc_stream_started_{false};
   Http::ServerHeaderValidatorPtr header_validator_;
 };