You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by GitBox <gi...@apache.org> on 2020/05/18 21:23:58 UTC
[GitHub] [nifi] turcsanyip commented on a change in pull request #4272: NIFI-7336: Add tests for DeleteAzureDataLakeStorage
turcsanyip commented on a change in pull request #4272:
URL: https://github.com/apache/nifi/pull/4272#discussion_r426894009
##########
File path: nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITDeleteAzureDataLakeStorage.java
##########
@@ -16,44 +16,388 @@
*/
package org.apache.nifi.processors.azure.storage;
+import com.azure.storage.file.datalake.DataLakeDirectoryClient;
+import com.azure.storage.file.datalake.DataLakeFileClient;
+import com.azure.storage.file.datalake.models.DataLakeStorageException;
import org.apache.nifi.processor.Processor;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.provenance.ProvenanceEventType;
import org.apache.nifi.util.MockFlowFile;
-import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
-import java.util.List;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
-public class ITDeleteAzureDataLakeStorage extends AbstractAzureBlobStorageIT {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class ITDeleteAzureDataLakeStorage extends AbstractAzureDataLakeStorageIT {
@Override
protected Class<? extends Processor> getProcessorClass() {
return DeleteAzureDataLakeStorage.class;
}
- @Before
- public void setUp() {
- runner.setProperty(DeleteAzureDataLakeStorage.FILE, TEST_FILE_NAME);
+ @Test
+ public void testDeleteFileFromRoot() {
+ // GIVEN
+ String directory= "";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ uploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteFileFromDirectory() {
+ // GIVEN
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteFileFromDeepDirectory() {
+ // GIVEN
+ String directory= "Directory01/Directory02/Directory03/Directory04/Directory05/Directory06/Directory07/"
+ + "Directory08/Directory09/Directory10/Directory11/Directory12/Directory13/Directory14/Directory15/"
+ + "Directory16/Directory17/Directory18/Directory19/Directory20/TestDirectory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteFileWithWhitespaceInFilename() {
+ // GIVEN
+ String directory= "TestDirectory";
+ String filename = "A test file.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteFileWithWhitespaceInDirectoryName() {
+ // GIVEN
+ String directory= "A Test Directory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteEmptyDirectory() {
+ // GIVEN
+ String parentDirectory = "ParentDirectory";
+ String childDirectory = "ChildDirectory";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ fileSystemClient.createDirectory(parentDirectory + "/" + childDirectory);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, parentDirectory, childDirectory, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteFileCaseSensitiveFilename() {
+ // GIVEN
+ String directory = "TestDirectory";
+ String filename1 = "testFile.txt";
+ String filename2 = "testfile.txt";
+ String fileContent1 = "ContentOfFile1";
+ String fileContent2 = "ContentOfFile2";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename1, fileContent1);
+ createDirectoryAndUploadFile(directory, filename2, fileContent2);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename1, inputFlowFileContent, inputFlowFileContent);
+ assertTrue(fileExists(directory, filename2));
+ }
+
+ @Test
+ public void testDeleteUsingExpressionLanguage() {
+ // GIVEN
+ String expLangFileSystem = "az.filesystem";
+ String expLangDirectory = "az.directory";
+ String expLangFilename = "az.filename";
+
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ Map<String, String> attributes = new HashMap<>();
+ attributes.put(expLangFileSystem, fileSystemName);
+ attributes.put(expLangDirectory, directory);
+ attributes.put(expLangFilename, filename);
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDeleteWithExpressionLanguage("${" + expLangFileSystem + "}",
+ "${" + expLangDirectory + "}",
+ "${" + expLangFilename + "}",
+ attributes,
+ inputFlowFileContent,
+ inputFlowFileContent,
+ directory,
+ filename);
+ }
+
+ @Test
+ public void testFetchUsingExpressionLanguageFileSystemIsNotSpecified() {
Review comment:
Typo: testDelete (also the next method)
##########
File path: nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITDeleteAzureDataLakeStorage.java
##########
@@ -16,44 +16,388 @@
*/
package org.apache.nifi.processors.azure.storage;
+import com.azure.storage.file.datalake.DataLakeDirectoryClient;
+import com.azure.storage.file.datalake.DataLakeFileClient;
+import com.azure.storage.file.datalake.models.DataLakeStorageException;
import org.apache.nifi.processor.Processor;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.provenance.ProvenanceEventType;
import org.apache.nifi.util.MockFlowFile;
-import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
-import java.util.List;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
-public class ITDeleteAzureDataLakeStorage extends AbstractAzureBlobStorageIT {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class ITDeleteAzureDataLakeStorage extends AbstractAzureDataLakeStorageIT {
@Override
protected Class<? extends Processor> getProcessorClass() {
return DeleteAzureDataLakeStorage.class;
}
- @Before
- public void setUp() {
- runner.setProperty(DeleteAzureDataLakeStorage.FILE, TEST_FILE_NAME);
+ @Test
+ public void testDeleteFileFromRoot() {
+ // GIVEN
+ String directory= "";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ uploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteFileFromDirectory() {
+ // GIVEN
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteFileFromDeepDirectory() {
+ // GIVEN
+ String directory= "Directory01/Directory02/Directory03/Directory04/Directory05/Directory06/Directory07/"
+ + "Directory08/Directory09/Directory10/Directory11/Directory12/Directory13/Directory14/Directory15/"
+ + "Directory16/Directory17/Directory18/Directory19/Directory20/TestDirectory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteFileWithWhitespaceInFilename() {
+ // GIVEN
+ String directory= "TestDirectory";
+ String filename = "A test file.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteFileWithWhitespaceInDirectoryName() {
+ // GIVEN
+ String directory= "A Test Directory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteEmptyDirectory() {
+ // GIVEN
+ String parentDirectory = "ParentDirectory";
+ String childDirectory = "ChildDirectory";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ fileSystemClient.createDirectory(parentDirectory + "/" + childDirectory);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, parentDirectory, childDirectory, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteFileCaseSensitiveFilename() {
+ // GIVEN
+ String directory = "TestDirectory";
+ String filename1 = "testFile.txt";
+ String filename2 = "testfile.txt";
+ String fileContent1 = "ContentOfFile1";
+ String fileContent2 = "ContentOfFile2";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename1, fileContent1);
+ createDirectoryAndUploadFile(directory, filename2, fileContent2);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename1, inputFlowFileContent, inputFlowFileContent);
+ assertTrue(fileExists(directory, filename2));
+ }
+
+ @Test
+ public void testDeleteUsingExpressionLanguage() {
+ // GIVEN
+ String expLangFileSystem = "az.filesystem";
+ String expLangDirectory = "az.directory";
+ String expLangFilename = "az.filename";
+
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ Map<String, String> attributes = new HashMap<>();
+ attributes.put(expLangFileSystem, fileSystemName);
+ attributes.put(expLangDirectory, directory);
+ attributes.put(expLangFilename, filename);
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDeleteWithExpressionLanguage("${" + expLangFileSystem + "}",
+ "${" + expLangDirectory + "}",
+ "${" + expLangFilename + "}",
+ attributes,
+ inputFlowFileContent,
+ inputFlowFileContent,
+ directory,
+ filename);
+ }
+
+ @Test
+ public void testFetchUsingExpressionLanguageFileSystemIsNotSpecified() {
+ // GIVEN
+ String expLangFileSystem = "az.filesystem";
+ String expLangDirectory = "az.directory";
+ String expLangFilename = "az.filename";
+
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ Map<String, String> attributes = new HashMap<>();
+ attributes.put(expLangDirectory, directory);
+ attributes.put(expLangFilename, filename);
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testFailedDeleteWithProcessException("${" + expLangFileSystem + "}",
+ "${" + expLangDirectory + "}",
+ "${" + expLangFilename + "}",
+ attributes,
+ inputFlowFileContent,
+ inputFlowFileContent);
+ assertTrue(fileExists(directory, filename));
+ }
+
+ @Test
+ public void testFetchUsingExpressionLanguageFilenameIsNotSpecified() {
+ // GIVEN
+ String expLangFileSystem = "az.filesystem";
+ String expLangDirectory = "az.directory";
+ String expLangFilename = "az.filename";
+
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+
+ String inputFlowFileContent = "InputFlowFileContent";
+ Map<String, String> attributes = new HashMap<>();
+ attributes.put(expLangFileSystem, fileSystemName);
+ attributes.put(expLangDirectory, directory);
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testFailedDeleteWithProcessException("${" + expLangFileSystem + "}",
+ "${" + expLangDirectory + "}",
+ "${" + expLangFilename + "}",
+ attributes,
+ inputFlowFileContent,
+ inputFlowFileContent);
+ assertTrue(fileExists(directory, filename));
+ }
+
+ @Test
+ public void testDeleteNonExistentFile() {
+ // GIVEN
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ fileSystemClient.createDirectory(directory);
+
+ // WHEN
+ // THEN
+ testFailedDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent, 404);
+ assertTrue(fileExists("", directory));
+ }
+
+ @Test
+ public void testDeleteFileFromNonExistentDirectory() {
+ // GIVEN
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ // WHEN
+ // THEN
+ testFailedDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent, 404);
}
- @Ignore
@Test
- public void testDeleteFile() throws Exception {
+ public void testDeleteFileFromNonExistentFileSystem() {
+ // GIVEN
+ String fileSystem = "NonExistentFileSystem";
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ // WHEN
+ // THEN
+ testFailedDelete(fileSystem, directory, filename, inputFlowFileContent, inputFlowFileContent, 400);
+ }
+
+ @Test
+ public void testDeleteNonemptyDirectory() {
+ // GIVEN
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ testFailedDelete(fileSystemName, "", directory, inputFlowFileContent, inputFlowFileContent, 409);
+ assertTrue(fileExists(directory, filename));
+ }
+
+ @Test
+ public void testDeleteFileWithInvalidFilename() {
+ // GIVEN
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String invalidFilename = "test/\\File.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testFailedDelete(fileSystemName, directory, invalidFilename, inputFlowFileContent, inputFlowFileContent, 400);
+ assertTrue(fileExists(directory, filename));
+ }
+
+ private void testSuccessfulDelete(String fileSystem, String directory, String filename, String inputFlowFileContent, String expectedFlowFileContent) {
+ testSuccessfulDeleteWithExpressionLanguage(fileSystem, directory, filename, Collections.emptyMap(), inputFlowFileContent, expectedFlowFileContent,
+ directory, filename);
+ }
+
+ private void testSuccessfulDeleteWithExpressionLanguage(String expLangFileSystem, String expLangDirectory, String expLangFilename, Map<String, String> attributes,
+ String inputFlowFileContent, String expectedFlowFileContent, String directory, String filename) {
+ // GIVEN
+ int expectedNumberOfProvenanceEvents = 1;
+ ProvenanceEventType expectedEventType = ProvenanceEventType.REMOTE_INVOCATION;
+
+ setRunnerProperties(expLangFileSystem, expLangDirectory, expLangFilename);
+
+ // WHEN
+ startRunner(inputFlowFileContent, attributes);
+
+ // THEN
+ assertSuccess(directory, filename, expectedFlowFileContent, expectedNumberOfProvenanceEvents, expectedEventType);
+ }
+
+ private void testFailedDelete(String fileSystem, String directory, String filename, String inputFlowFileContent, String expectedFlowFileContent, int expectedErrorCode) {
+ // GIVEN
+ setRunnerProperties(fileSystem, directory, filename);
+
+ // WHEN
+ startRunner(inputFlowFileContent, Collections.emptyMap());
+
+ // THEN
+ DataLakeStorageException e = (DataLakeStorageException)runner.getLogger().getErrorMessages().get(0).getThrowable();
+ assertEquals(expectedErrorCode, e.getStatusCode());
+
+ assertFailure(expectedFlowFileContent);
+ }
+
+ private void testFailedDeleteWithProcessException(String fileSystem, String directory, String filename, Map<String, String> attributes,
+ String inputFlowFileContent, String expectedFlowFileContent) {
Review comment:
Wrong indentation.
##########
File path: nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/test/java/org/apache/nifi/processors/azure/storage/ITDeleteAzureDataLakeStorage.java
##########
@@ -16,44 +16,388 @@
*/
package org.apache.nifi.processors.azure.storage;
+import com.azure.storage.file.datalake.DataLakeDirectoryClient;
+import com.azure.storage.file.datalake.DataLakeFileClient;
+import com.azure.storage.file.datalake.models.DataLakeStorageException;
import org.apache.nifi.processor.Processor;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.provenance.ProvenanceEventType;
import org.apache.nifi.util.MockFlowFile;
-import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
-import java.util.List;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
-public class ITDeleteAzureDataLakeStorage extends AbstractAzureBlobStorageIT {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class ITDeleteAzureDataLakeStorage extends AbstractAzureDataLakeStorageIT {
@Override
protected Class<? extends Processor> getProcessorClass() {
return DeleteAzureDataLakeStorage.class;
}
- @Before
- public void setUp() {
- runner.setProperty(DeleteAzureDataLakeStorage.FILE, TEST_FILE_NAME);
+ @Test
+ public void testDeleteFileFromRoot() {
+ // GIVEN
+ String directory= "";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ uploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteFileFromDirectory() {
+ // GIVEN
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteFileFromDeepDirectory() {
+ // GIVEN
+ String directory= "Directory01/Directory02/Directory03/Directory04/Directory05/Directory06/Directory07/"
+ + "Directory08/Directory09/Directory10/Directory11/Directory12/Directory13/Directory14/Directory15/"
+ + "Directory16/Directory17/Directory18/Directory19/Directory20/TestDirectory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteFileWithWhitespaceInFilename() {
+ // GIVEN
+ String directory= "TestDirectory";
+ String filename = "A test file.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteFileWithWhitespaceInDirectoryName() {
+ // GIVEN
+ String directory= "A Test Directory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteEmptyDirectory() {
+ // GIVEN
+ String parentDirectory = "ParentDirectory";
+ String childDirectory = "ChildDirectory";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ fileSystemClient.createDirectory(parentDirectory + "/" + childDirectory);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, parentDirectory, childDirectory, inputFlowFileContent, inputFlowFileContent);
+ }
+
+ @Test
+ public void testDeleteFileCaseSensitiveFilename() {
+ // GIVEN
+ String directory = "TestDirectory";
+ String filename1 = "testFile.txt";
+ String filename2 = "testfile.txt";
+ String fileContent1 = "ContentOfFile1";
+ String fileContent2 = "ContentOfFile2";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ createDirectoryAndUploadFile(directory, filename1, fileContent1);
+ createDirectoryAndUploadFile(directory, filename2, fileContent2);
+
+ // WHEN
+ // THEN
+ testSuccessfulDelete(fileSystemName, directory, filename1, inputFlowFileContent, inputFlowFileContent);
+ assertTrue(fileExists(directory, filename2));
+ }
+
+ @Test
+ public void testDeleteUsingExpressionLanguage() {
+ // GIVEN
+ String expLangFileSystem = "az.filesystem";
+ String expLangDirectory = "az.directory";
+ String expLangFilename = "az.filename";
+
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ Map<String, String> attributes = new HashMap<>();
+ attributes.put(expLangFileSystem, fileSystemName);
+ attributes.put(expLangDirectory, directory);
+ attributes.put(expLangFilename, filename);
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testSuccessfulDeleteWithExpressionLanguage("${" + expLangFileSystem + "}",
+ "${" + expLangDirectory + "}",
+ "${" + expLangFilename + "}",
+ attributes,
+ inputFlowFileContent,
+ inputFlowFileContent,
+ directory,
+ filename);
+ }
+
+ @Test
+ public void testFetchUsingExpressionLanguageFileSystemIsNotSpecified() {
+ // GIVEN
+ String expLangFileSystem = "az.filesystem";
+ String expLangDirectory = "az.directory";
+ String expLangFilename = "az.filename";
+
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ Map<String, String> attributes = new HashMap<>();
+ attributes.put(expLangDirectory, directory);
+ attributes.put(expLangFilename, filename);
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testFailedDeleteWithProcessException("${" + expLangFileSystem + "}",
+ "${" + expLangDirectory + "}",
+ "${" + expLangFilename + "}",
+ attributes,
+ inputFlowFileContent,
+ inputFlowFileContent);
+ assertTrue(fileExists(directory, filename));
+ }
+
+ @Test
+ public void testFetchUsingExpressionLanguageFilenameIsNotSpecified() {
+ // GIVEN
+ String expLangFileSystem = "az.filesystem";
+ String expLangDirectory = "az.directory";
+ String expLangFilename = "az.filename";
+
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String fileContent = "AzureFileContent";
+
+ String inputFlowFileContent = "InputFlowFileContent";
+ Map<String, String> attributes = new HashMap<>();
+ attributes.put(expLangFileSystem, fileSystemName);
+ attributes.put(expLangDirectory, directory);
+
+ createDirectoryAndUploadFile(directory, filename, fileContent);
+
+ // WHEN
+ // THEN
+ testFailedDeleteWithProcessException("${" + expLangFileSystem + "}",
+ "${" + expLangDirectory + "}",
+ "${" + expLangFilename + "}",
+ attributes,
+ inputFlowFileContent,
+ inputFlowFileContent);
+ assertTrue(fileExists(directory, filename));
+ }
+
+ @Test
+ public void testDeleteNonExistentFile() {
+ // GIVEN
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ fileSystemClient.createDirectory(directory);
+
+ // WHEN
+ // THEN
+ testFailedDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent, 404);
+ assertTrue(fileExists("", directory));
+ }
+
+ @Test
+ public void testDeleteFileFromNonExistentDirectory() {
+ // GIVEN
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ // WHEN
+ // THEN
+ testFailedDelete(fileSystemName, directory, filename, inputFlowFileContent, inputFlowFileContent, 404);
}
- @Ignore
@Test
- public void testDeleteFile() throws Exception {
+ public void testDeleteFileFromNonExistentFileSystem() {
+ // GIVEN
+ String fileSystem = "NonExistentFileSystem";
+ String directory = "TestDirectory";
+ String filename = "testFile.txt";
+ String inputFlowFileContent = "InputFlowFileContent";
+
+ // WHEN
+ // THEN
+ testFailedDelete(fileSystem, directory, filename, inputFlowFileContent, inputFlowFileContent, 400);
+ }
+
+ @Test
+ public void testDeleteNonemptyDirectory() {
Review comment:
Typo: NonEmpty
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org