NIFI-16053 Refactored Get/PutSmbFile to use SmbClientProviderService - #11542
Open
turcsanyip wants to merge 3 commits into
Open
NIFI-16053 Refactored Get/PutSmbFile to use SmbClientProviderService#11542turcsanyip wants to merge 3 commits into
turcsanyip wants to merge 3 commits into
Conversation
tpalfy
reviewed
Aug 24, 2026
Comment on lines
135
to
164
| @Test | ||
| public void testNonRecurse() { | ||
| testRunner.setProperty(GetSmbFile.RECURSE, "false"); | ||
| String subdir = DIRECTORY + "\\subdir1"; | ||
| mockDir(DIRECTORY, List.of( | ||
| mockFile(DIRECTORY, "file1.txt", "abc"), | ||
| mockFile(DIRECTORY, "file2.txt", "abc"), | ||
| mockDir(subdir, List.of(mockFile(subdir, "file3.txt", "abc"))) | ||
| )); | ||
|
|
||
| mockListing( | ||
| fileEntity(DIRECTORY, "file1.txt"), | ||
| fileEntity(DIRECTORY, "file2.txt") | ||
| ); | ||
| testRunner.run(); | ||
| verifyOpenFile(DIRECTORY, "file1.txt", 1); | ||
| verifyOpenFile(DIRECTORY, "file2.txt", 1); | ||
| verifyOpenFile(subdir, "file3.txt", 0); | ||
| verifyReadFile(DIRECTORY, "file1.txt", 1); | ||
| verifyReadFile(DIRECTORY, "file2.txt", 1); | ||
| verifyReadFile(subdir, "file3.txt", 0); | ||
| testRunner.assertTransferCount(GetSmbFile.REL_SUCCESS, 2); | ||
| } | ||
|
|
||
| @Test | ||
| public void testRecurse() { | ||
| testRunner.setProperty(GetSmbFile.RECURSE, "true"); | ||
| String subdir = DIRECTORY + "\\subdir1"; | ||
| mockDir(DIRECTORY, List.of( | ||
| mockFile(DIRECTORY, "file1.txt", "abc"), | ||
| mockFile(DIRECTORY, "file2.txt", "abc"), | ||
| mockDir(subdir, List.of(mockFile(subdir, "file3.txt", "abc"))) | ||
| ) | ||
| mockListing( | ||
| fileEntity(DIRECTORY, "file1.txt"), | ||
| fileEntity(DIRECTORY, "file2.txt"), | ||
| fileEntity(subdir, "file3.txt") | ||
| ); | ||
|
|
||
| testRunner.run(); | ||
| verifyOpenFile(DIRECTORY, "file1.txt", 1); | ||
| verifyOpenFile(DIRECTORY, "file2.txt", 1); | ||
| verifyOpenFile(subdir, "file3.txt", 1); | ||
| verifyReadFile(DIRECTORY, "file1.txt", 1); | ||
| verifyReadFile(DIRECTORY, "file2.txt", 1); | ||
| verifyReadFile(subdir, "file3.txt", 1); | ||
| testRunner.assertTransferCount(GetSmbFile.REL_SUCCESS, 3); | ||
| } |
Contributor
There was a problem hiding this comment.
These tests don't really test the corresponding behaviour after the refactor.
I suggest something like this instead:
@ParameterizedTest
@ValueSource(booleans = {true, false})
public void testRecursePropertyForwardedToListFiles(final boolean recurse) {
testRunner.setProperty(GetSmbFile.RECURSE, Boolean.toString(recurse));
mockListing(
fileEntity(DIRECTORY, "file1.txt"),
fileEntity(DIRECTORY, "file2.txt")
);
testRunner.run();
verify(clientService).listFiles(anyString(), eq(recurse));
verifyReadFile(DIRECTORY, "file1.txt", 1);
verifyReadFile(DIRECTORY, "file2.txt", 1);
testRunner.assertTransferCount(GetSmbFile.REL_SUCCESS, 2);
}
Comment on lines
61
to
64
Contributor
There was a problem hiding this comment.
ensureDirectory doesn't check share.fileExists but share. folderExists instead
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
NIFI-16053
Tracking
Please complete the following tracking steps prior to pull request creation.
Issue Tracking
Pull Request Tracking
NIFI-00000NIFI-00000VerifiedstatusPull Request Formatting
mainbranchVerification
Please indicate the verification steps performed prior to pull request creation.
Build
./mvnw clean install -P contrib-checkLicensing
LICENSEandNOTICEfilesDocumentation