tpalfy commented on code in PR #8348:
URL: https://github.com/apache/nifi/pull/8348#discussion_r1478561674
##########
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestListS3.java:
##########
@@ -627,4 +643,110 @@ public void testNoTrackingList() {
runner.assertAllFlowFilesTransferred(ListS3.REL_SUCCESS, 3);
runner.getStateManager().assertStateEquals(ListS3.CURRENT_TIMESTAMP,
null, Scope.CLUSTER);
}
+
+ @Test
+ void testResetTimestampTrackingWhenPrefixModified() throws Exception {
+ setUpResetTrackingTest(ListS3.BY_TIMESTAMPS);
+
+ assertFalse(listS3.isResetTracking());
+
+ runner.run();
+
+ assertEquals(TEST_TIMESTAMP,
listS3.getListingSnapshot().getTimestamp());
+
+ runner.setProperty(ListS3.PREFIX, "prefix2");
+
+ assertTrue(listS3.isResetTracking());
+
+ runner.run();
+
+ assertEquals(0, listS3.getListingSnapshot().getTimestamp());
+ mockStateManager.assertStateEquals(ListS3.CURRENT_TIMESTAMP, "0",
Scope.CLUSTER);
+
+ assertFalse(listS3.isResetTracking());
+ }
+
Review Comment:
```suggestion
@Test
void testResetTimestampTrackingWhenBucketModified() throws Exception {
setUpResetTrackingTest(ListS3.BY_TIMESTAMPS);
assertFalse(listS3.isResetTracking());
runner.run();
assertEquals(TEST_TIMESTAMP,
listS3.getListingSnapshot().getTimestamp());
runner.setProperty(ListS3.BUCKET_WITHOUT_DEFAULT_VALUE,
"otherBucket");
assertTrue(listS3.isResetTracking());
runner.run();
assertEquals(0, listS3.getListingSnapshot().getTimestamp());
mockStateManager.assertStateEquals(ListS3.CURRENT_TIMESTAMP, "0",
Scope.CLUSTER);
assertFalse(listS3.isResetTracking());
}
@Test
void testResetTimestampTrackingWhenRegionModified() throws Exception {
setUpResetTrackingTest(ListS3.BY_TIMESTAMPS);
assertFalse(listS3.isResetTracking());
runner.run();
assertEquals(TEST_TIMESTAMP,
listS3.getListingSnapshot().getTimestamp());
runner.setProperty(ListS3.REGION, Regions.values()[0].getName());
assertTrue(listS3.isResetTracking());
runner.run();
assertEquals(0, listS3.getListingSnapshot().getTimestamp());
mockStateManager.assertStateEquals(ListS3.CURRENT_TIMESTAMP, "0",
Scope.CLUSTER);
assertFalse(listS3.isResetTracking());
}
```
##########
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestListS3.java:
##########
@@ -627,4 +643,110 @@ public void testNoTrackingList() {
runner.assertAllFlowFilesTransferred(ListS3.REL_SUCCESS, 3);
runner.getStateManager().assertStateEquals(ListS3.CURRENT_TIMESTAMP,
null, Scope.CLUSTER);
}
+
+ @Test
+ void testResetTimestampTrackingWhenPrefixModified() throws Exception {
+ setUpResetTrackingTest(ListS3.BY_TIMESTAMPS);
+
+ assertFalse(listS3.isResetTracking());
+
+ runner.run();
+
+ assertEquals(TEST_TIMESTAMP,
listS3.getListingSnapshot().getTimestamp());
+
+ runner.setProperty(ListS3.PREFIX, "prefix2");
+
+ assertTrue(listS3.isResetTracking());
+
+ runner.run();
+
+ assertEquals(0, listS3.getListingSnapshot().getTimestamp());
+ mockStateManager.assertStateEquals(ListS3.CURRENT_TIMESTAMP, "0",
Scope.CLUSTER);
+
+ assertFalse(listS3.isResetTracking());
+ }
+
+ @Test
+ void testResetTimestampTrackingWhenStrategyModified() throws Exception {
+ setUpResetTrackingTest(ListS3.BY_TIMESTAMPS);
+
+ assertFalse(listS3.isResetTracking());
+
+ runner.run();
+
+ assertEquals(TEST_TIMESTAMP,
listS3.getListingSnapshot().getTimestamp());
+
+ runner.setProperty(ListS3.LISTING_STRATEGY, ListS3.NO_TRACKING);
+
+ assertTrue(listS3.isResetTracking());
+
+ runner.run();
+
+ assertEquals(0, listS3.getListingSnapshot().getTimestamp());
+ mockStateManager.assertStateNotSet(ListS3.CURRENT_TIMESTAMP,
Scope.CLUSTER);
+
+ assertFalse(listS3.isResetTracking());
+ }
+
+ @Test
+ void testResetEntityTrackingWhenPrefixModified() throws Exception {
+ setUpResetTrackingTest(ListS3.BY_ENTITIES);
+
+ assertFalse(listS3.isResetTracking());
+
+ runner.run();
+
+ assertNotNull(listS3.getListedEntityTracker());
+
+ runner.setProperty(ListS3.PREFIX, "prefix2");
+
+ assertTrue(listS3.isResetTracking());
+
+ runner.run();
+
+ assertNotNull(listS3.getListedEntityTracker());
+ verify(mockCache).remove(eq("ListedEntities::" +
listS3.getIdentifier()), any());
+
+ assertFalse(listS3.isResetTracking());
+ }
+
Review Comment:
```suggestion
@Test
void testResetEntityTrackingWhenBucketModified() throws Exception {
setUpResetTrackingTest(ListS3.BY_ENTITIES);
assertFalse(listS3.isResetTracking());
runner.run();
assertNotNull(listS3.getListedEntityTracker());
runner.setProperty(ListS3.BUCKET_WITHOUT_DEFAULT_VALUE,
"otherBucket");
assertTrue(listS3.isResetTracking());
runner.run();
assertNotNull(listS3.getListedEntityTracker());
verify(mockCache).remove(eq("ListedEntities::" +
listS3.getIdentifier()), any());
assertFalse(listS3.isResetTracking());
}
@Test
void testResetEntityTrackingWhenRegionModified() throws Exception {
setUpResetTrackingTest(ListS3.BY_ENTITIES);
assertFalse(listS3.isResetTracking());
runner.run();
assertNotNull(listS3.getListedEntityTracker());
runner.setProperty(ListS3.REGION, Regions.values()[0].getName());
assertTrue(listS3.isResetTracking());
runner.run();
assertNotNull(listS3.getListedEntityTracker());
verify(mockCache).remove(eq("ListedEntities::" +
listS3.getIdentifier()), any());
assertFalse(listS3.isResetTracking());
}
```
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
