Enforce using BDDMockito

[quaff]

1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule

[snicoll]

Thanks for the PR but I don't see a reason to change calls to verify.

[quaff]

Mixing given and verify is not elegant, pure BDD-style is better for readability.

spring-boot/src/checkstyle/checkstyle.xml

Lines 49 to 55 in 47516b5

	<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
	<property name="maximum" value="0"/>
	<property name="format" value="org\.mockito\.(Mockito|BDDMockito)\.(when|doThrow|doAnswer)" />
	<property name="message"
	value="Please use BDD-style (given, when, then) using BDDMockito imports." />
	<property name="ignoreComments" value="true" />
	</module>

Please use BDD-style (given, when, then) using BDDMockito imports.

[snicoll]

@quaff that's a team decision I am afraid and what you've quoted doesn't include verify on purpose, it states:

Please use BDD-style (given, when, then) using BDDMockito imports.

We've been there before and we have no intention to change calls to verify at this point. If you revert that part, we can continue reviewing this PR.

[quaff]

@quaff that's a team decision I am afraid and what you've quoted doesn't include verify on purpose, it states:

Please use BDD-style (given, when, then) using BDDMockito imports.

We've been there before and we have no intention to change calls to verify at this point. If you revert that part, we can continue reviewing this PR.

Does the team decide to keep weird given and verify usage? I will create another PR to
remove unnecessary explicit Mockito.times(1) if the answer is YES.

[vpavic]

@snicoll What @quaff is trying to say is that Please use BDD-style (given, when, then) using BDDMockito imports message on the Checkstyle rule is actually in conflict with what you describe as the team's preference - you don't actually use BDDMockito#then (as message the suggests) but rather Mockito#verify.

FWIW I also find this mixed usage of BDD-style and traditional Mockito APIs to be rather confusing and unintuitive.

[snicoll]

Thanks both. We've discussed this as a team and decided to harmonize and use then rather than verify.