simplify tests

Author: mpeddada1

google/cloud/bigtable/internal/data_connection_impl.cc

@@ -930,7 +930,6 @@ bigtable::RowStream DataConnectionImpl::ExecuteQuery(
       request.instance_name(), app_profile_id(*current));
 
   auto query_plan = params.bound_query.query_plan_;
-
   auto query_plan_retry_policy = query_plan_refresh_retry_policy(*current);
   auto query_plan_backoff_policy = backoff_policy(*current);
   Status last_status;
@@ -967,7 +966,6 @@ bigtable::RowStream DataConnectionImpl::ExecuteQuery(
         return bigtable::RowStream(std::make_unique<StatusOnlyResultSetSource>(
             std::move(last_status)));
       }
-
     } else {
       last_status = query_plan_data.status();
     }

google/cloud/bigtable/internal/data_connection_impl_test.cc

@@ -3720,21 +3720,18 @@ TEST_F(DataConnectionTest, ExecuteQueryFailureWithSchemaChange) {
             Status{StatusCode::kUnimplemented, "not implemented"}));
   };
   EXPECT_CALL(*mock, ExecuteQuery)
-      .Times(1)
-      .WillRepeatedly(
-          [&](auto, auto const&,
-              google::bigtable::v2::ExecuteQueryRequest const& request) {
-            EXPECT_EQ(request.app_profile_id(), kAppProfile);
-            EXPECT_EQ(request.instance_name(),
-                      "projects/test-project/instances/test-instance");
-            auto stream = std::make_unique<MockExecuteQueryStream>();
-            EXPECT_CALL(*stream, Read)
-                .WillOnce([&](google::bigtable::v2::ExecuteQueryResponse* r) {
-                  *r = eq_response;
-                  return absl::nullopt;
-                });
-            return stream;
-          });
+      .WillOnce([&](auto, auto const&,
+                    google::bigtable::v2::ExecuteQueryRequest const& request) {
+        EXPECT_EQ(request.instance_name(),
+                  "projects/test-project/instances/test-instance");
+        auto stream = std::make_unique<MockExecuteQueryStream>();
+        EXPECT_CALL(*stream, Read)
+            .WillOnce([&](google::bigtable::v2::ExecuteQueryResponse* r) {
+              *r = eq_response;
+              return absl::nullopt;
+            });
+        return stream;
+      });
 
   auto conn = TestConnection(std::move(mock), std::move(factory));
   internal::OptionsSpan span(CallOptions());