From 49c0012e2dffbbbfe45fe6429f345df6293d6bb5 Mon Sep 17 00:00:00 2001
From: priyabhatnagar <priya.bhatnagar@cloudsufi.com>
Date: Fri, 13 Oct 2023 12:17:39 +0530
Subject: [PATCH] new scenarios e2e bq review comments addressed

---
 .../features/bigquery/sink/BigQueryToBigQuerySink.feature      | 2 +-
 .../java/io/cdap/plugin/common/stepsdesign/TestSetupHooks.java | 2 +-
 src/e2e-test/resources/pluginParameters.properties             | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/e2e-test/features/bigquery/sink/BigQueryToBigQuerySink.feature b/src/e2e-test/features/bigquery/sink/BigQueryToBigQuerySink.feature
index 48757a7515..46a4348ccd 100644
--- a/src/e2e-test/features/bigquery/sink/BigQueryToBigQuerySink.feature
+++ b/src/e2e-test/features/bigquery/sink/BigQueryToBigQuerySink.feature
@@ -432,7 +432,7 @@ Feature: BigQuery sink - Verification of BigQuery to BigQuery successful data tr
     Then Wait till connection data loading completes with a timeout of 60 seconds
     Then Verify input plugin property: "dataset" contains value: "dataset"
     Then Enter input plugin property: "table" with value: "bqTargetTable"
-    Then Enter input plugin property: "partitionByField" with value: "bqPartitionFieldTime"
+    Then Enter input plugin property: "partitionByField" with value: "bqPartitionFieldDate"
     Then Click plugin property: "updateTableSchema"
     Then Validate "BigQuery" plugin properties
     Then Close the BigQuery properties
diff --git a/src/e2e-test/java/io/cdap/plugin/common/stepsdesign/TestSetupHooks.java b/src/e2e-test/java/io/cdap/plugin/common/stepsdesign/TestSetupHooks.java
index 3c9e286a48..72d01507fb 100644
--- a/src/e2e-test/java/io/cdap/plugin/common/stepsdesign/TestSetupHooks.java
+++ b/src/e2e-test/java/io/cdap/plugin/common/stepsdesign/TestSetupHooks.java
@@ -273,7 +273,7 @@ public static void createTempSourceBQTable() throws IOException, InterruptedExce
   @After(order = 1, value = "@BQ_SOURCE_TEST or @BQ_PARTITIONED_SOURCE_TEST or @BQ_SOURCE_DATATYPE_TEST or " +
     "@BQ_INSERT_SOURCE_TEST or @BQ_UPDATE_SINK_TEST or @BQ_UPSERT_SOURCE_TEST or @BQ_UPSERT_SINK_TEST or " +
     "@BQ_NULL_MODE_SOURCE_TEST or @BQ_UPDATE_SOURCE_DEDUPE_TEST or @BQ_UPDATE_SINK_DEDUPE_TEST or " +
-    "@BQ_INSERT_INT_SOURCE_TEST or @BQ_EXISTING_SINK_TEST or @BQ_TIME_STAMP_SOURCE_TEST or " +
+    "@BQ_INSERT_INT_SOURCE_TEST or @BQ_EXISTING_SINK_TEST or @BQ_TIME_SOURCE_TEST or " +
     "@BQ_UPSERT_DEDUPE_SOURCE_TEST or @BQ_UPSERT_DEDUPE_SINK_TEST or @BQ_RECORD_SOURCE_TEST or " +
     "@BQ_SECOND_RECORD_SOURCE_TEST or @BQ_INSERT_SINK_TEST")
   public static void deleteTempSourceBQTable() throws IOException, InterruptedException {
diff --git a/src/e2e-test/resources/pluginParameters.properties b/src/e2e-test/resources/pluginParameters.properties
index ace724ffb4..4edc2a2559 100644
--- a/src/e2e-test/resources/pluginParameters.properties
+++ b/src/e2e-test/resources/pluginParameters.properties
@@ -226,9 +226,10 @@ TableKeyDedupe=Name
 Directive_Drop=testdata/BigQuery/test_diffschema_record-cdap-data-pipeline.json
 bqUpsertDedupeFile=testdata/BigQuery/BQUpsertDedupeFile
 bqDifferentRecordFile=testdata/BigQuery/BQDifferentRecordNameFile
-bqDateExpectedFile=testdata/BigQuery/BQTimeStampFile
+bqDateExpectedFile=testdata/BigQuery/BQDateFile
 bqDateTimeExpectedFile=testdata/BigQuery/BQDateTimeFile
 bqTimeStampExpectedFile=testdata/BigQuery/BQTimeStampFile
+bqPartitionFieldDate=transaction_date
 ## BIGQUERY-PLUGIN-PROPERTIES-END
 
 ## PUBSUBSINK-PLUGIN-PROPERTIES-START