Skip to content

Commit 5983e75

Browse files
committed
FBP-233. Assertions that format is preserved
1 parent c222266 commit 5983e75

File tree

6 files changed

+22
-4
lines changed

6 files changed

+22
-4
lines changed

activiti-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/ActivitiParser.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,10 @@ class ActivitiParser : BpmnParser {
168168

169169
val format = OutputFormat.createPrettyPrint()
170170
format.isPadText = false
171-
format.isNewLineAfterDeclaration = false
171+
format.isNewLineAfterDeclaration = true
172172
format.isTrimText = false
173+
format.isNewlines = false
174+
format.isExpandEmptyElements = false
173175
val writer = XMLWriter(os, format)
174176
writer.write(doc)
175177
}

activiti-xml-parser/src/test/kotlin/com/valb3r/bpmn/intellij/plugin/activiti/parser/XmlUpdateEventDocumentationFormatTest.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ class XmlUpdateEventDocumentationFormatTest {
1515

1616
private val parser = ActivitiParser()
1717

18+
@Test
19+
fun `Parsing respects newline formatting`() {
20+
val originalProcess = documentationProcessName.asResource()!!
21+
val updated = parser.update(documentationProcessName.asResource()!!, listOf())
22+
originalProcess.count { it == '\n' }.shouldBeEqualTo(updated.count { it == '\n' })
23+
}
24+
1825
@Test
1926
fun `Removing element does not break 'documentation' element formatting`() {
2027
val originalProcess = readProcess()

activiti-xml-parser/src/test/resources/documentation-element-formatting.bpmn20.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ log.info("${testMap}")]]></script>
3838
</bpmndi:BPMNEdge>
3939
</bpmndi:BPMNPlane>
4040
</bpmndi:BPMNDiagram>
41-
</definitions>
41+
</definitions>

flowable-xml-parser/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/FlowableParser.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,10 @@ class FlowableParser : BpmnParser {
176176

177177
val format = OutputFormat.createPrettyPrint()
178178
format.isPadText = false
179-
format.isNewLineAfterDeclaration = false
179+
format.isNewLineAfterDeclaration = true
180180
format.isTrimText = false
181+
format.isNewlines = false
182+
format.isExpandEmptyElements = false
181183
val writer = XMLWriter(os, format)
182184
writer.write(doc)
183185
}

flowable-xml-parser/src/test/kotlin/com/valb3r/bpmn/intellij/plugin/flowable/parser/XmlUpdateEventDocumentationFormatTest.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ class XmlUpdateEventDocumentationFormatTest {
1515

1616
private val parser = FlowableParser()
1717

18+
@Test
19+
fun `Parsing respects newline formatting`() {
20+
val originalProcess = documentationProcessName.asResource()!!
21+
val updated = parser.update(documentationProcessName.asResource()!!, listOf())
22+
originalProcess.count { it == '\n' }.shouldBeEqualTo(updated.count { it == '\n' })
23+
}
24+
1825
@Test
1926
fun `Removing element does not break 'documentation' element formatting`() {
2027
val originalProcess = readProcess()

flowable-xml-parser/src/test/resources/documentation-element-formatting.bpmn20.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ log.info("${testMap}")]]></script>
3838
</bpmndi:BPMNEdge>
3939
</bpmndi:BPMNPlane>
4040
</bpmndi:BPMNDiagram>
41-
</definitions>
41+
</definitions>

0 commit comments

Comments
 (0)