112
112
import org .mockito .Captor ;
113
113
import org .mockito .InOrder ;
114
114
import org .mockito .Mock ;
115
- import org .mockito .junit .MockitoJUnit ;
116
- import org .mockito .junit .MockitoRule ;
115
+ import org .mockito .MockitoAnnotations ;
117
116
118
117
/** Unit tests for {@link ServerImpl}. */
119
118
@ RunWith (JUnit4 .class )
@@ -140,7 +139,6 @@ public boolean shouldAccept(Runnable runnable) {
140
139
};
141
140
private static final String AUTHORITY = "some_authority" ;
142
141
143
- @ Rule public final MockitoRule mocks = MockitoJUnit .rule ();
144
142
@ Rule public final ExpectedException thrown = ExpectedException .none ();
145
143
146
144
@ BeforeClass
@@ -164,8 +162,8 @@ public Context filterContext(Context context) {
164
162
return newCtx .withValue (SERVER_TRACER_ADDED_KEY , "context added by tracer" );
165
163
}
166
164
};
167
- @ Mock private ObjectPool < Executor > executorPool ;
168
- @ Mock private ClientTransportServersBuilder mockClientTransportServersBuilder ;
165
+ @ Mock
166
+ private ObjectPool < Executor > executorPool ;
169
167
private ServerImplBuilder builder ;
170
168
private MutableHandlerRegistry mutableFallbackRegistry = new MutableHandlerRegistry ();
171
169
private HandlerRegistry fallbackRegistry = mock (
@@ -202,7 +200,14 @@ public List<ServerServiceDefinition> getServices() {
202
200
/** Set up for test. */
203
201
@ Before
204
202
public void startUp () throws IOException {
205
- builder = new ServerImplBuilder (mockClientTransportServersBuilder );
203
+ MockitoAnnotations .initMocks (this );
204
+ builder = new ServerImplBuilder (new ClientTransportServersBuilder () {
205
+ @ Override
206
+ public List <? extends InternalServer > buildClientTransportServers (
207
+ List <? extends ServerStreamTracer .Factory > streamTracerFactories ) {
208
+ throw new UnsupportedOperationException ();
209
+ }
210
+ });
206
211
builder .channelz = channelz ;
207
212
builder .ticker = timer .getDeadlineTicker ();
208
213
streamTracerFactories = Arrays .asList (streamTracerFactory );
0 commit comments