Skip to content

Commit 1affee4

Browse files
author
Soroosh Sarabadani
committed
resolve conflict
1 parent 13da52f commit 1affee4

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

operator-framework/src/test/java/io/javaoperatorsdk/operator/processing/DefaultEventHandlerTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import static io.javaoperatorsdk.operator.TestUtils.testCustomResource;
44
import static org.assertj.core.api.Assertions.assertThat;
5+
import static org.mockito.ArgumentMatchers.eq;
56
import static org.mockito.Mockito.any;
67
import static org.mockito.Mockito.mock;
8+
import static org.mockito.Mockito.never;
79
import static org.mockito.Mockito.timeout;
810
import static org.mockito.Mockito.times;
911
import static org.mockito.Mockito.verify;

0 commit comments

Comments
 (0)