Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-10967 Corrected TestWriteJsonResult mixed arrays 

Signed-off-by: Matthew Burgess <mattyb149@apache.org>

This closes #6773
This commit is contained in:
exceptionfactory 2022-12-08 22:15:55 -06:00 committed by Matthew Burgess
parent 334c9db9c3
commit b0ab364f61
No known key found for this signature in database
GPG Key ID: 05D3DEB8126DAD24
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/java/org/apache/nifi/json/TestWriteJsonResult.java
View File

@ -34,8 +34,8 @@ import org.apache.nifi.serialization.record.SerializedForm;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.BigInteger; import java.math.BigInteger;
@ -513,9 +513,12 @@ class TestWriteJsonResult {
@Test @Test
void testChoiceArrayOfStringsOrArrayOfRecords() throws IOException { void testChoiceArrayOfStringsOrArrayOfRecords() throws IOException {
final String FILE_LOCATION = "src/test/resources/json/choice-of-array-string-or-array-record.json"; final String jsonFirstItem = "{\"itemData\":[\"test\"]}";
final String jsonSecondItem = "{\"itemData\":[{\"quantity\":10}]}";
final String json = String.format("[{\"items\":[%s,%s]}]", jsonFirstItem, jsonSecondItem);
final JsonSchemaInference jsonSchemaInference = new JsonSchemaInference(new TimeValueInference(null, null, null)); final JsonSchemaInference jsonSchemaInference = new JsonSchemaInference(new TimeValueInference(null, null, null));
final RecordSchema schema = jsonSchemaInference.inferSchema(new JsonRecordSource(new FileInputStream(FILE_LOCATION))); final RecordSchema schema = jsonSchemaInference.inferSchema(new JsonRecordSource(new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8))));
final Map<String, Object> itemData1 = new HashMap<>(); final Map<String, Object> itemData1 = new HashMap<>();
itemData1.put("itemData", new String[]{"test"}); itemData1.put("itemData", new String[]{"test"});
@ -539,7 +542,7 @@ class TestWriteJsonResult {
Record topLevelRecord = new MapRecord(schema, values); Record topLevelRecord = new MapRecord(schema, values);
final ByteArrayOutputStream baos = new ByteArrayOutputStream(); final ByteArrayOutputStream baos = new ByteArrayOutputStream();
try (final WriteJsonResult writer = new WriteJsonResult(Mockito.mock(ComponentLog.class), schema, new SchemaNameAsAttribute(), baos, true, try (final WriteJsonResult writer = new WriteJsonResult(Mockito.mock(ComponentLog.class), schema, new SchemaNameAsAttribute(), baos, false,
NullSuppression.NEVER_SUPPRESS, OutputGrouping.OUTPUT_ARRAY, null, null, null)) { NullSuppression.NEVER_SUPPRESS, OutputGrouping.OUTPUT_ARRAY, null, null, null)) {
writer.beginRecordSet(); writer.beginRecordSet();
writer.writeRecord(topLevelRecord); writer.writeRecord(topLevelRecord);
@ -548,8 +551,7 @@ class TestWriteJsonResult {
final byte[] data = baos.toByteArray(); final byte[] data = baos.toByteArray();
final String expected = new String(Files.readAllBytes(Paths.get(FILE_LOCATION)), StandardCharsets.UTF_8);
final String output = new String(data, StandardCharsets.UTF_8); final String output = new String(data, StandardCharsets.UTF_8);
assertEquals(expected, output); assertEquals(json, output);
} }
} }

9
nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/test/resources/json/choice-of-array-string-or-array-record.json
View File

@ -1,9 +0,0 @@
[ {
"items" : [ {
"itemData" : [ "test" ]
}, {
"itemData" : [ {
"quantity" : 10
} ]
} ]
} ]