Thanks to visit codestin.com
Credit goes to github.com

Skip to content

New API to clean up all inline mocks after test #1619

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
merged 10 commits into from
Mar 5, 2019
Merged

New API to clean up all inline mocks after test #1619

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
91c8e9c
Fixes #1614: Add API to clean up mocks.
ttanxu Feb 11, 2019
808bae8
Tweaked the javadoc and method names
mockitoguy Mar 2, 2019
e44d76e
Replace conditional with JUnit assume
mockitoguy Mar 2, 2019
a6027ac
Tweaked tests
mockitoguy Mar 2, 2019
c3c0d0a
Tweaked javadoc
mockitoguy Mar 2, 2019
ebb9b85
Javadoc and since tags
mockitoguy Mar 2, 2019
cc38b6c
Next minor version
mockitoguy Mar 2, 2019
d61a8be
Added missing coverage
mockitoguy Mar 5, 2019
1641868
Javadoc
mockitoguy Mar 5, 2019
959cba4
Merge branch 'release/2.x' into release/2.x
mockitoguy Mar 5, 2019
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
Prev Previous commit
Next Next commit
Replace conditional with JUnit assume
  • Loading branch information
@mockitoguy
mockitoguy committed Mar 2, 2019
commit e44d76e7da56ec94ae2d26d111e0ad0fe6f6c246
25 changes: 17 additions & 8 deletions src/test/java/org/mockito/internal/framework/DefaultMockitoFrameworkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
Expand Down Expand Up @@ -124,32 +125,40 @@ public void run() {

@Test
public void clears_all_mocks() {
//clearing mocks only works with inline mocking
assumeTrue(Plugins.getMockMaker() instanceof InlineMockMaker);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, one of the reason why I didn't use assume at first is that it can test user can safely call clearInlineMocks() and clearMock() even when mock maker is not a inline mock maker.

That's not very important I suppose, but still would be good to cover that in tests imo.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 I'm fixing it now.


//given
List list1 = mock(List.class);
assertTrue(mockingDetails(list1).isMock());
List list2 = mock(List.class);
assertTrue(mockingDetails(list2).isMock());

//when
framework.clearInlineMocks();

if (Plugins.getMockMaker() instanceof InlineMockMaker) {
assertFalse(mockingDetails(list1).isMock());
assertFalse(mockingDetails(list2).isMock());
}
//then
assertFalse(mockingDetails(list1).isMock());
assertFalse(mockingDetails(list2).isMock());
}

@Test
public void clears_mock() {
//clearing mocks only works with inline mocking
assumeTrue(Plugins.getMockMaker() instanceof InlineMockMaker);

//given
List list1 = mock(List.class);
assertTrue(mockingDetails(list1).isMock());
List list2 = mock(List.class);
assertTrue(mockingDetails(list2).isMock());

//when
framework.clearInlineMock(list1);

if (Plugins.getMockMaker() instanceof InlineMockMaker) {
assertFalse(mockingDetails(list1).isMock());
assertTrue(mockingDetails(list2).isMock());
}
//then
assertFalse(mockingDetails(list1).isMock());
assertTrue(mockingDetails(list2).isMock());
}

private static class MyListener implements MockitoListener {}
Expand Down