Skip to content

improve multi mock behavior #979

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

Open
pablo-msft wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −2
Open

improve multi mock behavior #979

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
19 changes: 17 additions & 2 deletions Source/Mock/lhc_mock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ bool Mock_Internal_HCHttpCallPerformAsync(
auto& mocks{ httpSingleton->m_mocks };
HC_MOCK_CALL* mock{ nullptr };

// Use the most recently added mock that matches (similar to a stack).
for (auto iter = mocks.rbegin(); iter != mocks.rend(); ++iter)
// Use the first mock that matches this call
for (auto iter = mocks.begin(); iter != mocks.end(); ++iter)
{
if (DoesMockCallMatch(*iter, originalCall))
{
Expand Down Expand Up @@ -128,6 +128,21 @@ bool Mock_Internal_HCHttpCallPerformAsync(
HCHttpCallResponseSetHeader(originalCall, str1, str2);
}

// If this is not the only mock that matches, remove it from the list of mocks so that multiple can be used
// in sequence
auto countMatching = std::count_if(
mocks.begin(),
mocks.end(),
[originalCall](auto m)
{
return DoesMockCallMatch(m, originalCall);
});

if (countMatching > 1)
{
HCMockRemoveMock(mock);
}

return true;
}

Expand Down