You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@daffodil.apache.org by GitBox <gi...@apache.org> on 2018/07/16 13:59:53 UTC
[GitHub] stevedlawrence commented on a change in pull request #80: added a
layer transform that swaps bytes within an array of 32 bit words
stevedlawrence commented on a change in pull request #80: added a layer transform that swaps bytes within an array of 32 bit words
URL: https://github.com/apache/incubator-daffodil/pull/80#discussion_r202673710
##########
File path: daffodil-core/src/test/scala/org/apache/daffodil/layers/TestLayers.scala
##########
@@ -358,4 +358,65 @@ a few lines of pointless text like this.""".replace("\n", " ")
val areTracing = false
TestUtils.testUnparsing(sch, infoset, data, areTracing)
}
+
+ val le32BitData = Array[Byte](0x01, // BE MSBF
+ 0x43, 0x33, 0x33, 0x32, // fourbyteswap + LE LSBF (parsed right to left four bytes at a time)
+ 0x55, 0x54, // fourbyteswap + LE LSBF
+ 0x67) // BE MSBF
+
+ val le32BitSchema =
+ SchemaUtils.dfdlTestSchema(
+ <dfdl:format ref="tns:GeneralFormat" bitOrder="leastSignificantBitFirst"
+ byteOrder="littleEndian" alignmentUnits="bits" alignment="1"
+ lengthKind="explicit" lengthUnits="bits"/>,
+ <xs:element name="e1" dfdl:lengthKind="implicit">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="s0" type="xs:hexBinary" dfdl:length="4" dfdl:byteOrder="bigEndian" dfdl:bitOrder="mostSignificantBitFirst"/>
+ <xs:element name="s1" type="xs:hexBinary" dfdl:length="4" dfdl:byteOrder="bigEndian" dfdl:bitOrder="mostSignificantBitFirst"/>
+ <xs:sequence dfdl:layerTransform="fourbyteswap" dfdl:layerLengthKind="explicit" dfdl:layerLengthUnits="bytes" dfdl:layerLength="6">
+ <xs:sequence>
+ <xs:element name="s2" type="xs:hexBinary" dfdl:length="4"/>
+ <xs:element name="s3" type="xs:hexBinary" dfdl:length="24"/>
+ <xs:element name="s4" type="xs:hexBinary" dfdl:length="8"/>
+ <xs:element name="s5" type="xs:hexBinary" dfdl:length="12"/>
+ </xs:sequence>
+ </xs:sequence>
+ <xs:element name="s6" type="xs:hexBinary" dfdl:length="4" dfdl:byteOrder="bigEndian" dfdl:bitOrder="mostSignificantBitFirst"/>
+ <xs:element name="s7" type="xs:hexBinary" dfdl:length="4" dfdl:byteOrder="bigEndian" dfdl:bitOrder="mostSignificantBitFirst"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>, elementFormDefault = "qualified")
+ /*
+ val le32BitSchema =
+ SchemaUtils.dfdlTestSchema(
+ <dfdl:format ref="tns:GeneralFormat" bitOrder="leastSignificantBitFirst"
+ byteOrder="littleEndian" alignmentUnits="bits" alignment="1"
+ lengthKind="explicit" lengthUnits="bits"/>,
+ <xs:element name="e1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:sequence dfdl:layerTransform="fourbyteswap" dfdl:layerLengthKind="explicit" dfdl:layerLengthUnits="bytes" dfdl:layerLength="6">
+ <xs:sequence>
+ <xs:element name="s2" type="xs:hexBinary" dfdl:length="4"/>
+ <xs:element name="s3" type="xs:hexBinary" dfdl:length="24"/>
+ <xs:element name="s4" type="xs:hexBinary" dfdl:length="8"/>
+ <xs:element name="s5" type="xs:hexBinary" dfdl:length="4"/>
+ </xs:sequence>
+ </xs:sequence>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>, elementFormDefault = "qualified")
+ */
+
+ @Test def testFourByteSwapLayer() {
+ val sch = le32BitSchema
+ val data = le32BitData
+ val infoset = <e1 xmlns={ example }><s0>00</s0><s1>01</s1><s2>02</s2><s3>333333</s3><s4>44</s4><s5>0555</s5><s6>06</s6><s7>07</s7></e1>
Review comment:
Can you wrap and indent this XML? Just makes it easier to read tests. Scala is fine with multiline XML.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services