Skip to content

Commit 131f343

Browse files
committed
added cleanup code for gcs resources
1 parent a1a4049 commit 131f343

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

src/e2e-test/java/io/cdap/plugin/common/stepsdesign/TestSetupHooks.java

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,8 @@ public static void createBucketWithAvroTestFile() throws IOException, URISyntaxE
202202
@After(order = 1, value = "@GCS_CSV_TEST or @GCS_TSV_TEST or @GCS_BLOB_TEST " +
203203
"or @GCS_DELIMITED_TEST or @GCS_TEXT_TEST or @GCS_OUTPUT_FIELD_TEST or @GCS_DATATYPE_1_TEST or " +
204204
"@GCS_DATATYPE_2_TEST or @GCS_READ_RECURSIVE_TEST or @GCS_DELETE_WILDCARD_TEST or @GCS_CSV_RANGE_TEST or" +
205-
" @GCS_PARQUET_TEST or @GCS_AVRO_TEST or @GCS_DATATYPE_TEST or @GCS_AVRO_FILE")
205+
" @GCS_PARQUET_TEST or @GCS_AVRO_TEST or @GCS_DATATYPE_TEST or @GCS_AVRO_FILE or @GCS_CSV or " +
206+
"GCS_MULTIPLE_FILES_TEST or GCS_MULTIPLE_FILES_REGEX_TEST")
206207
public static void deleteSourceBucketWithFile() {
207208
deleteGCSBucket(gcsSourceBucketName);
208209
PluginPropertyUtils.removePluginProp("gcsSourceBucketName");
@@ -235,7 +236,7 @@ public static void createTargetGCSBucketWithCSVFile() throws IOException, URISyn
235236
BeforeActions.scenario.write("GCS target bucket name - " + gcsTargetBucketName);
236237
}
237238

238-
@After(order = 1, value = "@GCS_SINK_TEST or @GCS_SINK_EXISTING_BUCKET_TEST")
239+
@After(order = 1, value = "@GCS_SINK_TEST or @GCS_SINK_EXISTING_BUCKET_TEST or @GCS_SINK_MULTI_PART_UPLOAD")
239240
public static void deleteTargetBucketWithFile() {
240241
deleteGCSBucket(gcsTargetBucketName);
241242
PluginPropertyUtils.removePluginProp("gcsTargetBucketName");
@@ -250,7 +251,8 @@ public static void setTempTargetBQTableName() {
250251
BeforeActions.scenario.write("BQ Target table name - " + bqTargetTable);
251252
}
252253

253-
@After(order = 1, value = "@BQ_SINK_TEST")
254+
@After(order = 1, value = "@BQ_SINK_TEST or @BQ_UPSERT_SINK_TEST or @BQ_UPDATE_SINK_DEDUPE_TEST or " +
255+
"@BQ_EXISTING_SINK_TEST or @BQ_UPSERT_DEDUPE_SINK_TEST or @BQ_INSERT_SINK_TEST")
254256
public static void deleteTempTargetBQTable() throws IOException, InterruptedException {
255257
try {
256258
BigQueryClient.dropBqQuery(bqTargetTable);
@@ -294,7 +296,9 @@ public static void createTempSourceBQTable() throws IOException, InterruptedExce
294296

295297
@After(order = 1, value = "@BQ_SOURCE_TEST or @BQ_PARTITIONED_SOURCE_TEST or @BQ_SOURCE_DATATYPE_TEST or " +
296298
"@BQ_INSERT_SOURCE_TEST or @BQ_UPDATE_SINK_TEST or @BQ_EXISTING_SOURCE_TEST or @BQ_EXISTING_SINK_TEST or " +
297-
"@BQ_EXISTING_SOURCE_DATATYPE_TEST or @BQ_EXISTING_SINK_DATATYPE_TEST")
299+
"@BQ_EXISTING_SOURCE_DATATYPE_TEST or @BQ_EXISTING_SINK_DATATYPE_TEST or @BQ_UPSERT_SOURCE_TEST or " +
300+
"@BQ_NULL_MODE_SOURCE_TEST or @BQ_UPDATE_SOURCE_DEDUPE_TEST or @BQ_INSERT_INT_SOURCE_TEST or " +
301+
"@BQ_TIME_SOURCE_TEST or @BQ_UPSERT_DEDUPE_SOURCE_TEST or @BQ_RECORD_SOURCE_TEST")
298302
public static void deleteTempSourceBQTable() throws IOException, InterruptedException {
299303
BigQueryClient.dropBqQuery(bqSourceTable);
300304
PluginPropertyUtils.removePluginProp("bqSourceTable");
@@ -1636,4 +1640,12 @@ public static void deleteTargetBqmtTable() throws IOException, InterruptedExcept
16361640
}
16371641
}
16381642
}
1643+
1644+
@After(order = 1, value = "@BQ_SECOND_RECORD_SOURCE_TEST")
1645+
public static void deleteTempSource2BQTable() throws IOException, InterruptedException {
1646+
BigQueryClient.dropBqQuery(bqSourceTable2);
1647+
PluginPropertyUtils.removePluginProp("bqSourceTable2");
1648+
BeforeActions.scenario.write("BQ source Table " + bqSourceTable2 + " deleted successfully");
1649+
bqSourceTable2 = StringUtils.EMPTY;
1650+
}
16391651
}

0 commit comments

Comments
 (0)