Skip to content
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

Edit DoAnswerStyleStubbing.isSet() to return true if there are answers #3020

Merged
merged 3 commits into from
May 25, 2023
Merged

Edit DoAnswerStyleStubbing.isSet() to return true if there are answers #3020

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67920ce
Edit DoAnswerStyleStubbing.isSet() to return true if there are answers
May 25, 2023
8eb2572
Fixes #2955
May 25, 2023
29202df
Merge branch 'main' into refactor/rename-function-name
undermyumbrella1 May 25, 2023
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
Next Next commit
Edit DoAnswerStyleStubbing.isSet() to return true if there are answers
  • Loading branch information
Kei committed May 25, 2023
commit 67920ce8b8d7096cd294bcbea83a4c45601ea743
2 changes: 1 addition & 1 deletion src/main/java/org/mockito/internal/stubbing/DoAnswerStyleStubbing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ void setAnswers(List<Answer<?>> answers, Strictness stubbingStrictness) {
}

boolean isSet() {
return answers.isEmpty();
return answers.size() > 0;
}

void clear() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/mockito/internal/stubbing/InvocationContainerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public void setAnswersForStubbing(List<Answer<?>> answers, Strictness strictness
}

public boolean hasAnswersForStubbing() {
return !doAnswerStyleStubbing.isSet();
return doAnswerStyleStubbing.isSet();
}

public boolean hasInvocationForPotentialStubbing() {
Expand Down