This is an automated email from the ASF dual-hosted git repository.
olabusayo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil.git
The following commit(s) were added to refs/heads/main by this push:
new 3bee0f7c0 Remove Implicits object
3bee0f7c0 is described below
commit 3bee0f7c07f7767121c1667c849e7f46f77f8433
Author: olabusayoT <[email protected]>
AuthorDate: Wed Jul 23 15:59:02 2025 -0400
Remove Implicits object
- remove Implicit functions and move intercept functions to TestUtils as
per the TODO
DAFFODIL-3008
---
.../daffodil/cli/cliTest/TestCLIParsing.scala | 2 +-
.../org/apache/daffodil/core/grammar/Grammar.scala | 4 +-
.../grammar/primitives/PrimitivesDelimiters.scala | 3 -
.../org/apache/daffodil/core/util/TestUtils.scala | 38 ++++++++--
.../scala/org/apache/daffodil/lib/Implicits.scala | 83 ----------------------
.../runtime1/infoset/JDOMInfosetInputter.scala | 1 -
.../runtime1/infoset/NullInfosetInputter.scala | 1 -
.../runtime1/infoset/ScalaXMLInfosetInputter.scala | 1 -
.../runtime1/processors/DataProcessor.scala | 11 +--
.../daffodil/runtime1/processors/RuntimeData.scala | 18 ++---
.../runtime1/processors/unparsers/Unparser.scala | 4 +-
.../core/dpath/TestDFDLExpressionEvaluation.scala | 16 ++---
.../core/dpath/TestDFDLExpressionTree.scala | 2 +-
.../org/apache/daffodil/core/dpath/TestDPath.scala | 5 +-
.../daffodil/core/dsom/TestAppinfoSyntax.scala | 2 +-
.../daffodil/core/dsom/TestDsomCompiler.scala | 9 ++-
.../core/dsom/TestDsomCompilerUnparse1.scala | 1 -
.../daffodil/core/dsom/TestExternalVariables.scala | 2 +-
.../TestPolymorphicUpwardRelativeExpressions.scala | 2 +-
.../daffodil/core/general/TestPrimitives.scala | 5 +-
.../core/general/TestRuntimeProperties.scala | 2 +-
.../apache/daffodil/core/grammar/TestGrammar.scala | 4 +-
.../core/grammar/primitives/TestPrimitives.scala | 2 +-
.../org/apache/daffodil/core/iapi/TestAPI.scala | 5 +-
.../org/apache/daffodil/core/iapi/TestAPI1.scala | 2 +-
.../daffodil/core/iapi/TestDsomCompiler3.scala | 1 -
.../core/iapi/TestParseIndividualMessages.scala | 2 +-
.../daffodil/core/infoset/TestInfoset2.scala | 3 -
.../daffodil/core/infoset/TestInfosetCursor1.scala | 2 +-
.../core/infoset/TestInfosetCursorFromReader.scala | 1 -
.../infoset/TestInfosetCursorFromReader2.scala | 3 -
.../core/layers/TestBoundaryMarkLayer.scala | 2 +-
.../core/layers/TestFixedLengthLayer.scala | 2 +-
.../TestOutputValueCalcForwardReference.scala | 1 -
.../daffodil/core/processor/TestSAXParseAPI.scala | 2 +-
.../core/processor/TestSAXUnparseAPI.scala | 2 +-
.../core/xml/TestXMLLoaderWithLocation.scala | 1 -
.../org/apache/daffodil/io/SocketPairTestRig.scala | 2 +-
.../io/TestInputSourceDataInputStream.scala | 2 +-
.../io/TestInputSourceDataInputStream2.scala | 2 +-
.../io/TestInputSourceDataInputStream6.scala | 2 +-
.../io/TestInputSourceDataInputStream8.scala | 2 +-
.../org/apache/daffodil/layers/TestBase64.scala | 2 +-
.../org/apache/daffodil/lib/HowToUseJUnit.scala | 2 +-
.../{TestImplicits.scala => TestIntercept.scala} | 5 +-
.../daffodil/lib/exceptions/TestExceptions.scala | 2 +-
.../apache/daffodil/lib/iapi/TestTunables.scala | 5 +-
.../daffodil/lib/macros/TestAssertMacros.scala | 2 +-
.../org/apache/daffodil/lib/oolag/TestOOLAG.scala | 2 +-
.../apache/daffodil/lib/util/TestCoroutines.scala | 2 +-
.../org/apache/daffodil/lib/util/TestMisc.scala | 2 +-
.../apache/daffodil/lib/util/TestNumberStuff.scala | 2 +-
.../org/apache/daffodil/lib/util/TestNumbers.scala | 7 +-
.../apache/daffodil/lib/util/TestPUARemapper.scala | 2 +-
.../org/apache/daffodil/lib/util/TestUtil.scala | 2 +-
.../lib/xml/test/unit/TestUnicodeXMLI18N.scala | 1 -
.../daffodil/lib/xml/test/unit/TestXMLLoader.scala | 2 +-
.../daffodil/runtime1/dpath/TestRounding.scala | 7 +-
.../runtime1/dsom/TestEntityReplacer.scala | 2 +-
.../runtime1/parser/TestCharsetBehavior.scala | 2 +-
.../schematron/TestValidatorFactory.scala | 2 +-
.../org/apache/daffodil/tdml/TDMLRunner.scala | 1 -
.../apache/daffodil/tdml/UnitTestTDMLRunner.scala | 2 +-
.../daffodil/processor/tdml/TestDaffodilC.scala | 2 +-
.../processor/tdml/TestTDMLCrossTest.scala | 2 +-
.../processor/tdml/TestTDMLRoundTrips.scala | 2 +-
.../daffodil/processor/tdml/TestTDMLRunner.scala | 2 +-
.../daffodil/processor/tdml/TestTDMLRunner2.scala | 2 +-
.../tdml/TestTDMLRunnerCommentSyntax.scala | 1 -
.../processor/tdml/TestTDMLRunnerConfig.scala | 2 +-
.../tdml/TestTDMLRunnerMatchAttributes.scala | 2 +-
.../tdml/TestTDMLRunnerValidationErrors.scala | 2 +-
.../processor/tdml/TestTDMLRunnerWarnings.scala | 2 +-
.../apache/daffodil/cliTest/TestCLIDebugger.scala | 2 +-
.../daffodil/runtime1/layers/TestCheckDigit.scala | 2 +-
.../daffodil/runtime1/layers/TestLayers2.scala | 2 +-
.../section00/general/TestDisallowDocType.scala | 2 +-
.../daffodil/section00/general/TestGeneral.scala | 2 +-
.../dfdl_expressions/TestDFDLExpressions2.scala | 2 +-
79 files changed, 123 insertions(+), 221 deletions(-)
diff --git
a/daffodil-cli/src/test/scala/org/apache/daffodil/cli/cliTest/TestCLIParsing.scala
b/daffodil-cli/src/test/scala/org/apache/daffodil/cli/cliTest/TestCLIParsing.scala
index 8dad007e8..15f13afce 100644
---
a/daffodil-cli/src/test/scala/org/apache/daffodil/cli/cliTest/TestCLIParsing.scala
+++
b/daffodil-cli/src/test/scala/org/apache/daffodil/cli/cliTest/TestCLIParsing.scala
@@ -24,7 +24,7 @@ import scala.util.Using
import org.apache.daffodil.cli.Main.ExitCode
import org.apache.daffodil.cli.cliTest.Util._
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.commons.io.FileUtils
import org.junit.Assert._
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/Grammar.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/Grammar.scala
index 1001aaec2..89daf8c0d 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/Grammar.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/Grammar.scala
@@ -17,12 +17,10 @@
package org.apache.daffodil.core.grammar
-import org.apache.daffodil.lib.Implicits._
-import org.apache.daffodil.lib.exceptions.Assert;
-object INoWarn { ImplicitsSuppressUnusedImportWarning() }
import org.apache.daffodil.core.compiler.ForParser
import org.apache.daffodil.core.compiler.ForUnparser
import org.apache.daffodil.core.dsom._
+import org.apache.daffodil.lib.exceptions.Assert
import org.apache.daffodil.runtime1.processors.parsers.NadaParser
import org.apache.daffodil.runtime1.processors.parsers.SeqCompParser
import org.apache.daffodil.runtime1.processors.unparsers.SeqCompUnparser
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesDelimiters.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesDelimiters.scala
index f8e22a3e9..144aaaebc 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesDelimiters.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/core/grammar/primitives/PrimitivesDelimiters.scala
@@ -19,7 +19,6 @@ package org.apache.daffodil.core.grammar.primitives
import org.apache.daffodil.core.dsom._
import org.apache.daffodil.core.grammar.Terminal
-import org.apache.daffodil.lib.Implicits._
import org.apache.daffodil.lib.exceptions.Assert
import org.apache.daffodil.lib.exceptions.ThrowsSDE
import org.apache.daffodil.lib.schema.annotation.props.gen.EscapeKind
@@ -31,8 +30,6 @@ import org.apache.daffodil.runtime1.processors.parsers.{
Parser => DaffodilParse
import org.apache.daffodil.runtime1.processors.unparsers.{ Unparser =>
DaffodilUnparser }
import org.apache.daffodil.unparsers.runtime1.DelimiterTextUnparser
-object INoWarn5 { ImplicitsSuppressUnusedImportWarning() }
-
abstract class Text(es: Term, e: Term, guard: Boolean) extends
StringDelimBase(es, guard) {
lazy val eName = e.toString()
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/core/util/TestUtils.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/core/util/TestUtils.scala
index 2f89e5aeb..94d9cb552 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/core/util/TestUtils.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/core/util/TestUtils.scala
@@ -38,7 +38,6 @@ import org.apache.daffodil.api.validation.Validators
import org.apache.daffodil.core.compiler.Compiler
import org.apache.daffodil.core.dsom._
import org.apache.daffodil.io.InputSourceDataInputStream
-import org.apache.daffodil.lib.Implicits._
import org.apache.daffodil.lib.exceptions.MultiException
import org.apache.daffodil.lib.externalvars.Binding
import org.apache.daffodil.lib.iapi._
@@ -52,15 +51,46 @@ import org.apache.daffodil.runtime1.processors.DataProcessor
import org.apache.daffodil.runtime1.processors.VariableMap
import org.apache.commons.io.FileUtils
-
-object INoWarnU2 { ImplicitsSuppressUnusedImportWarning() }
-
/*
* This is not a file of tests.
*
* These are utilities to support unit testing schemas
*/
object TestUtils {
+
+ /**
+ * Based on JUnitSuite intercept
+ */
+ def intercept[T <: AnyRef](body: => Any)(implicit tag:
scala.reflect.ClassTag[T]): T = {
+ val clazz = tag.runtimeClass.asInstanceOf[Class[T]]
+ val caught =
+ try {
+ body
+ None
+ } catch {
+ case npe: NullPointerException => throw npe
+ case s: scala.util.control.ControlThrowable => throw s
+ case u: Throwable => {
+ if (!clazz.isAssignableFrom(u.getClass)) {
+ throw new InterceptFailedException(
+ "Failed to intercept expected exception. Expected '%s' but got
'%s'.".format(
+ clazz.getName,
+ u.getClass.getName
+ )
+ )
+ } else {
+ Some(u)
+ }
+ }
+ }
+ caught match {
+ case None => throw new InterceptFailedException("Failed to intercept any
exceptions.")
+ case Some(e) => e.asInstanceOf[T]
+ }
+ }
+
+ class InterceptFailedException(msg: String) extends RuntimeException(msg)
+
def assertEquals[T](expected: T, actual: T) =
if (expected != actual) throw new AssertionError("assertEquals failed.")
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/lib/Implicits.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/lib/Implicits.scala
deleted file mode 100644
index 76fe646da..000000000
--- a/daffodil-core/src/main/scala/org/apache/daffodil/lib/Implicits.scala
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.daffodil.lib
-
-import java.io.{ BufferedInputStream, ByteArrayInputStream }
-import scala.language.implicitConversions
-
-import org.apache.daffodil.lib.exceptions.Assert
-import org.apache.daffodil.lib.xml.NS
-
-object Implicits {
-
- object ImplicitsSuppressUnusedImportWarning {
- // $COVERAGE-OFF$
- def apply() = if (scala.math.random().isNaN) Assert.impossible()
- // $COVERAGE-ON$
- }
-
- /**
- * Namespace NS objects automatically convertible to string
- */
- implicit def ns2String(ns: NS): String = ns.toString
-
- /**
- * Convenience: automatically create buffered stream when needed.
- */
- implicit def byteArrayInputStream2bufferedInputStream(
- bais: ByteArrayInputStream
- ): BufferedInputStream =
- new BufferedInputStream(bais)
-
- // TODO: move these to TestUtils object in daffodil-lib-unittest
- // add test->test dependency on that
-
- /**
- * Based on JUnitSuite intercept
- */
- def intercept[T <: AnyRef](body: => Any)(implicit tag:
scala.reflect.ClassTag[T]): T = {
- val clazz = tag.runtimeClass.asInstanceOf[Class[T]]
- val caught =
- try {
- body
- None
- } catch {
- case npe: NullPointerException => throw npe
- case s: scala.util.control.ControlThrowable => throw s
- case u: Throwable => {
- if (!clazz.isAssignableFrom(u.getClass)) {
- throw new InterceptFailedException(
- "Failed to intercept expected exception. Expected '%s' but got
'%s'.".format(
- clazz.getName,
- u.getClass.getName
- )
- )
- } else {
- Some(u)
- }
- }
- }
- caught match {
- case None => throw new InterceptFailedException("Failed to intercept any
exceptions.")
- case Some(e) => e.asInstanceOf[T]
- }
- }
-
- class InterceptFailedException(msg: String) extends RuntimeException(msg)
-
-}
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/JDOMInfosetInputter.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/JDOMInfosetInputter.scala
index 829636c85..fd9d8df2a 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/JDOMInfosetInputter.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/JDOMInfosetInputter.scala
@@ -23,7 +23,6 @@ import scala.jdk.OptionConverters._
import org.apache.daffodil.api
import org.apache.daffodil.api.infoset.Infoset.InfosetInputterEventType
-import org.apache.daffodil.lib.Implicits._
import org.apache.daffodil.lib.util.MStackOf
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.runtime1.dpath.NodeInfo
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/NullInfosetInputter.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/NullInfosetInputter.scala
index b3f705f16..83ff58183 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/NullInfosetInputter.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/NullInfosetInputter.scala
@@ -29,7 +29,6 @@ import scala.xml.XML
import org.apache.daffodil.api
import org.apache.daffodil.api.infoset.Infoset.InfosetInputterEventType
import org.apache.daffodil.api.infoset.Infoset.InfosetInputterEventType._
-import org.apache.daffodil.lib.Implicits._
import org.apache.daffodil.lib.xml.DaffodilSAXParserFactory
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.runtime1.dpath.NodeInfo
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/ScalaXMLInfosetInputter.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/ScalaXMLInfosetInputter.scala
index 18795737f..efd0f33f1 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/ScalaXMLInfosetInputter.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/infoset/ScalaXMLInfosetInputter.scala
@@ -27,7 +27,6 @@ import scala.xml.Text
import org.apache.daffodil.api
import org.apache.daffodil.api.infoset.Infoset.InfosetInputterEventType
-import org.apache.daffodil.lib.Implicits._
import org.apache.daffodil.lib.util.MStackOf
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.runtime1.dpath.NodeInfo
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/DataProcessor.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/DataProcessor.scala
index 0caf95ad9..60e481da1 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/DataProcessor.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/DataProcessor.scala
@@ -32,19 +32,14 @@ import scala.jdk.CollectionConverters._
import org.apache.daffodil.api
import org.apache.daffodil.api.debugger.Debugger
import org.apache.daffodil.api.metadata.MetadataHandler
-import org.apache.daffodil.lib.Implicits._
-import org.apache.daffodil.runtime1.layers.LayerFatalException
-import org.apache.daffodil.validation.DaffodilLimitedValidator
-import org.apache.daffodil.validation.NoValidator
-
-object INoWarn4 {
- ImplicitsSuppressUnusedImportWarning()
-}
import org.apache.daffodil.lib.equality._
import org.apache.daffodil.lib.iapi.DaffodilTunables
import org.apache.daffodil.lib.iapi.WithDiagnostics
import org.apache.daffodil.runtime1.dsom._
import org.apache.daffodil.runtime1.iapi.DFDL
+import org.apache.daffodil.runtime1.layers.LayerFatalException
+import org.apache.daffodil.validation.DaffodilLimitedValidator
+import org.apache.daffodil.validation.NoValidator
object EqualityNoWarn3 {
EqualitySuppressUnusedImportWarning()
}
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/RuntimeData.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/RuntimeData.scala
index 932561a64..5d33f110d 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/RuntimeData.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/RuntimeData.scala
@@ -20,6 +20,7 @@ package org.apache.daffodil.runtime1.processors
import java.lang.{ Double => JDouble }
import java.lang.{ Float => JFloat }
import java.lang.{ Long => JLong }
+import java.util.regex.Matcher
import scala.util.matching.Regex
import scala.xml.NamespaceBinding
@@ -32,20 +33,23 @@ import org.apache.daffodil.api.metadata.ModelGroupMetadata
import org.apache.daffodil.api.metadata.SequenceMetadata
import org.apache.daffodil.api.metadata.SimpleElementMetadata
import org.apache.daffodil.api.metadata.TermMetadata
-import org.apache.daffodil.lib.Implicits.ImplicitsSuppressUnusedImportWarning
import org.apache.daffodil.lib.exceptions.Assert
import org.apache.daffodil.lib.exceptions.HasSchemaFileLocation
import org.apache.daffodil.lib.exceptions.SchemaFileLocation
import org.apache.daffodil.lib.exceptions.ThrowsSDE
import org.apache.daffodil.lib.iapi.LocationInSchemaFile
+import org.apache.daffodil.lib.iapi.UnqualifiedPathStepPolicy
import org.apache.daffodil.lib.iapi.WarnID
import org.apache.daffodil.lib.schema.annotation.props.gen.BitOrder
+import org.apache.daffodil.lib.schema.annotation.props.gen.OccursCountKind
import org.apache.daffodil.lib.schema.annotation.props.gen.Representation
import org.apache.daffodil.lib.schema.annotation.props.gen.VariableDirection
import org.apache.daffodil.lib.schema.annotation.props.gen.YesNo
import org.apache.daffodil.lib.util.Delay
import org.apache.daffodil.lib.util.Maybe
import org.apache.daffodil.lib.util.Maybe.Nope
+import org.apache.daffodil.lib.util.Misc
+import org.apache.daffodil.lib.util.OKOrError
import org.apache.daffodil.lib.xml.GlobalQName
import org.apache.daffodil.lib.xml.LocalDeclQName
import org.apache.daffodil.lib.xml.NS
@@ -61,19 +65,11 @@ import org.apache.daffodil.runtime1.dsom.DPathCompileInfo
import org.apache.daffodil.runtime1.dsom.DPathElementCompileInfo
import org.apache.daffodil.runtime1.dsom.FacetTypes
import org.apache.daffodil.runtime1.dsom.ImplementsThrowsSDE
-import org.apache.daffodil.runtime1.infoset.PartialNextElementResolver
-import org.apache.daffodil.runtime1.layers.LayerRuntimeData
-
-object NoWarn { ImplicitsSuppressUnusedImportWarning() }
-import java.util.regex.Matcher
-
-import org.apache.daffodil.lib.iapi.UnqualifiedPathStepPolicy
-import org.apache.daffodil.lib.schema.annotation.props.gen.OccursCountKind
-import org.apache.daffodil.lib.util.Misc
-import org.apache.daffodil.lib.util.OKOrError
import org.apache.daffodil.runtime1.infoset.DISimple
import org.apache.daffodil.runtime1.infoset.DataValue
import
org.apache.daffodil.runtime1.infoset.DataValue.DataValuePrimitiveOrUseNilForDefaultOrNull
+import org.apache.daffodil.runtime1.infoset.PartialNextElementResolver
+import org.apache.daffodil.runtime1.layers.LayerRuntimeData
import org.apache.daffodil.runtime1.processors.unparsers.UnparseError
/*
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/unparsers/Unparser.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/unparsers/Unparser.scala
index 9c0ef58d7..13cfd1a47 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/unparsers/Unparser.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/runtime1/processors/unparsers/Unparser.scala
@@ -17,9 +17,7 @@
package org.apache.daffodil.runtime1.processors.unparsers
-import org.apache.daffodil.lib.Implicits._
-import org.apache.daffodil.lib.exceptions.Assert;
-object INoWarn { ImplicitsSuppressUnusedImportWarning() }
+import org.apache.daffodil.lib.exceptions.Assert
import org.apache.daffodil.lib.util.Maybe._
import org.apache.daffodil.runtime1.dsom.RuntimeSchemaDefinitionError
import org.apache.daffodil.runtime1.processors._
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionEvaluation.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionEvaluation.scala
index 01e7935bf..ca76b67c9 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionEvaluation.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionEvaluation.scala
@@ -21,24 +21,22 @@ import java.nio.ByteBuffer
import scala.util.Using
import scala.util.parsing.combinator.Parsers
+import org.apache.daffodil.api.infoset.InfosetDocument
import org.apache.daffodil.core.compiler._
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.infoset.TestInfoset
+import org.apache.daffodil.core.util.TestUtils
+import org.apache.daffodil.io.InputSourceDataInputStream
import org.apache.daffodil.lib.util.SchemaUtils
import org.apache.daffodil.lib.xml.GlobalQName
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.runtime1.dpath.NodeInfo
-
-import org.junit.Assert._
-import org.junit.Test; object INoWarn2 {
ImplicitsSuppressUnusedImportWarning() }
-
-import org.apache.daffodil.api.infoset.InfosetDocument
-import org.apache.daffodil.core.infoset.TestInfoset
-import org.apache.daffodil.core.util.TestUtils
-import org.apache.daffodil.io.InputSourceDataInputStream
import org.apache.daffodil.runtime1.infoset.NullInfosetOutputter
import org.apache.daffodil.runtime1.processors.DataProcessor
import org.apache.daffodil.runtime1.processors.parsers.PState
+import org.junit.Assert._
+import org.junit.Test
+
class TestDFDLExpressionEvaluation extends Parsers {
def testExpr(testSchema: scala.xml.Elem, infosetAsXML: scala.xml.Elem, expr:
String)(
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala
index a4507d1b2..e9b22d83e 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala
@@ -21,7 +21,7 @@ import java.math.{ BigDecimal => JBigDecimal, BigInteger =>
JBigInt }
import scala.util.parsing.combinator.Parsers
import org.apache.daffodil.core.compiler._
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.util.SchemaUtils
import org.apache.daffodil.lib.xml._
import org.apache.daffodil.runtime1.dpath._
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDPath.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDPath.scala
index bb002003a..efa7400eb 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDPath.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDPath.scala
@@ -17,12 +17,11 @@
package org.apache.daffodil.core.dpath
-import org.apache.daffodil.lib.Implicits._
-
-import org.junit.Test; object INoWarn { ImplicitsSuppressUnusedImportWarning()
}
import org.apache.daffodil.core.util.TestUtils
import org.apache.daffodil.lib.util.SchemaUtils
+import org.junit.Test
+
class TestDPath {
val testSchemaNoRef = SchemaUtils.dfdlTestSchemaUnqualified(
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestAppinfoSyntax.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestAppinfoSyntax.scala
index 9e6662a81..39400e0af 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestAppinfoSyntax.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestAppinfoSyntax.scala
@@ -21,7 +21,7 @@ import scala.xml.Elem
import org.apache.daffodil.core.compiler._
import org.apache.daffodil.core.util.TestUtils
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.xml.XMLUtils
import org.junit.Assert._
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompiler.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompiler.scala
index 846cdcc80..db26f60f4 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompiler.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompiler.scala
@@ -23,12 +23,8 @@ import scala.xml.Node
import scala.xml.Utility
import scala.xml.XML
-import org.apache.daffodil.core.util.TestUtils
-import org.apache.daffodil.lib.Implicits._
-
-import org.junit.Assert._
-import org.junit.Test; object INoWarnDSOM1 {
ImplicitsSuppressUnusedImportWarning() }
import org.apache.daffodil.core.compiler._
+import org.apache.daffodil.core.util.TestUtils
import org.apache.daffodil.lib.iapi.URISchemaSource
import org.apache.daffodil.lib.schema.annotation.props.AlignmentType
import org.apache.daffodil.lib.schema.annotation.props.Found
@@ -47,6 +43,9 @@ import org.apache.daffodil.lib.util._
import org.apache.daffodil.lib.xml.DaffodilXMLLoader
import org.apache.daffodil.lib.xml.XMLUtils
+import org.junit.Assert._
+import org.junit.Test
+
class TestDsomCompiler {
val xsd = XMLUtils.XSD_NAMESPACE
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompilerUnparse1.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompilerUnparse1.scala
index e1d209930..81a393e85 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompilerUnparse1.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompilerUnparse1.scala
@@ -18,7 +18,6 @@
package org.apache.daffodil.core.dsom
import org.apache.daffodil.core.util.TestUtils
-import org.apache.daffodil.lib.Implicits._
import org.apache.daffodil.lib.util._
import org.apache.daffodil.lib.xml.XMLUtils
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestExternalVariables.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestExternalVariables.scala
index a25ff5209..d8bc8ce1f 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestExternalVariables.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestExternalVariables.scala
@@ -22,8 +22,8 @@ import scala.jdk.CollectionConverters._
import scala.xml.Node
import org.apache.daffodil.core.compiler.Compiler
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.io.InputSourceDataInputStream
-import org.apache.daffodil.lib.Implicits._
import org.apache.daffodil.lib.iapi.UnitTestSchemaSource
import org.apache.daffodil.lib.util.Misc
import org.apache.daffodil.lib.util.SchemaUtils
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestPolymorphicUpwardRelativeExpressions.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestPolymorphicUpwardRelativeExpressions.scala
index 7d29a4c57..c0b48c359 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestPolymorphicUpwardRelativeExpressions.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestPolymorphicUpwardRelativeExpressions.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.core.dsom
import org.apache.daffodil.core.util.TestUtils
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.util._
import org.apache.daffodil.lib.xml.XMLUtils
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestPrimitives.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestPrimitives.scala
index 339dbc40a..a89906520 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestPrimitives.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestPrimitives.scala
@@ -20,11 +20,10 @@ package org.apache.daffodil.core.general
import scala.xml._
import org.apache.daffodil.core.util.TestUtils
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.lib.util.SchemaUtils
import org.apache.daffodil.lib.xml.XMLUtils
-import org.junit.Test; object INoWarn9 {
ImplicitsSuppressUnusedImportWarning() }
-import org.apache.daffodil.lib.util.SchemaUtils
+import org.junit.Test
class TestPrimitives {
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestRuntimeProperties.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestRuntimeProperties.scala
index 83d3fbce5..394cbcf44 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestRuntimeProperties.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestRuntimeProperties.scala
@@ -19,8 +19,8 @@ package org.apache.daffodil.core.general
import org.apache.daffodil.api.infoset.InfosetSimpleElement
import org.apache.daffodil.core.util.TestUtils
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.io.InputSourceDataInputStream
-import org.apache.daffodil.lib.Implicits.intercept
import org.apache.daffodil.lib.util.SchemaUtils
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.runtime1.dpath.NodeInfo
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/grammar/TestGrammar.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/grammar/TestGrammar.scala
index f55e5eca0..97a87c9ba 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/grammar/TestGrammar.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/grammar/TestGrammar.scala
@@ -17,15 +17,13 @@
package org.apache.daffodil.core.grammar
-import org.apache.daffodil.lib.Implicits._
-
-import org.junit.Assert._; object INoWarnG1 {
ImplicitsSuppressUnusedImportWarning() }
import org.apache.daffodil.core.dsom._
import org.apache.daffodil.core.util.Fakes
import org.apache.daffodil.lib.exceptions.Assert
import org.apache.daffodil.runtime1.processors.parsers.Parser
import org.apache.daffodil.runtime1.processors.unparsers.Unparser
+import org.junit.Assert._
import org.junit.Test
class TestGrammar extends GrammarMixin {
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/grammar/primitives/TestPrimitives.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/grammar/primitives/TestPrimitives.scala
index f2ed05e2b..90fb0a425 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/grammar/primitives/TestPrimitives.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/grammar/primitives/TestPrimitives.scala
@@ -19,7 +19,7 @@ package org.apache.daffodil.core.grammar.primitives
import java.util.regex.PatternSyntaxException
-import org.apache.daffodil.lib.Implicits.intercept
+import org.apache.daffodil.core.util.TestUtils.intercept
import com.ibm.icu.text.DecimalFormat
import com.ibm.icu.text.DecimalFormatSymbols
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/iapi/TestAPI.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/iapi/TestAPI.scala
index be8634978..037096327 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/iapi/TestAPI.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/iapi/TestAPI.scala
@@ -17,12 +17,11 @@
package org.apache.daffodil.core.iapi
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils
import org.apache.daffodil.lib.util._
import org.apache.daffodil.lib.xml.XMLUtils
-import org.junit.Test; object INoWarn7 {
ImplicitsSuppressUnusedImportWarning() }
-import org.apache.daffodil.core.util.TestUtils
+import org.junit.Test
class TestDFDLParser_New {
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/iapi/TestAPI1.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/iapi/TestAPI1.scala
index 855dc5816..1583aab59 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/iapi/TestAPI1.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/iapi/TestAPI1.scala
@@ -20,7 +20,7 @@ package org.apache.daffodil.core.iapi
import scala.xml._
import org.apache.daffodil.core.util.TestUtils
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.util._
import org.apache.daffodil.lib.xml.XMLUtils
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/iapi/TestDsomCompiler3.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/iapi/TestDsomCompiler3.scala
index d16ae3819..8f57f314c 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/iapi/TestDsomCompiler3.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/iapi/TestDsomCompiler3.scala
@@ -21,7 +21,6 @@ import java.io.File
import org.apache.daffodil.core.compiler._
import org.apache.daffodil.core.dsom.DFDLElement
-import org.apache.daffodil.lib.Implicits._
import org.apache.daffodil.lib.schema.annotation.props.gen._
import org.apache.daffodil.lib.util._
import org.apache.daffodil.lib.xml.XMLUtils
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/iapi/TestParseIndividualMessages.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/iapi/TestParseIndividualMessages.scala
index d93d98c66..1e0520959 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/iapi/TestParseIndividualMessages.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/iapi/TestParseIndividualMessages.scala
@@ -28,8 +28,8 @@ import scala.xml.Node
import org.apache.daffodil.api
import org.apache.daffodil.core.util.TestUtils
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.io.SocketPairTestRig
-import org.apache.daffodil.lib.Implicits.intercept
import org.apache.daffodil.lib.util.SchemaUtils
import org.apache.daffodil.runtime1.iapi.DFDL
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset2.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset2.scala
index 8c3afe6c9..f94937dec 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset2.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset2.scala
@@ -18,15 +18,12 @@
package org.apache.daffodil.core.infoset
import org.apache.daffodil.core.util.TestUtils
-import org.apache.daffodil.lib.Implicits._
import org.apache.daffodil.lib.util._
import org.apache.daffodil.lib.xml.XMLUtils
import org.junit.Assert._
import org.junit.Test
-object INoWarn8 { ImplicitsSuppressUnusedImportWarning() }
-
class TestInfoset2 {
val xsd = XMLUtils.XSD_NAMESPACE
val dfdl = XMLUtils.dfdlAppinfoSource // XMLUtils.DFDL_NAMESPACE
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursor1.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursor1.scala
index 111c85cee..05a4cb1ad 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursor1.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursor1.scala
@@ -23,7 +23,7 @@ import javax.xml.stream._
import scala.jdk.CollectionConverters._
import org.apache.daffodil.core.compiler.Compiler
-import org.apache.daffodil.lib.Implicits.intercept
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.util.Misc
import org.apache.daffodil.lib.util.SchemaUtils
import org.apache.daffodil.lib.xml.XMLUtils
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader.scala
index 14e96c127..fbf6917db 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader.scala
@@ -21,7 +21,6 @@ import scala.jdk.CollectionConverters._
import org.apache.daffodil.core.compiler.Compiler
import org.apache.daffodil.core.util.TestUtils
-import org.apache.daffodil.lib.Implicits._
import org.apache.daffodil.lib.equality._
import org.apache.daffodil.lib.util.IteratorFromCursor
import org.apache.daffodil.lib.util.SchemaUtils
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader2.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader2.scala
index 6454e3bef..16a2de66d 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader2.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader2.scala
@@ -20,7 +20,6 @@ package org.apache.daffodil.core.infoset
import scala.jdk.CollectionConverters._
import org.apache.daffodil.core.compiler.Compiler
-import org.apache.daffodil.lib.Implicits._
import org.apache.daffodil.lib.util.SchemaUtils
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.runtime1.infoset._
@@ -31,8 +30,6 @@ import
org.apache.daffodil.runtime1.processors.SequenceRuntimeData
import org.junit.Assert._
import org.junit.Test
-object INoWarnU1 { ImplicitsSuppressUnusedImportWarning() }
-
class TestInfosetInputterFromReader2 {
def infosetUnlimitedSource(size: Int) = {
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/layers/TestBoundaryMarkLayer.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/layers/TestBoundaryMarkLayer.scala
index 46a3a02ad..e8911f634 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/layers/TestBoundaryMarkLayer.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/layers/TestBoundaryMarkLayer.scala
@@ -20,7 +20,7 @@ package org.apache.daffodil.core.layers
import scala.xml.Elem
import org.apache.daffodil.core.util.TestUtils
-import org.apache.daffodil.lib.Implicits.intercept
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.util._
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.runtime1.processors.parsers.ParseError
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/layers/TestFixedLengthLayer.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/layers/TestFixedLengthLayer.scala
index 63f7fb57d..09b855265 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/layers/TestFixedLengthLayer.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/layers/TestFixedLengthLayer.scala
@@ -20,7 +20,7 @@ package org.apache.daffodil.core.layers
import scala.xml.Elem
import org.apache.daffodil.core.util.TestUtils
-import org.apache.daffodil.lib.Implicits.intercept
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.util._
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.runtime1.processors.parsers.ParseError
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/outputValueCalc/TestOutputValueCalcForwardReference.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/outputValueCalc/TestOutputValueCalcForwardReference.scala
index 21d3c7243..9aa5022ce 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/outputValueCalc/TestOutputValueCalcForwardReference.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/outputValueCalc/TestOutputValueCalcForwardReference.scala
@@ -18,7 +18,6 @@
package org.apache.daffodil.core.outputValueCalc
import org.apache.daffodil.core.util.TestUtils
-import org.apache.daffodil.lib.Implicits._
import org.apache.daffodil.lib.util.SchemaUtils
import org.apache.daffodil.lib.xml.XMLUtils
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/processor/TestSAXParseAPI.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/processor/TestSAXParseAPI.scala
index 721d53e77..6011d3460 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/processor/TestSAXParseAPI.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/processor/TestSAXParseAPI.scala
@@ -23,7 +23,7 @@ import java.io.IOException
import scala.xml.SAXParseException
import org.apache.daffodil.api
-import org.apache.daffodil.lib.Implicits.intercept
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.xml.XMLUtils
import
org.apache.daffodil.runtime1.processors.DaffodilParseOutputStreamContentHandler
import org.apache.daffodil.runtime1.processors.ParseResult
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/processor/TestSAXUnparseAPI.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/processor/TestSAXUnparseAPI.scala
index 890866847..f246cef50 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/processor/TestSAXUnparseAPI.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/processor/TestSAXUnparseAPI.scala
@@ -20,7 +20,7 @@ package org.apache.daffodil.core.processor
import java.io.ByteArrayInputStream
import java.io.ByteArrayOutputStream
-import org.apache.daffodil.lib.Implicits.intercept
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.xml.DaffodilSAXParserFactory
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.runtime1.iapi.DFDL.DaffodilUnhandledSAXException
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/core/xml/TestXMLLoaderWithLocation.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/core/xml/TestXMLLoaderWithLocation.scala
index cc0ac6fb9..bc8c4c295 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/core/xml/TestXMLLoaderWithLocation.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/core/xml/TestXMLLoaderWithLocation.scala
@@ -20,7 +20,6 @@ package org.apache.daffodil.core.xml
import java.io.File
import scala.util.Using
-import org.apache.daffodil.lib.Implicits._
import org.apache.daffodil.lib.iapi.URISchemaSource
import org.apache.daffodil.lib.xml._
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/io/SocketPairTestRig.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/io/SocketPairTestRig.scala
index 1dea58174..d11effa07 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/io/SocketPairTestRig.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/io/SocketPairTestRig.scala
@@ -29,9 +29,9 @@ import scala.concurrent.duration.DurationInt
import scala.concurrent.duration.FiniteDuration
import scala.util.Try
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.io.SocketPairTestRig.timeLimit
import org.apache.daffodil.io.SocketPairTestRig.withTimeout
-import org.apache.daffodil.lib.Implicits.intercept
import org.junit.Assert.assertEquals
import org.junit.Assert.fail
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/io/TestInputSourceDataInputStream.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/io/TestInputSourceDataInputStream.scala
index 9a4f2ca29..bc890416f 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/io/TestInputSourceDataInputStream.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/io/TestInputSourceDataInputStream.scala
@@ -22,8 +22,8 @@ import java.nio.ByteBuffer
import java.nio.CharBuffer
import java.util.regex.Pattern
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.io.processors.charset.StandardBitsCharsets
-import org.apache.daffodil.lib.Implicits.intercept
import org.apache.daffodil.lib.equality.TypeEqual
import org.apache.daffodil.lib.schema.annotation.props.gen.BitOrder
import org.apache.daffodil.lib.schema.annotation.props.gen.ByteOrder
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/io/TestInputSourceDataInputStream2.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/io/TestInputSourceDataInputStream2.scala
index 73cab81b6..f5e99846d 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/io/TestInputSourceDataInputStream2.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/io/TestInputSourceDataInputStream2.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.io
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.exceptions.UsageException
import org.apache.daffodil.lib.util.MaybeULong
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/io/TestInputSourceDataInputStream6.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/io/TestInputSourceDataInputStream6.scala
index dd15c5c8a..5f5bb2064 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/io/TestInputSourceDataInputStream6.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/io/TestInputSourceDataInputStream6.scala
@@ -19,8 +19,8 @@ package org.apache.daffodil.io
import java.nio.ByteBuffer
+import org.apache.daffodil.core.util.TestUtils.intercept
import
org.apache.daffodil.io.processors.charset.BitsCharsetDecoderUnalignedCharDecodeException
-import org.apache.daffodil.lib.Implicits.intercept
import org.apache.daffodil.lib.schema.annotation.props.gen.BitOrder
import org.apache.daffodil.lib.schema.annotation.props.gen.ByteOrder
import org.apache.daffodil.lib.util.Maybe
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/io/TestInputSourceDataInputStream8.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/io/TestInputSourceDataInputStream8.scala
index 2cf98644a..980db9aea 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/io/TestInputSourceDataInputStream8.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/io/TestInputSourceDataInputStream8.scala
@@ -20,7 +20,7 @@ package org.apache.daffodil.io
import java.io.InputStream
import java.io.OutputStream
-import org.apache.daffodil.lib.Implicits.intercept
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.junit.Assert._
import org.junit.Test
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/layers/TestBase64.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/layers/TestBase64.scala
index f8f46106e..705b9242d 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/layers/TestBase64.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/layers/TestBase64.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.layers
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.exceptions.Assert
import org.apache.commons.io.IOUtils
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/HowToUseJUnit.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/HowToUseJUnit.scala
index 22ac1f1c4..7472f055e 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/lib/HowToUseJUnit.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/lib/HowToUseJUnit.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.lib
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.junit.Assert._
import org.junit.Test
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/TestImplicits.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/TestIntercept.scala
similarity index 91%
rename from
daffodil-core/src/test/scala/org/apache/daffodil/lib/TestImplicits.scala
rename to
daffodil-core/src/test/scala/org/apache/daffodil/lib/TestIntercept.scala
index 425730536..8c03b5545 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/lib/TestImplicits.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/lib/TestIntercept.scala
@@ -19,13 +19,14 @@ package org.apache.daffodil.lib
import java.io.FileNotFoundException
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.InterceptFailedException
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.exceptions._
import org.junit.Assert._
import org.junit.Test
-class TestImplicits {
+class TestIntercept {
@Test
def testIntercept1(): Unit = {
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/exceptions/TestExceptions.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/exceptions/TestExceptions.scala
index 996b0eb7f..726983970 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/exceptions/TestExceptions.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/exceptions/TestExceptions.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.lib.exceptions
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.junit.Test
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/iapi/TestTunables.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/iapi/TestTunables.scala
index 474626ebd..e314ed337 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/iapi/TestTunables.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/iapi/TestTunables.scala
@@ -17,14 +17,11 @@
package org.apache.daffodil.lib.iapi
-import org.apache.daffodil.lib.Implicits.ImplicitsSuppressUnusedImportWarning
-
-import org.junit.Test; object INoWarnDSOM1 {
ImplicitsSuppressUnusedImportWarning() }
-
import org.apache.daffodil.core.util.Fakes
import org.apache.daffodil.lib.xml.XMLUtils
import org.junit.Assert.assertEquals
+import org.junit.Test
class TestTunables {
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/macros/TestAssertMacros.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/macros/TestAssertMacros.scala
index 53ac841b6..ad59447b9 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/macros/TestAssertMacros.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/macros/TestAssertMacros.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.lib.macros
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.exceptions._
import org.junit.Assert._
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/oolag/TestOOLAG.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/oolag/TestOOLAG.scala
index 5ea72bacd..8f611dfd8 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/lib/oolag/TestOOLAG.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/lib/oolag/TestOOLAG.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.lib.oolag
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.exceptions.Abort
import org.apache.daffodil.lib.exceptions.Assert
import org.apache.daffodil.lib.iapi.Diagnostic
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestCoroutines.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestCoroutines.scala
index eb79ed84a..1045ae698 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestCoroutines.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestCoroutines.scala
@@ -16,7 +16,7 @@
*/
package org.apache.daffodil.lib.util
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.junit.Assert._
import org.junit.Test
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestMisc.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestMisc.scala
index ae9dc74ee..083720f7f 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestMisc.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestMisc.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.lib.util
-import org.apache.daffodil.lib.Implicits.intercept
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.junit.Assert._
import org.junit.Test
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestNumberStuff.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestNumberStuff.scala
index 1e8a22abc..9f83cbbe6 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestNumberStuff.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestNumberStuff.scala
@@ -21,7 +21,7 @@ import java.lang.{ Long => JLong, Number => JNumber }
import java.math.{ BigInteger => JBigInt }
import java.text.ParsePosition
-import org.apache.daffodil.lib.Implicits.intercept
+import org.apache.daffodil.core.util.TestUtils.intercept
import com.ibm.icu.text.DecimalFormat
import com.ibm.icu.text.DecimalFormatSymbols
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestNumbers.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestNumbers.scala
index 0f2dc3ea3..10c2eaccf 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestNumbers.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestNumbers.scala
@@ -17,13 +17,12 @@
package org.apache.daffodil.lib.util
-import org.apache.daffodil.lib.Implicits._
-
-import org.junit.Assert._
-import org.junit.Test; object INoWarn { ImplicitsSuppressUnusedImportWarning()
}
import java.math.RoundingMode
import java.math.{ BigDecimal => JBigDecimal }
+import org.junit.Assert._
+import org.junit.Test
+
class TestNumbers {
@Test def testDecimalDivision1(): Unit = {
val n = new JBigDecimal("90.0")
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestPUARemapper.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestPUARemapper.scala
index 63b16b0d4..5fd828df6 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestPUARemapper.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestPUARemapper.scala
@@ -16,7 +16,7 @@
*/
package org.apache.daffodil.lib.util
-import org.apache.daffodil.lib.Implicits.intercept
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.xml.RemapPUACharDetected
import org.apache.daffodil.lib.xml.RemapPUAToXMLIllegalChar
import org.apache.daffodil.lib.xml.RemapXMLIllegalCharToPUA
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestUtil.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestUtil.scala
index 2f765592c..5971c84cd 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestUtil.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/lib/util/TestUtil.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.lib.util
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.exceptions._
import org.junit.Assert._
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/xml/test/unit/TestUnicodeXMLI18N.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/xml/test/unit/TestUnicodeXMLI18N.scala
index 45136c3f0..fa4143419 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/xml/test/unit/TestUnicodeXMLI18N.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/xml/test/unit/TestUnicodeXMLI18N.scala
@@ -19,7 +19,6 @@ package org.apache.daffodil.lib.xml.test.unit
import scala.xml._
-import org.apache.daffodil.lib.Implicits._
import org.apache.daffodil.lib.xml.NS
import org.apache.daffodil.lib.xml.XMLUtils
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/xml/test/unit/TestXMLLoader.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/xml/test/unit/TestXMLLoader.scala
index c71591d30..939d7760c 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/lib/xml/test/unit/TestXMLLoader.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/lib/xml/test/unit/TestXMLLoader.scala
@@ -20,7 +20,7 @@ package org.apache.daffodil.lib.xml.test.unit
import scala.collection.mutable.ArrayBuffer
import scala.xml.SAXParseException
-import org.apache.daffodil.lib.Implicits.intercept
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.iapi.StringSchemaSource
import org.apache.daffodil.lib.xml.DaffodilXMLLoader
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/runtime1/dpath/TestRounding.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/runtime1/dpath/TestRounding.scala
index 65b9cd476..853a5086f 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/runtime1/dpath/TestRounding.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/runtime1/dpath/TestRounding.scala
@@ -17,13 +17,12 @@
package org.apache.daffodil.runtime1.dpath
-import org.apache.daffodil.lib.Implicits.ImplicitsSuppressUnusedImportWarning
-
-import org.junit.Assert.assertEquals
-import org.junit.Test; object INoWarn { ImplicitsSuppressUnusedImportWarning()
}
import java.math.RoundingMode
import java.math.{ BigDecimal => JBigDecimal }
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
class TestRounding {
@Test def test_howToRoundFloatingPoint() = {
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/runtime1/dsom/TestEntityReplacer.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/runtime1/dsom/TestEntityReplacer.scala
index 22b2c58cf..aebb9228e 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/runtime1/dsom/TestEntityReplacer.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/runtime1/dsom/TestEntityReplacer.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.runtime1.dsom
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.cookers.EntityReplacer
import org.junit.Assert._
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/runtime1/parser/TestCharsetBehavior.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/runtime1/parser/TestCharsetBehavior.scala
index f87a8e18b..bdc587a78 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/runtime1/parser/TestCharsetBehavior.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/runtime1/parser/TestCharsetBehavior.scala
@@ -21,7 +21,7 @@ import java.io._
import java.nio._
import java.nio.charset._
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.util.Misc
import org.apache.daffodil.lib.xml.XMLUtils
diff --git
a/daffodil-schematron/src/test/scala/org/apache/daffodil/validation/schematron/TestValidatorFactory.scala
b/daffodil-schematron/src/test/scala/org/apache/daffodil/validation/schematron/TestValidatorFactory.scala
index 8df57985a..b29ae1948 100644
---
a/daffodil-schematron/src/test/scala/org/apache/daffodil/validation/schematron/TestValidatorFactory.scala
+++
b/daffodil-schematron/src/test/scala/org/apache/daffodil/validation/schematron/TestValidatorFactory.scala
@@ -21,7 +21,7 @@ import java.nio.file.Paths
import java.util.Properties
import org.apache.daffodil.api
-import org.apache.daffodil.lib.Implicits.intercept
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.util.Misc
import org.junit.Test
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 26300b35d..b4241d766 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
@@ -50,7 +50,6 @@ import
org.apache.daffodil.io.processors.charset.BitsCharsetEncoder
import org.apache.daffodil.io.processors.charset.BitsCharsetNonByteSize
import org.apache.daffodil.io.processors.charset.BitsCharsetNonByteSizeEncoder
import org.apache.daffodil.io.processors.charset.CharsetUtils
-import org.apache.daffodil.lib.Implicits._
import org.apache.daffodil.lib.cookers.EntityReplacer
import org.apache.daffodil.lib.exceptions.Assert
import org.apache.daffodil.lib.exceptions.UnsuppressableException
diff --git
a/daffodil-tdml-lib/src/test/scala/org/apache/daffodil/tdml/UnitTestTDMLRunner.scala
b/daffodil-tdml-lib/src/test/scala/org/apache/daffodil/tdml/UnitTestTDMLRunner.scala
index 79705ceeb..d7125c4c1 100644
---
a/daffodil-tdml-lib/src/test/scala/org/apache/daffodil/tdml/UnitTestTDMLRunner.scala
+++
b/daffodil-tdml-lib/src/test/scala/org/apache/daffodil/tdml/UnitTestTDMLRunner.scala
@@ -20,7 +20,7 @@ package org.apache.daffodil.tdml
import java.io.File
import scala.util.Using
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.exceptions.UsageException
import org.apache.daffodil.lib.util._
import org.apache.daffodil.lib.xml.XMLUtils
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestDaffodilC.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestDaffodilC.scala
index 3b8951b52..7c025383a 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestDaffodilC.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestDaffodilC.scala
@@ -23,7 +23,7 @@ import scala.jdk.CollectionConverters._
import org.apache.daffodil.codegen.c.DaffodilCCodeGenerator
import org.apache.daffodil.core.compiler.Compiler
-import org.apache.daffodil.lib.Implicits.intercept
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.iapi.TDMLImplementation
import org.apache.daffodil.lib.iapi.UnitTestSchemaSource
import org.apache.daffodil.lib.util.Misc
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLCrossTest.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLCrossTest.scala
index ca3335965..be260ad55 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLCrossTest.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLCrossTest.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.processor.tdml
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.tdml._
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRoundTrips.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRoundTrips.scala
index d55a3f977..9a71d95bb 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRoundTrips.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRoundTrips.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.processor.tdml
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.tdml._
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala
index d0e8ca93a..fd1d4cf87 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala
@@ -21,7 +21,7 @@ import java.io.File
import java.io.FileNotFoundException
import scala.util.Using
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.exceptions.UsageException
import org.apache.daffodil.lib.util._
import org.apache.daffodil.lib.xml.XMLUtils
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner2.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner2.scala
index 4fb0b0d84..29754c644 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner2.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner2.scala
@@ -19,7 +19,7 @@ package org.apache.daffodil.processor.tdml
import scala.util.Using
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.tdml.Document
import org.apache.daffodil.tdml.Runner
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerCommentSyntax.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerCommentSyntax.scala
index e43b3769f..928fc7713 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerCommentSyntax.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerCommentSyntax.scala
@@ -17,7 +17,6 @@
package org.apache.daffodil.processor.tdml
-import org.apache.daffodil.lib.Implicits._
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.tdml.Runner
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerConfig.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerConfig.scala
index 7b95e4811..00c337389 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerConfig.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerConfig.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.processor.tdml
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.tdml.Runner
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerMatchAttributes.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerMatchAttributes.scala
index 37708f194..cf5e3632e 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerMatchAttributes.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerMatchAttributes.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.processor.tdml
-import org.apache.daffodil.lib.Implicits.intercept
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.tdml.Runner
import org.apache.daffodil.tdml.TDMLException
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerValidationErrors.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerValidationErrors.scala
index 2a813d627..6350ea76f 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerValidationErrors.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerValidationErrors.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.processor.tdml
-import org.apache.daffodil.lib.Implicits.intercept
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.tdml.Runner
import org.apache.daffodil.tdml.TDMLException
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerWarnings.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerWarnings.scala
index 323ec98e8..4454b2b91 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerWarnings.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerWarnings.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.processor.tdml
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.tdml.Runner
import org.junit.AfterClass
diff --git
a/daffodil-test-integration/src/test/scala/org/apache/daffodil/cliTest/TestCLIDebugger.scala
b/daffodil-test-integration/src/test/scala/org/apache/daffodil/cliTest/TestCLIDebugger.scala
index 5537a77ee..c53138ca0 100644
---
a/daffodil-test-integration/src/test/scala/org/apache/daffodil/cliTest/TestCLIDebugger.scala
+++
b/daffodil-test-integration/src/test/scala/org/apache/daffodil/cliTest/TestCLIDebugger.scala
@@ -22,7 +22,7 @@ import java.nio.file.Files
import org.apache.daffodil.cli.Main.ExitCode
import org.apache.daffodil.cli.cliTest.Util._
-import org.apache.daffodil.lib.Implicits._
+import org.apache.daffodil.core.util.TestUtils.intercept
import net.sf.expectit.matcher.Matchers.regexp
import org.junit.Test
diff --git
a/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/TestCheckDigit.scala
b/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/TestCheckDigit.scala
index 633c56aaf..b0b2b703a 100644
---
a/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/TestCheckDigit.scala
+++
b/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/TestCheckDigit.scala
@@ -19,9 +19,9 @@ package org.apache.daffodil.runtime1.layers
import scala.xml.Elem
import org.apache.daffodil.core.util.TestUtils
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.junit.tdml.TdmlSuite
import org.apache.daffodil.junit.tdml.TdmlTests
-import org.apache.daffodil.lib.Implicits.intercept
import org.apache.daffodil.lib.util.Misc.getAMessage
import org.apache.daffodil.lib.util.SchemaUtils
import org.apache.daffodil.lib.xml.XMLUtils
diff --git
a/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/TestLayers2.scala
b/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/TestLayers2.scala
index 9d89f4724..2075247cd 100644
---
a/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/TestLayers2.scala
+++
b/daffodil-test/src/test/scala/org/apache/daffodil/runtime1/layers/TestLayers2.scala
@@ -17,9 +17,9 @@
package org.apache.daffodil.runtime1.layers
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.junit.tdml.TdmlSuite
import org.apache.daffodil.junit.tdml.TdmlTests
-import org.apache.daffodil.lib.Implicits.intercept
import org.apache.daffodil.lib.exceptions.Abort
import org.apache.daffodil.lib.util.Misc
import org.apache.daffodil.tdml.TDMLException
diff --git
a/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestDisallowDocType.scala
b/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestDisallowDocType.scala
index c53393f0c..524fd79b8 100644
---
a/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestDisallowDocType.scala
+++
b/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestDisallowDocType.scala
@@ -24,9 +24,9 @@ package org.apache.daffodil.section00.general
import java.nio.file.Paths
import org.apache.daffodil.core.util.TestUtils.compileSchema
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.junit.tdml.TdmlSuite
import org.apache.daffodil.junit.tdml.TdmlTests
-import org.apache.daffodil.lib.Implicits.intercept
import org.apache.daffodil.lib.util.Misc
import org.apache.daffodil.lib.util.SchemaUtils
import org.apache.daffodil.runtime1.processors.DataProcessor
diff --git
a/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestGeneral.scala
b/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestGeneral.scala
index 79235fb50..f16d98769 100644
---
a/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestGeneral.scala
+++
b/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestGeneral.scala
@@ -21,9 +21,9 @@ package org.apache.daffodil.section00.general
* not related to any specific requirement
*/
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.junit.tdml.TdmlSuite
import org.apache.daffodil.junit.tdml.TdmlTests
-import org.apache.daffodil.lib.Implicits.intercept
import org.junit.Assert._
import org.junit.Ignore
diff --git
a/daffodil-test/src/test/scala/org/apache/daffodil/section23/dfdl_expressions/TestDFDLExpressions2.scala
b/daffodil-test/src/test/scala/org/apache/daffodil/section23/dfdl_expressions/TestDFDLExpressions2.scala
index 2c884dd65..e4812e0c9 100644
---
a/daffodil-test/src/test/scala/org/apache/daffodil/section23/dfdl_expressions/TestDFDLExpressions2.scala
+++
b/daffodil-test/src/test/scala/org/apache/daffodil/section23/dfdl_expressions/TestDFDLExpressions2.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.section23.dfdl_expressions
-import org.apache.daffodil.lib.Implicits.intercept
+import org.apache.daffodil.core.util.TestUtils.intercept
import org.apache.daffodil.lib.exceptions.UsageException
import org.junit.Assert.assertFalse
