Skip to content

mocks: fix spelling of MockScopeTrackedObject #16706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 1 commit into from
May 27, 2021
Merged

mocks: fix spelling of MockScopeTrackedObject #16706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/common/common/scope_tracker_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ using testing::_;
TEST(ScopeTrackerScopeStateTest, ShouldManageTrackedObjectOnDispatcherStack) {
Api::ApiPtr api(Api::createApiForTest());
Event::DispatcherPtr dispatcher(api->allocateDispatcher("test_thread"));
MockScopedTrackedObject tracked_object;
MockScopeTrackedObject tracked_object;
{
ScopeTrackerScopeState scope(&tracked_object, *dispatcher);
// Check that the tracked_object is on the tracked object stack
Expand Down
2 changes: 1 addition & 1 deletion test/common/event/dispatcher_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ TEST_F(DispatcherImplTest, Timer) {

TEST_F(DispatcherImplTest, TimerWithScope) {
TimerPtr timer;
MockScopedTrackedObject scope;
MockScopeTrackedObject scope;
dispatcher_->post([this, &timer, &scope]() {
{
// Expect a call to dumpState. The timer will call onFatalError during
Expand Down
2 changes: 1 addition & 1 deletion test/common/event/scaled_range_timer_manager_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ class ScaledRangeTimerManagerTestWithScope : public ScaledRangeTimerManagerTest,
public testing::WithParamInterface<bool> {
public:
ScopeTrackedObject* getScope() { return GetParam() ? &scope_ : nullptr; }
MockScopedTrackedObject scope_;
MockScopeTrackedObject scope_;
};

TEST_P(ScaledRangeTimerManagerTestWithScope, ReRegisterOnCallback) {
Expand Down
2 changes: 1 addition & 1 deletion test/mocks/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ inline bool operator==(const StringViewSaver& saver, const char* str) {
return saver.value() == str;
}

class MockScopedTrackedObject : public ScopeTrackedObject {
class MockScopeTrackedObject : public ScopeTrackedObject {
public:
MOCK_METHOD(void, dumpState, (std::ostream&, int), (const));
};
Expand Down
4 changes: 2 additions & 2 deletions test/mocks/http/mocks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ class MockStreamDecoderFilterCallbacks : public StreamDecoderFilterCallbacks,
std::list<DownstreamWatermarkCallbacks*> callbacks_{};
testing::NiceMock<Tracing::MockSpan> active_span_;
testing::NiceMock<Tracing::MockConfig> tracing_config_;
testing::NiceMock<MockScopedTrackedObject> scope_;
testing::NiceMock<MockScopeTrackedObject> scope_;
bool is_grpc_request_{};
bool is_head_request_{false};
bool stream_destroyed_{};
Expand Down Expand Up @@ -327,7 +327,7 @@ class MockStreamEncoderFilterCallbacks : public StreamEncoderFilterCallbacks,
Buffer::InstancePtr buffer_;
testing::NiceMock<Tracing::MockSpan> active_span_;
testing::NiceMock<Tracing::MockConfig> tracing_config_;
testing::NiceMock<MockScopedTrackedObject> scope_;
testing::NiceMock<MockScopeTrackedObject> scope_;
};

class MockStreamDecoderFilter : public StreamDecoderFilter {
Expand Down