divijvaidya commented on code in PR #12677:
URL: https://github.com/apache/kafka/pull/12677#discussion_r978867978
##########
connect/runtime/src/test/java/org/apache/kafka/connect/runtime/WorkerMetricsGroupTest.java:
##########
@@ -83,167 +77,107 @@ public void setup() {
taskStartupAttempts = mockSensor(metricGroup, "task-startup-attempts");
taskStartupSuccesses = mockSensor(metricGroup,
"task-startup-successes");
taskStartupFailures = mockSensor(metricGroup, "task-startup-failures");
-
- delegateConnectorListener =
PowerMock.createStrictMock(ConnectorStatus.Listener.class);
- delegateTaskListener =
PowerMock.createStrictMock(TaskStatus.Listener.class);
}
private Sensor mockSensor(ConnectMetrics.MetricGroup metricGroup, String
name) {
- Sensor sensor = PowerMock.createMock(Sensor.class);
- metricGroup.sensor(eq(name));
- expectLastCall().andReturn(sensor);
-
- sensor.add(anyObject(CompoundStat.class));
- expectLastCall().andStubReturn(true);
-
- sensor.add(anyObject(MetricName.class),
anyObject(CumulativeSum.class));
- expectLastCall().andStubReturn(true);
-
+ Sensor sensor = mock(Sensor.class);
+ when(metricGroup.sensor(name)).thenReturn(sensor);
+ when(sensor.add(any(CompoundStat.class))).thenReturn(true);
+ when(sensor.add(any(MetricName.class),
any(CumulativeSum.class))).thenReturn(true);
return sensor;
}
@Test
public void testConnectorStartupRecordedMetrics() {
- delegateConnectorListener.onStartup(eq(connector));
- expectLastCall();
-
- connectorStartupAttempts.record(eq(1.0));
- expectLastCall();
- connectorStartupSuccesses.record(eq(1.0));
- expectLastCall();
- connectorStartupResults.record(eq(1.0));
- expectLastCall();
-
- PowerMock.replayAll();
-
WorkerMetricsGroup workerMetricsGroup = new WorkerMetricsGroup(new
HashMap<>(), new HashMap<>(), connectMetrics);
final ConnectorStatus.Listener connectorListener =
workerMetricsGroup.wrapStatusListener(delegateConnectorListener);
connectorListener.onStartup(connector);
- PowerMock.verifyAll();
+ verifyRecordConnectorStartupSuccess();
+ verify(delegateConnectorListener).onStartup(connector);
}
@Test
public void testConnectorFailureAfterStartupRecordedMetrics() {
- delegateConnectorListener.onStartup(eq(connector));
- expectLastCall();
-
- connectorStartupAttempts.record(eq(1.0));
- expectLastCall();
- connectorStartupSuccesses.record(eq(1.0));
- expectLastCall();
- connectorStartupResults.record(eq(1.0));
- expectLastCall();
-
- delegateConnectorListener.onFailure(eq(connector), eq(exception));
- expectLastCall();
-
- // recordConnectorStartupFailure() should not be called if failure
happens after a successful startup
Review Comment:
Fixed in upcoming commit.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
