Skip TDML Runner left over data check if negative bit position
The IBM DFDL implementation has no way to report the final bit position
of a parse or unparse, and so just returns -1 for this value to the TDML
runner. The recent deprecation of isAtEnd in favor of bitPos caused this
-1 value to be used by the TDML runner, and think that there was always
left over data This changes the TDML runner so that if the bit position
is negative, then we skip the left over data check in TDML test.
DAFFODIL-2517
diff --git a/daffodil-tdml-lib/src/main/scala/org/apache/daffodil/tdml/TDMLRunner.scala b/daffodil-tdml-lib/src/main/scala/org/apache/daffodil/tdml/TDMLRunner.scala
index 9538876..855ef75 100644
--- a/daffodil-tdml-lib/src/main/scala/org/apache/daffodil/tdml/TDMLRunner.scala
+++ b/daffodil-tdml-lib/src/main/scala/org/apache/daffodil/tdml/TDMLRunner.scala
@@ -913,7 +913,7 @@
//
val loc: DataLocation = actual.currentLocation
- if (loc.bitPos1b <= lengthLimitInBits) {
+ if (loc.bitPos1b >= 0 && loc.bitPos1b <= lengthLimitInBits) {
val leftOverMsg =
"Left over data. Consumed %s bit(s) with %s bit(s) remaining.".format(
loc.bitPos1b - 1, lengthLimitInBits - (loc.bitPos1b - 1))
@@ -981,7 +981,7 @@
private def verifyLeftOverData(actual: TDMLParseResult, lengthLimitInBits: Long, implString: Option[String]) = {
val loc: DataLocation = actual.currentLocation
- val leftOverException = if (loc.bitPos1b < lengthLimitInBits) {
+ val leftOverException = if (loc.bitPos1b >= 0 && loc.bitPos1b < lengthLimitInBits) {
val leftOverMsg = "Left over data. Consumed %s bit(s) with %s bit(s) remaining.".format(
loc.bitPos1b - 1, lengthLimitInBits - (loc.bitPos1b - 1))
Some(TDMLException(leftOverMsg, implString))
@@ -1375,7 +1375,7 @@
}
val loc: DataLocation = parseActual.currentLocation
- val leftOverException = if (loc.bitPos1b < testDataLength) {
+ val leftOverException = if (loc.bitPos1b >= 0 && loc.bitPos1b < testDataLength) {
//
// For this to happen (and have test coverage) we need an unparserTestCase
// which is roundTrip onePass, and where the parse doesn't consume all
