(nifi) branch support/nifi-1.x updated: NIFI-13557 Fixed TestExcelSchemaInference for Single Digit Month

[exceptionfactory]

This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
     new 0fffb0c3e8 NIFI-13557 Fixed TestExcelSchemaInference for Single Digit 
Month
0fffb0c3e8 is described below

commit 0fffb0c3e8a4e697d80bd6f97d8f1d6bddfe0b61
Author: exceptionfactory <exceptionfact...@apache.org>
AuthorDate: Mon Jul 22 15:10:03 2024 -0500

    NIFI-13557 Fixed TestExcelSchemaInference for Single Digit Month
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
 .../java/org/apache/nifi/excel/TestExcelSchemaInference.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelSchemaInference.java
 
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelSchemaInference.java
index 4619f205e3..f2f7d45866 100644
--- 
a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelSchemaInference.java
+++ 
b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-services/src/test/java/org/apache/nifi/excel/TestExcelSchemaInference.java
@@ -109,7 +109,11 @@ public class TestExcelSchemaInference {
                 EXPECTED_THIRD_FIELD_NAME, EXPECTED_FOURTH_FIELD_NAME), 
fieldNames);
         
assertEquals(RecordFieldType.CHOICE.getChoiceDataType(RecordFieldType.INT.getDataType(),
                 RecordFieldType.STRING.getDataType()), 
schema.getDataType(EXPECTED_FIRST_FIELD_NAME).get());
-        
assertEquals(RecordFieldType.CHOICE.getChoiceDataType(RecordFieldType.TIMESTAMP.getDataType("yyyy/MM/dd/
 HH:mm"), RecordFieldType.STRING.getDataType()),
+        assertEquals(RecordFieldType.CHOICE.getChoiceDataType(
+                        RecordFieldType.TIMESTAMP.getDataType("yyyy/MM/dd/ 
HH:mm"),
+                        RecordFieldType.DATE.getDataType("MM/dd/yyyy"),
+                        RecordFieldType.STRING.getDataType()
+                ),
                 schema.getDataType(EXPECTED_SECOND_FIELD_NAME).get());
         assertEquals(RecordFieldType.STRING, 
schema.getDataType(EXPECTED_THIRD_FIELD_NAME).get().getFieldType());
         
assertEquals(RecordFieldType.CHOICE.getChoiceDataType(RecordFieldType.BOOLEAN.getDataType(),
@@ -139,7 +143,11 @@ public class TestExcelSchemaInference {
         assertEquals(Arrays.asList(EXPECTED_FIRST_FIELD_NAME, 
EXPECTED_SECOND_FIELD_NAME,
                 EXPECTED_THIRD_FIELD_NAME, EXPECTED_FOURTH_FIELD_NAME), 
fieldNames);
         assertEquals(RecordFieldType.INT.getDataType(), 
schema.getDataType(EXPECTED_FIRST_FIELD_NAME).get());
-        
assertEquals(RecordFieldType.CHOICE.getChoiceDataType(RecordFieldType.TIMESTAMP.getDataType("yyyy/MM/dd/
 HH:mm"), RecordFieldType.STRING.getDataType()),
+        assertEquals(RecordFieldType.CHOICE.getChoiceDataType(
+                        RecordFieldType.TIMESTAMP.getDataType("yyyy/MM/dd/ 
HH:mm"),
+                        RecordFieldType.DATE.getDataType("MM/dd/yyyy"),
+                        RecordFieldType.STRING.getDataType()
+                ),
                 schema.getDataType(EXPECTED_SECOND_FIELD_NAME).get());
         assertEquals(RecordFieldType.STRING, 
schema.getDataType(EXPECTED_THIRD_FIELD_NAME).get().getFieldType());
         assertEquals(RecordFieldType.BOOLEAN.getDataType(), 
schema.getDataType(EXPECTED_FOURTH_FIELD_NAME).get());