Skip to content

Replace ParseError with MultiException in FuzzData #1634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olabusayoT merged 1 commit into from
Mar 4, 2026
+15 −6
Merged

Replace ParseError with MultiException in FuzzData #1634

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions daffodil-core/src/main/scala/org/apache/daffodil/core/util/FuzzData.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import scala.xml.Elem
import scala.xml.Node

import org.apache.daffodil.lib.exceptions.Assert
import org.apache.daffodil.lib.exceptions.MultiException
import org.apache.daffodil.lib.util.Misc.getAMessage
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.lib.xml.XMLUtils.XMLDifferenceException
Expand Down Expand Up @@ -146,7 +147,11 @@ class FuzzParseTester(

val okParses = new mutable.HashSet[(Node, Array[Byte], XMLDifferenceException)]

protected def handleParseError(p: ParseError, testData: Array[Byte], i: Int) = {
protected def handleKnownException(
ex: Exception,
testData: Array[Byte],
i: Int
) = {
// do nothing by default
}

Expand Down Expand Up @@ -175,8 +180,8 @@ class FuzzParseTester(
try {
TestUtils.runDataProcessorOnInputStream(p, bais, areTracing = false)
} catch {
case p: ParseError => {
handleParseError(p, testData, i)
case ex @ (_: MultiException[Throwable] @unchecked | _: ParseError) => {
handleKnownException(ex, testData, i)
(null, null)
}
case t: Throwable => {
Expand Down Expand Up @@ -207,13 +212,17 @@ class LayerParseTester(

var shouldFail = false

override def handleParseError(p: ParseError, data: Array[Byte], nth: Int): Unit = {
Copy link
Copy Markdown
Member

@stevedlawrence stevedlawrence Feb 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it worth changing the argument names from p to ex or something to better match what the argument represents?

val msg = getAMessage(p)
override def handleKnownException(
ex: Exception,
data: Array[Byte],
nth: Int
): Unit = {
val msg = getAMessage(ex)
if (excludes.exists { msg.contains(_) }) {
// we know about this one
} else {
// new parse error type
println(s"trial $nth produced $p")
println(s"trial $nth produced $ex")
shouldFail = true
}
}
Expand Down