e2e BQ test scenarios Validation step for Existing Table

Author: priyabhatnagar25

src/e2e-test/features/bigquery/source/BigQueryToBigQuery.feature

@@ -301,7 +301,7 @@ Feature: BigQuery source - Verification of BigQuery to BigQuery successful data
     Then Wait till pipeline is in running state
     Then Open and capture logs
     Then Verify the pipeline status is "Succeeded"
-    Then Validate The Data From BQ To BQ With Actual And Expected File for: "bqexpectedfile"
+    Then Validate the data transferred from BQ to BQ with actual And expected file for: "bqexpectedfile"
 
   @BQ_EXISTING_SOURCE_TEST @BQ_SINK_TEST
   Scenario: Validate successful record transfer from BigQuery source(existing table) without clicking on the validate button of BigQuery source to BigQuery sink(new table)

src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/BQValidationExistingTables.java

@@ -20,6 +20,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * BigQuery Plugin Existing Table validation.
+ */
 public class BQValidationExistingTables {
 
   private static final Logger LOG = LoggerFactory.getLogger(BQValidationExistingTables.class);
@@ -28,10 +31,10 @@ public static boolean validateActualDataToExpectedData(String table, String file
     InterruptedException, URISyntaxException {
     Map<String, JsonObject> bigQueryMap = new HashMap<>();
     Map<String, JsonObject> fileMap = new HashMap<>();
-    Path importexpectedfile = Paths.get(BQValidationExistingTables.class.getResource("/" + fileName).toURI());
+    Path importbqexpectedfile = Paths.get(BQValidationExistingTables.class.getResource("/" + fileName).toURI());
 
     getBigQueryTableData(table, bigQueryMap);
-    getFileData(importexpectedfile.toString(), fileMap);
+    getFileData(importbqexpectedfile.toString(), fileMap);
 
     boolean isMatched = matchJsonMaps(bigQueryMap, fileMap);
 
@@ -58,6 +61,7 @@ public static void getFileData(String fileName, Map<String, JsonObject> fileMap)
       System.err.println("Error reading the file: " + e.getMessage());
     }
   }
+
   private static void getBigQueryTableData(String targetTable, Map<String, JsonObject> bigQueryMap)
     throws IOException, InterruptedException {
     String dataset = PluginPropertyUtils.pluginProp("dataset");
@@ -89,11 +93,11 @@ private static String getIdKey(JsonObject json) {
     if (json.has("ID")) {
       return "ID";
     } else if (json.has("Name")) {
-      return "ID";
+      return "Name";
     } else if (json.has("Price")) {
-      return "Age";
+      return "Price";
     } else if (json.has("Customer_Exists")) {
-      return "Customer_id";
+      return "Customer_Exists";
     } else {
       return null;
     }

src/e2e-test/java/io/cdap/plugin/bigquery/stepsdesign/BigQuerySource.java

@@ -162,7 +162,7 @@ public void enterBigQuerySourcePropertyTableNameAsView() {
     CdfBigQueryPropertiesActions.enterBigQueryTable(TestSetupHooks.bqSourceView);
   }
 
-  @Then("Validate The Data From BQ To BQ With Actual And Expected File for: {string}")
+  @Then("Validate the data transferred from BQ to BQ with actual And expected file for: {string}")
   public void validateTheDataFromBQToBQWithActualAndExpectedFileFor(String expectedFile) throws IOException,
     InterruptedException, URISyntaxException {
     boolean recordsMatched = BQValidationExistingTables.validateActualDataToExpectedData(