Skip to content

Commit 46557e7

Browse files
committed
Less noise in tests
1 parent 953dbf3 commit 46557e7

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

core/src/test/java/io/grpc/internal/ServerImplTest.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@
112112
import org.mockito.Captor;
113113
import org.mockito.InOrder;
114114
import org.mockito.Mock;
115-
import org.mockito.junit.MockitoJUnit;
116-
import org.mockito.junit.MockitoRule;
115+
import org.mockito.MockitoAnnotations;
117116

118117
/** Unit tests for {@link ServerImpl}. */
119118
@RunWith(JUnit4.class)
@@ -140,7 +139,6 @@ public boolean shouldAccept(Runnable runnable) {
140139
};
141140
private static final String AUTHORITY = "some_authority";
142141

143-
@Rule public final MockitoRule mocks = MockitoJUnit.rule();
144142
@Rule public final ExpectedException thrown = ExpectedException.none();
145143

146144
@BeforeClass
@@ -164,8 +162,8 @@ public Context filterContext(Context context) {
164162
return newCtx.withValue(SERVER_TRACER_ADDED_KEY, "context added by tracer");
165163
}
166164
};
167-
@Mock private ObjectPool<Executor> executorPool;
168-
@Mock private ClientTransportServersBuilder mockClientTransportServersBuilder;
165+
@Mock
166+
private ObjectPool<Executor> executorPool;
169167
private ServerImplBuilder builder;
170168
private MutableHandlerRegistry mutableFallbackRegistry = new MutableHandlerRegistry();
171169
private HandlerRegistry fallbackRegistry = mock(
@@ -202,7 +200,14 @@ public List<ServerServiceDefinition> getServices() {
202200
/** Set up for test. */
203201
@Before
204202
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+
});
206211
builder.channelz = channelz;
207212
builder.ticker = timer.getDeadlineTicker();
208213
streamTracerFactories = Arrays.asList(streamTracerFactory);

0 commit comments

Comments
 (0)