wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSourceTest.java

@@ -63,7 +63,6 @@
 import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -553,7 +552,7 @@ void listReplacesResourceFromTempCache() {
 
     var mim = mock(InformerManager.class);
     when(mim.list(nullable(String.class))).thenReturn(Stream.of(original));
-    doReturn(mim).when(informerEventSource).manager();
+    when(informerEventSource.manager()).thenReturn(mim);
 
     var result = informerEventSource.list(null, Cache.TRUE).toList();
 
@@ -572,7 +571,7 @@ void listExcludesResourceWhenTempCacheContainsNewerVersionThatNoLongerMatchesPre
 
     var mim = mock(InformerManager.class);
     when(mim.list(nullable(String.class), any())).thenReturn(Stream.of(original));
-    doReturn(mim).when(informerEventSource).manager();
+    when(informerEventSource.manager()).thenReturn(mim);
 
     var result =
         informerEventSource
@@ -590,7 +589,7 @@ void listKeepsResourceWhenNotInTempCache() {
 
     var mim = mock(InformerManager.class);
     when(mim.list(nullable(String.class))).thenReturn(Stream.of(original));
-    doReturn(mim).when(informerEventSource).manager();
+    when(informerEventSource.manager()).thenReturn(mim);
 
     var result = informerEventSource.list(null, r -> true).toList();
 
@@ -610,7 +609,7 @@ void listReplacesOnlyMatchingResources() {
 
     var informerManager = mock(InformerManager.class);
     when(informerManager.list(nullable(String.class))).thenReturn(Stream.of(dep1, dep2));
-    doReturn(informerManager).when(informerEventSource).manager();
+    when(informerEventSource.manager()).thenReturn(informerManager);
 
     var result = informerEventSource.list(null, r -> true).toList();
 
@@ -628,7 +627,7 @@ void byIndexStreamReplacesFromTempCache() {
 
     var informerManager = mock(InformerManager.class);
     when(informerManager.byIndexStream(any(), any())).thenReturn(Stream.of(original));
-    doReturn(informerManager).when(informerEventSource).manager();
+    when(informerEventSource.manager()).thenReturn(informerManager);
     informerEventSource.addIndexers(Map.of("idx", d -> List.of("key")));
 
     var result = informerEventSource.byIndexStream("idx", "key").toList();
@@ -649,7 +648,7 @@ void byIndexStreamSkipsNewerTempCacheResourceWhenIndexedValueChanged() {
 
     var informerManager = mock(InformerManager.class);
     when(informerManager.byIndexStream(any(), any())).thenReturn(Stream.of(original));
-    doReturn(informerManager).when(informerEventSource).manager();
+    when(informerEventSource.manager()).thenReturn(informerManager);
     informerEventSource.addIndexers(
         Map.of("idx", d -> List.of(d.getMetadata().getLabels().get("app"))));
 
@@ -670,7 +669,7 @@ void listKeepsResourceWhenTempCacheHasOlderVersion() {
 
     var mim = mock(InformerManager.class);
     when(mim.list(nullable(String.class))).thenReturn(Stream.of(original));
-    doReturn(mim).when(informerEventSource).manager();
+    when(informerEventSource.manager()).thenReturn(mim);
 
     var result = informerEventSource.list(null, r -> true).toList();
 
@@ -689,7 +688,7 @@ void byIndexStreamKeepsResourceWhenTempCacheHasOlderVersion() {
 
     var mim = mock(InformerManager.class);
     when(mim.byIndexStream(any(), any())).thenReturn(Stream.of(original));
-    doReturn(mim).when(informerEventSource).manager();
+    when(informerEventSource.manager()).thenReturn(mim);
     informerEventSource.addIndexers(Map.of("idx", d -> List.of("key")));
 
     var result = informerEventSource.byIndexStream("idx", "key").toList();
@@ -708,7 +707,7 @@ void listAddsGhostResources() {
 
     var mim = mock(InformerManager.class);
     when(mim.list(nullable(String.class))).thenReturn(Stream.of(resource));
-    doReturn(mim).when(informerEventSource).manager();
+    when(informerEventSource.manager()).thenReturn(mim);
 
     var result = informerEventSource.list(null, r -> true).toList();
 
@@ -730,7 +729,7 @@ void keysIncludesGhostResourceKeys() {
     var mim = mock(InformerManager.class);
     when(mim.keys()).thenReturn(Stream.of(resourceId));
     when(mim.contains(ghostResourceId)).thenReturn(false);
-    doReturn(mim).when(informerEventSource).manager();
+    when(informerEventSource.manager()).thenReturn(mim);
 
     var result = informerEventSource.keys().toList();
 
@@ -751,7 +750,7 @@ void keysDoesNotDuplicateExistingKeys() {
     var mim = mock(InformerManager.class);
     when(mim.keys()).thenReturn(Stream.of(resourceId));
     when(mim.contains(resourceId)).thenReturn(true);
-    doReturn(mim).when(informerEventSource).manager();
+    when(informerEventSource.manager()).thenReturn(mim);
 
     var result = informerEventSource.keys().toList();