From 511d3f95651fca4e664d54ac0a3a388a1810c4ef Mon Sep 17 00:00:00 2001 From: Szabolcs Vasas Date: Tue, 15 Jan 2019 14:14:23 +0100 Subject: [PATCH] S3 is removed from the parameter names in CloudImportJobTestCase. --- .../org/apache/sqoop/cloud/CloudImportJobTestCase.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/org/apache/sqoop/cloud/CloudImportJobTestCase.java b/src/test/org/apache/sqoop/cloud/CloudImportJobTestCase.java index 91d00fa6..5728a60e 100644 --- a/src/test/org/apache/sqoop/cloud/CloudImportJobTestCase.java +++ b/src/test/org/apache/sqoop/cloud/CloudImportJobTestCase.java @@ -170,17 +170,17 @@ protected void insertInputDataIntoTableForMerge(List> inputData) { insertRecordsIntoTableWithColTypesAndNames(dataSet.getColumnNamesForMerge(), dataSet.getColumnTypesForMerge(), inputData); } - protected void failIfOutputFilePathContainingPatternExists(FileSystem s3Client, Path targetDirPath, String pattern) throws IOException { + protected void failIfOutputFilePathContainingPatternExists(FileSystem cloudFileSystem, Path targetDirPath, String pattern) throws IOException { List outputFilesWithPathContainingPattern = FileSystemUtil.findFilesWithPathContainingPattern(targetDirPath, - s3Client.getConf(), pattern); + cloudFileSystem.getConf(), pattern); if (outputFilesWithPathContainingPattern.size() != 0) { fail("No output file was expected with pattern" + pattern); } } - protected void failIfOutputFilePathContainingPatternDoesNotExists(FileSystem s3Client, Path targetDirPath, String pattern) throws IOException { + protected void failIfOutputFilePathContainingPatternDoesNotExists(FileSystem cloudFileSystem, Path targetDirPath, String pattern) throws IOException { List outputFilesWithPathContainingPattern = FileSystemUtil.findFilesWithPathContainingPattern(targetDirPath, - s3Client.getConf(), pattern); + cloudFileSystem.getConf(), pattern); if (outputFilesWithPathContainingPattern.size() == 0) { fail("No output file was found with pattern" + pattern); }