Merge pull request #1436 from data-integrations/release-0.23-ut-fix-cherry-pick

Bumping version to snapshot, Fixing intermittent failures for spanner unit tests

Author: itsankit-google

pom.xml

@@ -20,7 +20,7 @@
 
   <groupId>io.cdap.plugin</groupId>
   <artifactId>google-cloud</artifactId>
-  <version>0.23.2</version>
+  <version>0.23.3-SNAPSHOT</version>
   <name>Google Cloud Plugins</name>
   <packaging>jar</packaging>
   <description>Plugins for Google Big Query</description>

src/test/java/io/cdap/plugin/gcp/spanner/connector/SpannerConnectorTest.java

@@ -196,43 +196,34 @@ private void testBrowse(SpannerConnector connector) throws IOException {
     // browse project
     BrowseDetail detail = connector.browse(new MockConnectorContext(new MockConnectorConfigurer()),
                                            BrowseRequest.builder("/").build());
-    BrowseDetail expected = BrowseDetail.builder()
-      .setTotalCount(1)
-      .addEntity(BrowseEntity.builder(instance, "/" + instance, "instance")
+    BrowseEntity expected = BrowseEntity.builder(instance, "/" + instance, "instance")
                    .canBrowse(true)
                    .canSample(false)
-                   .build())
-      .build();
-    Assert.assertEquals(expected, detail);
+                   .build();
+    Assert.assertTrue(detail.getEntities().contains(expected));
 
     // browse instance
     detail = connector.browse(new MockConnectorContext(new MockConnectorConfigurer()),
                               BrowseRequest.builder(instance).build());
-    expected = BrowseDetail.builder()
-      .setTotalCount(1)
-      .addEntity(BrowseEntity.builder(database, String.format("/%s/%s", instance, database), "database")
+    expected = BrowseEntity.builder(database, String.format("/%s/%s", instance, database), "database")
                    .canBrowse(true)
                    .canSample(false)
-                   .build())
-      .build();
-    Assert.assertEquals(expected, detail);
+                   .build();
+    Assert.assertTrue(detail.getEntities().contains(expected));
 
     // browse database
     detail = connector.browse(new MockConnectorContext(new MockConnectorConfigurer()),
                               BrowseRequest.builder(instance + "/" + database).build());
-    expected = BrowseDetail.builder()
-      .setTotalCount(1)
-      .addEntity(BrowseEntity.builder(table, String.format("/%s/%s/%s", instance, database, table), "table")
+    expected = BrowseEntity.builder(table, String.format("/%s/%s/%s", instance, database, table), "table")
                    .canBrowse(false)
                    .canSample(true)
-                   .build())
-      .build();
-    Assert.assertEquals(expected, detail);
+                   .build();
+    Assert.assertTrue(detail.getEntities().contains(expected));
 
     // browse table
     detail = connector.browse(new MockConnectorContext(new MockConnectorConfigurer()),
                               BrowseRequest.builder(instance + "/" + database + "/" + table).build());
-    Assert.assertEquals(expected, detail);
+    Assert.assertTrue(detail.getEntities().contains(expected));
 
     // invalid path
     Assert.assertThrows(IllegalArgumentException.class, () ->