fix: make mock blobs created only once (GoogleCloudPlatform#3850) (GoogleCloudPlatform#3856)

* fix: purge channel before tests

* use latch

* use getUpdateTime

* update resulte to long

* test

* test

* make mock blob fixed

* remove test code

* add config to surefire

* restore

Author: JoeWang1127

spring-cloud-gcp-storage/src/test/java/com/google/cloud/spring/storage/integration/inbound/GcsStreamingMessageSourceTests.java

@@ -20,19 +20,19 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.BDDMockito.willAnswer;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import com.google.cloud.PageImpl;
 import com.google.cloud.ReadChannel;
 import com.google.cloud.spring.storage.integration.GcsSessionFactory;
 import com.google.cloud.storage.Blob;
+import com.google.cloud.storage.BlobInfo;
 import com.google.cloud.storage.Storage;
 import java.io.InputStream;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,15 +52,34 @@
 import org.springframework.test.context.aot.DisabledInAotMode;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-/** Tests for the streaming message source. */
+/**
+ * Tests for the streaming message source.
+ */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
 @DisabledInAotMode
 class GcsStreamingMessageSourceTests {
 
-  @Autowired private PollableChannel unsortedChannel;
+  @Autowired
+  private PollableChannel unsortedChannel;
+
+  @Autowired
+  private PollableChannel sortedChannel;
+
+  private static Blob alphaBlob = mock(Blob.class);
+
+  private static Blob betaBlob = mock(Blob.class);
+
+  private static Blob gammaBlob = mock(Blob.class);
+
+  private static List<Blob> blobList = new ArrayList<>();
 
-  @Autowired private PollableChannel sortedChannel;
+  @BeforeAll
+  static void setUp() {
+    blobList.add(mockBlob(gammaBlob, "gamma"));
+    blobList.add(mockBlob(betaBlob, "beta"));
+    blobList.add(mockBlob(alphaBlob, "alpha/alpha"));
+  }
 
   @Test
   void testInboundStreamingChannelAdapter() {
@@ -102,30 +121,26 @@ void testSortedInboundChannelAdapter() {
     assertThat(message).isNull();
   }
 
-  private static Blob createBlob(String bucket, String name) {
-    Blob blob = mock(Blob.class);
-    willAnswer(invocationOnMock -> bucket).given(blob).getBucket();
-    willAnswer(invocationOnMock -> name).given(blob).getName();
-    willAnswer(invocationOnMock -> OffsetDateTime.now(ZoneOffset.UTC)).given(blob).getUpdateTimeOffsetDateTime();
+  private static Blob mockBlob(Blob blob, String name) {
+    when(blob.getBucket()).thenReturn("gcsbucket");
+    when(blob.getName()).thenReturn(name);
     return blob;
   }
 
-  /** Spring config for the tests. */
+  /**
+   * Spring config for the tests.
+   */
   @Configuration
   @EnableIntegration
   public static class Config {
-
-    @Bean
-    public Storage gcsClient() {
+    private Storage gcsClient() {
       Storage gcs = mock(Storage.class);
-
-      List<Blob> blobList = Stream.of(
-              createBlob("gcsbucket", "gamma"),
-              createBlob("gcsbucket", "beta"),
-              createBlob("gcsbucket", "alpha/alpha"))
-          .collect(Collectors.toList());
-
-      willAnswer(invocationOnMock -> new PageImpl<>(null, null, blobList))
+      willAnswer(
+          invocationOnMock ->
+              new PageImpl<>(
+                  null,
+                  null,
+                  blobList))
           .given(gcs)
           .list(eq("gcsbucket"));
 
@@ -144,9 +159,10 @@ public Storage gcsClient() {
 
     @Bean
     @InboundChannelAdapter(value = "unsortedChannel", poller = @Poller(fixedDelay = "100"))
-    public MessageSource<InputStream> unsortedChannelAdapter(Storage gcs) {
+    public MessageSource<InputStream> unsortedChannelAdapter() {
       GcsStreamingMessageSource adapter =
-          new GcsStreamingMessageSource(new RemoteFileTemplate<>(new GcsSessionFactory(gcs)));
+          new GcsStreamingMessageSource(
+              new RemoteFileTemplate<>(new GcsSessionFactory(gcsClient())));
       adapter.setRemoteDirectory("gcsbucket");
       adapter.setFilter(new AcceptOnceFileListFilter<>());
 
@@ -155,11 +171,11 @@ public MessageSource<InputStream> unsortedChannelAdapter(Storage gcs) {
 
     @Bean
     @InboundChannelAdapter(value = "sortedChannel", poller = @Poller(fixedDelay = "100"))
-    public MessageSource<InputStream> sortedChannelAdapter(Storage gcs) {
+    public MessageSource<InputStream> sortedChannelAdapter() {
       GcsStreamingMessageSource adapter =
           new GcsStreamingMessageSource(
-              new RemoteFileTemplate<>(new GcsSessionFactory(gcs)),
-              Comparator.comparing(blob -> blob.getName()));
+              new RemoteFileTemplate<>(new GcsSessionFactory(gcsClient())),
+              Comparator.comparing(BlobInfo::getName));
 
       adapter.setRemoteDirectory("gcsbucket");
       adapter.setFilter(new AcceptOnceFileListFilter<>());