Remove mention of `mockito-inline` from mockmaker exception (#3628) · mockito/mockito@7764992 · GitHub

1. mockito
2. mockito

Repository navigation

• Code
• Issues451 (451)
• Pull requests51 (51)
• Discussions
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Commit 7764992

Browse filesBrowse the repository at this point in the historyBrowse files

thachlp

authored

Remove mention of mockito-inline from mockmaker exception (#3628)

`mockito-inline` is a discontinued artifact, since the inline mockmaker is now the default mockmaker in `mockito-core`. Fixes #3621

1 parent ee92ad4 commit 7764992
Copy full SHA for 7764992

2 files changed

+10-14Lines changed: 10 additions & 14 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• mockito-core/src
  • main/java/org/mockito/plugins
    • MockMaker.java
  • test/java/org/mockito
    • MockitoTest.java

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎mockito-core/src/main/java/org/mockito/plugins/MockMaker.java‎

Copy file name to clipboardExpand all lines: mockito-core/src/main/java/org/mockito/plugins/MockMaker.java

+4-6Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
@@ -171,9 +171,8 @@ default <T> StaticMockControl<T> createStaticMock(
171	171	+ getClass().getSimpleName()
172	172	+ " does not support the creation of static mocks",
173	173	"",
174		- "Mockito's inline mock maker supports static mocks based on the Instrumentation API.",
175		- "You can simply enable this mock mode, by placing the 'mockito-inline' artifact where you are currently using 'mockito-core'.",
176		- "Note that Mockito's inline mock maker is not supported on Android."));
	174	+ "Ensure your MockMaker implementation supports this feature.",
	175	+ "Note that static mocks maker is not supported on Android."));
177	176	}
178	177
179	178	/**
@@ -203,9 +202,8 @@ default <T> ConstructionMockControl<T> createConstructionMock(
203	202	+ getClass().getSimpleName()
204	203	+ " does not support the creation of construction mocks",
205	204	"",
206		- "Mockito's inline mock maker supports construction mocks based on the Instrumentation API.",
207		- "You can simply enable this mock mode, by placing the 'mockito-inline' artifact where you are currently using 'mockito-core'.",
208		- "Note that Mockito's inline mock maker is not supported on Android."));
	205	+ "Ensure your MockMaker implementation supports this feature.",
	206	+ "Note that construction mocks maker is not supported on Android."));
209	207	}
210	208
211	209	/**

Collapse file

‎mockito-core/src/test/java/org/mockito/MockitoTest.java‎

Copy file name to clipboardExpand all lines: mockito-core/src/test/java/org/mockito/MockitoTest.java

+6-8Lines changed: 6 additions & 8 deletions

Original file line number	Diff line number	Diff line change
@@ -104,7 +104,7 @@ public void shouldValidateMockWhenCreatingInOrderObject() {
104	104
105	105	@SuppressWarnings({"CheckReturnValue", "MockitoUsage"})
106	106	@Test
107		- public void shouldGiveExplanationOnStaticMockingWithoutInlineMockMaker() {
	107	+ public void shouldGiveExplanationOnStaticMockingMockMaker() {
108	108	Assume.assumeThat(Plugins.getMockMaker(), not(instanceOf(InlineMockMaker.class)));
109	109
110	110	assertThatThrownBy(
@@ -114,14 +114,13 @@ public void shouldGiveExplanationOnStaticMockingWithoutInlineMockMaker() {
114	114	.isInstanceOf(MockitoException.class)
115	115	.hasMessageContainingAll(
116	116	"The used MockMaker SubclassByteBuddyMockMaker does not support the creation of static mocks",
117		- "Mockito's inline mock maker supports static mocks based on the Instrumentation API.",
118		- "You can simply enable this mock mode, by placing the 'mockito-inline' artifact where you are currently using 'mockito-core'.",
119		- "Note that Mockito's inline mock maker is not supported on Android.");
	117	+ "Ensure your MockMaker implementation supports this feature.",
	118	+ "Note that static mocks maker is not supported on Android.");
120	119	}
121	120
122	121	@SuppressWarnings({"CheckReturnValue", "MockitoUsage"})
123	122	@Test
124		- public void shouldGiveExplanationOnConstructionMockingWithoutInlineMockMaker() {
	123	+ public void shouldGiveExplanationOnConstructionMockingMockMaker() {
125	124	Assume.assumeThat(Plugins.getMockMaker(), not(instanceOf(InlineMockMaker.class)));
126	125
127	126	assertThatThrownBy(
@@ -131,9 +130,8 @@ public void shouldGiveExplanationOnConstructionMockingWithoutInlineMockMaker() {
131	130	.isInstanceOf(MockitoException.class)
132	131	.hasMessageContainingAll(
133	132	"The used MockMaker SubclassByteBuddyMockMaker does not support the creation of construction mocks",
134		- "Mockito's inline mock maker supports construction mocks based on the Instrumentation API.",
135		- "You can simply enable this mock mode, by placing the 'mockito-inline' artifact where you are currently using 'mockito-core'.",
136		- "Note that Mockito's inline mock maker is not supported on Android.");
	133	+ "Ensure your MockMaker implementation supports this feature.",
	134	+ "Note that construction mocks maker is not supported on Android.");
137	135	}
138	136
139	137	@SuppressWarnings({"CheckReturnValue", "MockitoUsage"})

0 commit comments

Comments

0 (0)