This is an automated email from the ASF dual-hosted git repository.
mbeckerle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git
The following commit(s) were added to refs/heads/master by this push:
new 750d57e Upgrades sbt to 1.3.9, scala to 2.12.11, genjavadoc to 0.16.
750d57e is described below
commit 750d57e347b523a66e56bf3c7617ee022a064945
Author: Michael Beckerle <[email protected]>
AuthorDate: Mon Apr 6 11:38:54 2020 -0400
Upgrades sbt to 1.3.9, scala to 2.12.11, genjavadoc to 0.16.
sbt, depending on the terminal you are displaying it in, will issue ANSI
colorization escapes. You may need to add the color=false option to your
environment: e.g., in my .bash_aliases I have
export SBT_OPTS=" -Dsbt.color=false "
Had to fix a number of deprecations.
junit.framework.Assert is deprecated. Changed to org.junit.Assert.
Assert.assertEquals for float/double now requires a delta argument. Supplied
1e-15 where needed.
Since scala 2.12.7, shifting of values by quantities expressed as Long is
deprectated. Had to insert ".toInt" calls a number of places to silence these.
Changes to main.yml also fix DAFFODIL-2111 which was javadoc-related errors
due
to java 11 occurring on the automated build.
DAFFODIL-2313, DAFFODIL-2111
---
.github/workflows/main.yml | 11 ++++++-----
.github/workflows/sonarcloud.yml | 2 +-
build.sbt | 4 ++--
containers/release-candidate/setup-container.sh | 2 +-
daffodil-cli/bin.LICENSE | 2 +-
.../src/it/scala/org/apache/daffodil/blob/TestBlob.scala | 2 +-
.../org/apache/daffodil/executing/TestCLIexecuting.scala | 2 +-
.../scala/org/apache/daffodil/parsing/TestCLIParsing.scala | 2 +-
.../org/apache/daffodil/performance/TestCLIPerformance.scala | 2 +-
.../scala/org/apache/daffodil/saving/TestCLISaveParser.scala | 2 +-
.../src/it/scala/org/apache/daffodil/udf/TestCLIUdfs.scala | 2 +-
.../org/apache/daffodil/unparsing/TestCLIUnparsing.scala | 2 +-
.../scala/org/apache/daffodil/dsom/ElementDeclMixin.scala | 2 +-
.../src/test/scala/org/apache/daffodil/api/TestAPI1.scala | 2 +-
.../scala/org/apache/daffodil/api/TestDsomCompiler3.scala | 4 ++--
.../apache/daffodil/dpath/TestDFDLExpressionEvaluation.scala | 2 +-
.../org/apache/daffodil/dpath/TestDFDLExpressionTree.scala | 2 +-
.../scala/org/apache/daffodil/dsom/TestBinaryInput_01.scala | 2 +-
.../scala/org/apache/daffodil/dsom/TestDsomCompiler.scala | 2 +-
.../org/apache/daffodil/dsom/TestExternalVariablesNew.scala | 6 +++---
.../daffodil/dsom/TestInteriorAlignmentElimination.scala | 2 +-
.../scala/org/apache/daffodil/dsom/TestIsScannable.scala | 2 +-
.../org/apache/daffodil/dsom/TestMiddleEndAttributes.scala | 2 +-
.../dsom/TestPolymorphicUpwardRelativeExpressions.scala | 2 +-
.../src/test/scala/org/apache/daffodil/dsom/TestRefMap.scala | 2 +-
.../org/apache/daffodil/dsom/TestSimpleTypeUnions.scala | 2 +-
.../daffodil/externalvars/TestExternalVariablesLoader.scala | 2 +-
.../daffodil/externalvars/TestExternalVariablesNew.scala | 2 +-
.../scala/org/apache/daffodil/general/TestTunables.scala | 2 +-
.../test/scala/org/apache/daffodil/grammar/TestGrammar.scala | 2 +-
.../test/scala/org/apache/daffodil/infoset/TestInfoset.scala | 2 +-
.../schema/annotation/props/TestPropertyRuntime.scala | 2 +-
.../org/apache/daffodil/xml/TestXMLLoaderWithLocation.scala | 2 +-
.../scala/org/apache/daffodil/io/TestDataOutputStream.scala | 2 +-
.../scala/org/apache/daffodil/io/TestDataOutputStream2.scala | 2 +-
.../scala/org/apache/daffodil/io/TestDataOutputStream3.scala | 2 +-
.../scala/org/apache/daffodil/io/TestDataOutputStream4.scala | 2 +-
.../daffodil/io/TestDirectOrBufferedDataOutputStream.scala | 2 +-
.../scala/org/apache/daffodil/io/TestFastAsciiConvert.scala | 2 +-
.../test/scala/org/apache/daffodil/layers/TestBase64.scala | 2 +-
.../scala/org/apache/daffodil/layers/TestJavaIOStreams.scala | 2 +-
.../apache/daffodil/layers/TestLimitingJavaIOStreams.scala | 2 +-
daffodil-japi/build.sbt | 2 +-
daffodil-lib/src/main/scala/passera/unsigned/SmallUInt.scala | 12 ++++++------
.../src/test/scala/org/apache/daffodil/HowToUseJUnit.scala | 2 +-
.../scala/org/apache/daffodil/TestBitOrderByteOrder.scala | 2 +-
.../src/test/scala/org/apache/daffodil/TestImplicits.scala | 2 +-
.../apache/daffodil/functionality/icu/TestBigInteger.scala | 2 +-
.../src/test/scala/org/apache/daffodil/oolag/TestOOLAG.scala | 2 +-
.../schema/annotation/props/TestGeneratedProperties.scala | 2 +-
.../src/test/scala/org/apache/daffodil/util/TestBits.scala | 2 +-
.../src/test/scala/org/apache/daffodil/util/TestBits2.scala | 2 +-
.../test/scala/org/apache/daffodil/util/TestListMap.scala | 2 +-
.../test/scala/org/apache/daffodil/util/TestListUtils.scala | 2 +-
.../src/test/scala/org/apache/daffodil/util/TestLogger.scala | 2 +-
.../scala/org/apache/daffodil/util/TestNumberStuff.scala | 4 ++--
.../test/scala/org/apache/daffodil/util/TestNumbers.scala | 8 ++++----
.../scala/org/apache/daffodil/util/TestSchemaUtils.scala | 2 +-
.../org/apache/daffodil/util/TestSerializationAndLazy.scala | 2 +-
.../src/test/scala/org/apache/daffodil/util/TestUtil.scala | 2 +-
.../org/apache/daffodil/util/TestXMLCatalogAndValidate.scala | 2 +-
.../org/apache/daffodil/xml/test/unit/TestNamespaces.scala | 2 +-
.../scala/org/apache/daffodil/xml/test/unit/TestQName.scala | 2 +-
.../daffodil/xml/test/unit/TestUTF8AndUTF16Conversions.scala | 2 +-
.../apache/daffodil/xml/test/unit/TestUnicodeXMLI18N.scala | 2 +-
.../org/apache/daffodil/xml/test/unit/TestXMLLiterals.scala | 2 +-
.../org/apache/daffodil/xml/test/unit/TestXMLLoader.scala | 2 +-
.../org/apache/daffodil/xml/test/unit/TestXMLUtils.scala | 2 +-
daffodil-lib/src/test/scala/passera/test/UnsignedCheck.scala | 12 ++++++------
.../org/apache/daffodil/propGen/TestPropertyGenerator.scala | 2 +-
.../test/scala/org/apache/daffodil/dpath/TestRounding.scala | 2 +-
.../scala/org/apache/daffodil/dsom/TestEntityReplacer.scala | 2 +-
.../scala/org/apache/daffodil/layers/TestAISStreams.scala | 2 +-
.../org/apache/daffodil/layers/TestByteSwapStream.scala | 2 +-
.../layers/TestLengthLimitedLineFoldingStreams.scala | 2 +-
.../org/apache/daffodil/layers/TestLineFoldingStreams.scala | 2 +-
.../org/apache/daffodil/parser/TestCharsetBehavior.scala | 2 +-
.../processors/input/TestDFDLRegularExpressions.scala | 2 +-
.../scala/org/apache/daffodil/processors/input/TestICU.scala | 8 ++++----
.../org/apache/daffodil/processors/input/TestRegex.scala | 2 +-
.../charset/TestLSBFirstAndUSASCII7BitPacked.scala | 2 +-
.../scala/org/apache/daffodil/tdml/TestMoreEncodings.scala | 2 +-
.../scala/org/apache/daffodil/tdml/UnitTestTDMLRunner.scala | 6 +++---
.../scala/org/apache/daffodil/tdml/TestSchemaCache.scala | 2 +-
.../scala/org/apache/daffodil/tdml/TestTDMLCrossTest.scala | 2 +-
.../scala/org/apache/daffodil/tdml/TestTDMLRoundTrips.scala | 2 +-
.../test/scala/org/apache/daffodil/tdml/TestTDMLRunner.scala | 6 +++---
.../scala/org/apache/daffodil/tdml/TestTDMLRunner2.scala | 6 +++---
.../org/apache/daffodil/tdml/TestTDMLRunnerConfig.scala | 2 +-
.../org/apache/daffodil/tdml/TestTDMLRunnerWarnings.scala | 2 +-
.../org/apache/daffodil/tdml/TestTDMLUnparseCases.scala | 2 +-
.../org/apache/daffodil/section00/general/TestGeneral.scala | 2 +-
.../section12/length_properties/TestLengthProperties.scala | 2 +-
.../daffodil/xml/test/unit/TestDaffodilXMLLoader.scala | 2 +-
project/build.properties | 2 +-
95 files changed, 127 insertions(+), 126 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a4cf042..0648f69 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,10 +25,11 @@ jobs:
fail-fast: false
matrix:
java_version: [ '8.x', '9.x', '11.x' ]
- scala_version: [ '2.12.6', '2.11.12' ]
+ scala_version: [ '2.12.11', '2.11.12' ]
os: [ 'ubuntu-latest', 'windows-latest' ]
env:
SBT: sbt -J-Xms1024m -J-Xmx5120m -J-XX:ReservedCodeCacheSize=512m
-J-XX:MaxMetaspaceSize=1024m ++${{ matrix.scala_version }} coverage
+ SBTNOCOV: sbt -J-Xms1024m -J-Xmx5120m -J-XX:ReservedCodeCacheSize=512m
-J-XX:MaxMetaspaceSize=1024m ++${{ matrix.scala_version }}
steps:
############################################################
@@ -63,15 +64,15 @@ jobs:
shell: bash
- name: Build Documentation
- run: $SBT daffodil-japi/genjavadoc:doc daffodil-sapi/doc
+ run: $SBTNOCOV daffodil-japi/genjavadoc:doc daffodil-sapi/doc
shell: bash
- name: Package Zip & Tar
- run: $SBT daffodil-cli/universal:packageBin
daffodil-cli/universal:packageZipTarball
+ run: $SBTNOCOV daffodil-cli/universal:packageBin
daffodil-cli/universal:packageZipTarball
shell: bash
- name: Package RPM
- run: $SBT daffodil-cli/rpm:packageBin
+ run: $SBTNOCOV daffodil-cli/rpm:packageBin
if: runner.os == 'Linux'
shell: bash
@@ -80,7 +81,7 @@ jobs:
############################################################
- name: Run Rat Check
- run: $SBT ratCheck || (cat target/rat.txt; exit 1)
+ run: $SBTNOCOV ratCheck || (cat target/rat.txt; exit 1)
shell: bash
- name: Run Unit Tests
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 58d6fe1..38f7795 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- scala_version: [ '2.12.6', '2.11.12' ]
+ scala_version: [ '2.12.11', '2.11.12' ]
steps:
############################################################
diff --git a/build.sbt b/build.sbt
index 8f91fce..4dc33f7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -105,8 +105,8 @@ lazy val testStdLayout =
Project("daffodil-test-stdLayout", file("test-stdLay
lazy val commonSettings = Seq(
organization := "org.apache.daffodil",
version := "2.6.0",
- scalaVersion := "2.12.6",
- crossScalaVersions := Seq("2.12.6", "2.11.12"),
+ scalaVersion := "2.12.11",
+ crossScalaVersions := Seq("2.12.11", "2.11.12"),
scalacOptions ++= Seq(
"-feature",
"-deprecation",
diff --git a/containers/release-candidate/setup-container.sh
b/containers/release-candidate/setup-container.sh
index 337e7c1..004f4ca 100755
--- a/containers/release-candidate/setup-container.sh
+++ b/containers/release-candidate/setup-container.sh
@@ -40,6 +40,6 @@ sh -c "echo 'addSbtPlugin(\"com.jsuereth\" % \"sbt-pgp\" %
\"2.0.1\")' >> /root/
TMP_SBT_PROJECT=/tmp/sbt-project/
mkdir -p $TMP_SBT_PROJECT
pushd $TMP_SBT_PROJECT &> /dev/null
-sbt --sbt-version 1.2.7 exit
+sbt --sbt-version 1.3.9 exit
popd &> /dev/null
rm -rf $TMP_SBT_PROJECT
diff --git a/daffodil-cli/bin.LICENSE b/daffodil-cli/bin.LICENSE
index fd6119f..4b59e97 100644
--- a/daffodil-cli/bin.LICENSE
+++ b/daffodil-cli/bin.LICENSE
@@ -240,7 +240,7 @@ subcomponents is subject to the terms and conditions of the
following licenses.
This product bundles 'Scala', including the following files:
- lib/org.scala-lang.modules.scala-parser-combinators_2.12-1.1.1.jar
- lib/org.scala-lang.modules.scala-xml_2.12-1.1.0.jar
- - lib/org.scala-lang.scala-library-2.12.6.jar
+ - lib/org.scala-lang.scala-library-2.12.11.jar
- org/apache/daffodil/util/UniquenessCache.class in
lib/org.apache.daffodil.daffodil-lib-2.6.0.jar
These files are available under the BSD-3-Clause licnese:
diff --git a/daffodil-cli/src/it/scala/org/apache/daffodil/blob/TestBlob.scala
b/daffodil-cli/src/it/scala/org/apache/daffodil/blob/TestBlob.scala
index 265c499..78ce267 100644
--- a/daffodil-cli/src/it/scala/org/apache/daffodil/blob/TestBlob.scala
+++ b/daffodil-cli/src/it/scala/org/apache/daffodil/blob/TestBlob.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.blob
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import java.io.File
import org.apache.daffodil.CLI.Util
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/executing/TestCLIexecuting.scala
b/daffodil-cli/src/it/scala/org/apache/daffodil/executing/TestCLIexecuting.scala
index 72b3ce8..cfecee2 100644
---
a/daffodil-cli/src/it/scala/org/apache/daffodil/executing/TestCLIexecuting.scala
+++
b/daffodil-cli/src/it/scala/org/apache/daffodil/executing/TestCLIexecuting.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.executing
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import scala.language.postfixOps
import scala.sys.process._
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/parsing/TestCLIParsing.scala
b/daffodil-cli/src/it/scala/org/apache/daffodil/parsing/TestCLIParsing.scala
index 6ffe980..1563590 100644
--- a/daffodil-cli/src/it/scala/org/apache/daffodil/parsing/TestCLIParsing.scala
+++ b/daffodil-cli/src/it/scala/org/apache/daffodil/parsing/TestCLIParsing.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.parsing
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import java.io.File
import org.apache.daffodil.CLI.Util
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/performance/TestCLIPerformance.scala
b/daffodil-cli/src/it/scala/org/apache/daffodil/performance/TestCLIPerformance.scala
index 6af8940..0585668 100644
---
a/daffodil-cli/src/it/scala/org/apache/daffodil/performance/TestCLIPerformance.scala
+++
b/daffodil-cli/src/it/scala/org/apache/daffodil/performance/TestCLIPerformance.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.performance
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.CLI.Util
import net.sf.expectit.ExpectIOException
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/saving/TestCLISaveParser.scala
b/daffodil-cli/src/it/scala/org/apache/daffodil/saving/TestCLISaveParser.scala
index 2a1aa69..9e9a866 100644
---
a/daffodil-cli/src/it/scala/org/apache/daffodil/saving/TestCLISaveParser.scala
+++
b/daffodil-cli/src/it/scala/org/apache/daffodil/saving/TestCLISaveParser.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.saving
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.junit.Before
import org.junit.After
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/udf/TestCLIUdfs.scala
b/daffodil-cli/src/it/scala/org/apache/daffodil/udf/TestCLIUdfs.scala
index 2c7af3c..a481d71 100644
--- a/daffodil-cli/src/it/scala/org/apache/daffodil/udf/TestCLIUdfs.scala
+++ b/daffodil-cli/src/it/scala/org/apache/daffodil/udf/TestCLIUdfs.scala
@@ -19,7 +19,7 @@ package org.apache.daffodil.udf
import org.junit.AfterClass
import org.junit.Test
-import junit.framework.Assert._
+import org.junit.Assert._
import org.apache.daffodil.CLI.Util
import net.sf.expectit.matcher.Matchers.contains
import net.sf.expectit.matcher.Matchers.anyOf
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala
b/daffodil-cli/src/it/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala
index 36b9676..7c62f54 100644
---
a/daffodil-cli/src/it/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala
+++
b/daffodil-cli/src/it/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.unparsing
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import java.io.File
import org.apache.daffodil.CLI.Util
diff --git
a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementDeclMixin.scala
b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementDeclMixin.scala
index 1e59289..a57bac7 100644
---
a/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementDeclMixin.scala
+++
b/daffodil-core/src/main/scala/org/apache/daffodil/dsom/ElementDeclMixin.scala
@@ -81,7 +81,7 @@ trait ElementDeclMixin
if (ct.length == 1)
Some(new LocalComplexTypeDef(ct(0), this))
else {
- Assert.invariant(nt != "")
+ nt.foreach{ s => Assert.invariant(s != "") }
None
}
}.value
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/api/TestAPI1.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/api/TestAPI1.scala
index e912dd8..a7fa1dd 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/api/TestAPI1.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/api/TestAPI1.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.api
-import junit.framework.Assert._
+import org.junit.Assert._
import scala.xml._
import org.apache.daffodil.util._
import org.junit.Test
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/api/TestDsomCompiler3.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/api/TestDsomCompiler3.scala
index d4d9b1e..04c1ad0 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/api/TestDsomCompiler3.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/api/TestDsomCompiler3.scala
@@ -22,8 +22,8 @@ import org.apache.daffodil.util._
import org.apache.daffodil.Implicits._
import org.apache.daffodil.compiler._
import org.apache.daffodil.schema.annotation.props.gen._
-import junit.framework.Assert.assertEquals
-import junit.framework.Assert.assertTrue
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
import java.io.File
import org.junit.Test
import org.apache.daffodil.dsom.DFDLElement
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDFDLExpressionEvaluation.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDFDLExpressionEvaluation.scala
index f7872c1..85f798a 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDFDLExpressionEvaluation.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDFDLExpressionEvaluation.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.dpath
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.util.SchemaUtils
import org.apache.daffodil.compiler._
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDFDLExpressionTree.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDFDLExpressionTree.scala
index e57ccf6..d5443de 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDFDLExpressionTree.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/dpath/TestDFDLExpressionTree.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.dpath
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.util.SchemaUtils
import org.apache.daffodil.compiler._
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestBinaryInput_01.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestBinaryInput_01.scala
index 16d535c..3712ac7 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestBinaryInput_01.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestBinaryInput_01.scala
@@ -39,7 +39,7 @@ import org.apache.daffodil.util.Misc
import org.junit.After
import org.junit.Test
-import junit.framework.Assert.assertEquals
+import org.junit.Assert.assertEquals
// Do no harm number 16 of 626 fail in regression, 154 in total of 797
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestDsomCompiler.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestDsomCompiler.scala
index 9e250ea..9c4621c 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestDsomCompiler.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestDsomCompiler.scala
@@ -26,7 +26,7 @@ import org.apache.daffodil.schema.annotation.props.gen.{
YesNo, TextNumberRep, S
import org.apache.daffodil.schema.annotation.props.AlignmentType
import org.apache.daffodil.util.{ Misc, Logging }
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert._
+import org.junit.Assert._
import org.apache.daffodil.api.Diagnostic
import org.apache.daffodil.util._
import org.junit.Test
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestExternalVariablesNew.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestExternalVariablesNew.scala
index 49a8910..c252674 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestExternalVariablesNew.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestExternalVariablesNew.scala
@@ -23,9 +23,9 @@ import org.apache.daffodil.compiler.Compiler
import org.apache.daffodil.processors.VariableMap
import org.apache.daffodil.util.SchemaUtils
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertTrue
-import junit.framework.Assert._
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.xml.NS
import scala.xml.Node
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestInteriorAlignmentElimination.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestInteriorAlignmentElimination.scala
index efd0790..9408afc 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestInteriorAlignmentElimination.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestInteriorAlignmentElimination.scala
@@ -25,7 +25,7 @@ import org.apache.daffodil.schema.annotation.props.gen.{
YesNo, TextNumberRep, S
import org.apache.daffodil.schema.annotation.props.AlignmentType
import org.apache.daffodil.util.{ Misc, Logging }
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert._
+import org.junit.Assert._
import org.apache.daffodil.api.Diagnostic
import org.apache.daffodil.util._
import org.junit.Test
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestIsScannable.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestIsScannable.scala
index a30b0d9..c522f7b 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestIsScannable.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestIsScannable.scala
@@ -22,7 +22,7 @@ import org.apache.daffodil.compiler._
import org.apache.daffodil.util.Logging
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert._
+import org.junit.Assert._
import org.apache.daffodil.util.SchemaUtils
import org.junit.Test
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestMiddleEndAttributes.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestMiddleEndAttributes.scala
index 990166b..c7c01f9 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestMiddleEndAttributes.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestMiddleEndAttributes.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.dsom
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert._
+import org.junit.Assert._
import org.apache.daffodil.util._
import org.junit.Test
import org.junit.Test
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestPolymorphicUpwardRelativeExpressions.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestPolymorphicUpwardRelativeExpressions.scala
index 69a1134..a8c0d2b 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestPolymorphicUpwardRelativeExpressions.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestPolymorphicUpwardRelativeExpressions.scala
@@ -25,7 +25,7 @@ import org.apache.daffodil.schema.annotation.props.gen.{
YesNo, TextNumberRep, S
import org.apache.daffodil.schema.annotation.props.AlignmentType
import org.apache.daffodil.util.{ Misc, Logging }
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert._
+import org.junit.Assert._
import org.apache.daffodil.api.Diagnostic
import org.apache.daffodil.util._
import org.junit.Test
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestRefMap.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestRefMap.scala
index 6a74a84..01ba42e 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestRefMap.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestRefMap.scala
@@ -25,7 +25,7 @@ import org.apache.daffodil.schema.annotation.props.gen.{
YesNo, TextNumberRep, S
import org.apache.daffodil.schema.annotation.props.AlignmentType
import org.apache.daffodil.util.{ Misc, Logging }
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert._
+import org.junit.Assert._
import org.apache.daffodil.api.Diagnostic
import org.apache.daffodil.util._
import org.junit.Test
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestSimpleTypeUnions.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestSimpleTypeUnions.scala
index 01aed80..b7194c1 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestSimpleTypeUnions.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/dsom/TestSimpleTypeUnions.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.dsom
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert._
+import org.junit.Assert._
import org.apache.daffodil.util._
import org.apache.daffodil.dpath.NodeInfo._
import org.junit.Test
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesLoader.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesLoader.scala
index cdc7a9e..6939e91 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesLoader.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesLoader.scala
@@ -20,7 +20,7 @@ package org.apache.daffodil.externalvars
import org.apache.daffodil.xml._
import org.apache.daffodil.util._
import scala.xml._
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.dsom.SchemaSet
import org.apache.daffodil.xml.NS
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesNew.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesNew.scala
index f285d27..7314ad3 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesNew.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/externalvars/TestExternalVariablesNew.scala
@@ -19,7 +19,7 @@ package org.apache.daffodil.externalvars
import org.apache.daffodil.util._
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.Implicits._; object INoWarn2 {
ImplicitsSuppressUnusedImportWarning() }
import org.junit.Test
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/general/TestTunables.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/general/TestTunables.scala
index fa4f42d..af31503 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/general/TestTunables.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/general/TestTunables.scala
@@ -26,7 +26,7 @@ import org.apache.daffodil.util.Fakes
import org.apache.daffodil.util.Logging
import org.apache.daffodil.util.SchemaUtils
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert.assertEquals
+import org.junit.Assert.assertEquals
import org.apache.daffodil.api.DaffodilTunables
class TestTunables extends Logging {
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/grammar/TestGrammar.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/grammar/TestGrammar.scala
index edd6ff1..e35c25a 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/grammar/TestGrammar.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/grammar/TestGrammar.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.grammar
-import junit.framework.Assert._
+import org.junit.Assert._
import org.apache.daffodil.Implicits._; object INoWarnG1 {
ImplicitsSuppressUnusedImportWarning() }
import org.apache.daffodil.dsom._
import org.apache.daffodil.exceptions.Assert
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfoset.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfoset.scala
index 1a68959..ee826c2 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfoset.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/infoset/TestInfoset.scala
@@ -21,7 +21,7 @@ import org.apache.daffodil.xml.XMLUtils
import org.apache.daffodil.util._
import org.apache.daffodil.Implicits._
import org.apache.daffodil.compiler._
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.processors.ElementRuntimeData
import org.apache.daffodil.exceptions.Assert
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/schema/annotation/props/TestPropertyRuntime.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/schema/annotation/props/TestPropertyRuntime.scala
index 903add5..1c2cb71 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/schema/annotation/props/TestPropertyRuntime.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/schema/annotation/props/TestPropertyRuntime.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.schema.annotation.props
-import junit.framework.Assert._
+import org.junit.Assert._
import org.apache.daffodil.exceptions.ThrowsSDE
import org.junit.Test
import org.apache.daffodil.dsom.SchemaComponentImpl
diff --git
a/daffodil-core/src/test/scala/org/apache/daffodil/xml/TestXMLLoaderWithLocation.scala
b/daffodil-core/src/test/scala/org/apache/daffodil/xml/TestXMLLoaderWithLocation.scala
index c3d0c20..562dca8 100644
---
a/daffodil-core/src/test/scala/org/apache/daffodil/xml/TestXMLLoaderWithLocation.scala
+++
b/daffodil-core/src/test/scala/org/apache/daffodil/xml/TestXMLLoaderWithLocation.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.xml
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.Implicits._
import java.io.File
diff --git
a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream.scala
b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream.scala
index f8157bf..ee89253 100644
---
a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream.scala
+++
b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.io
import java.io.File
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.schema.annotation.props.gen.BitOrder
import org.apache.daffodil.util.Maybe
diff --git
a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream2.scala
b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream2.scala
index 346236d..3550ca6 100644
---
a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream2.scala
+++
b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream2.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.io
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import java.nio.ByteBuffer
import java.io.File
diff --git
a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream3.scala
b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream3.scala
index 1e44dbf..31c5261 100644
---
a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream3.scala
+++
b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream3.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.io
import java.io.File
-import junit.framework.Assert._
+import org.junit.Assert._
import org.apache.daffodil.schema.annotation.props.gen.BitOrder
import org.apache.daffodil.schema.annotation.props.gen.ByteOrder
import org.apache.daffodil.util.Maybe
diff --git
a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream4.scala
b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream4.scala
index f30cd9c..0444c7d 100644
---
a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream4.scala
+++
b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDataOutputStream4.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.io
import java.io.File
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import passera.unsigned.ULong
import org.apache.daffodil.schema.annotation.props.gen.BitOrder
diff --git
a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDirectOrBufferedDataOutputStream.scala
b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDirectOrBufferedDataOutputStream.scala
index 94b5628..54faeec 100644
---
a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDirectOrBufferedDataOutputStream.scala
+++
b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestDirectOrBufferedDataOutputStream.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.io
import org.junit.Test
-import junit.framework.Assert._
+import org.junit.Assert._
import java.io.ByteArrayInputStream
import java.io.InputStreamReader
diff --git
a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestFastAsciiConvert.scala
b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestFastAsciiConvert.scala
index 21fe3b5..faf27cc 100644
---
a/daffodil-io/src/test/scala/org/apache/daffodil/io/TestFastAsciiConvert.scala
+++
b/daffodil-io/src/test/scala/org/apache/daffodil/io/TestFastAsciiConvert.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.io
import java.nio.ByteBuffer
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
class TestFastAsciiConvert {
diff --git
a/daffodil-io/src/test/scala/org/apache/daffodil/layers/TestBase64.scala
b/daffodil-io/src/test/scala/org/apache/daffodil/layers/TestBase64.scala
index 7a37f0c..5c8634d 100644
--- a/daffodil-io/src/test/scala/org/apache/daffodil/layers/TestBase64.scala
+++ b/daffodil-io/src/test/scala/org/apache/daffodil/layers/TestBase64.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.layers
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.Implicits._
import org.apache.commons.io.IOUtils
diff --git
a/daffodil-io/src/test/scala/org/apache/daffodil/layers/TestJavaIOStreams.scala
b/daffodil-io/src/test/scala/org/apache/daffodil/layers/TestJavaIOStreams.scala
index 7b3c23e..80ee7c6 100644
---
a/daffodil-io/src/test/scala/org/apache/daffodil/layers/TestJavaIOStreams.scala
+++
b/daffodil-io/src/test/scala/org/apache/daffodil/layers/TestJavaIOStreams.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.layers
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.commons.io.IOUtils
import collection.JavaConverters._
diff --git
a/daffodil-io/src/test/scala/org/apache/daffodil/layers/TestLimitingJavaIOStreams.scala
b/daffodil-io/src/test/scala/org/apache/daffodil/layers/TestLimitingJavaIOStreams.scala
index 1ba3d4c..692748b 100644
---
a/daffodil-io/src/test/scala/org/apache/daffodil/layers/TestLimitingJavaIOStreams.scala
+++
b/daffodil-io/src/test/scala/org/apache/daffodil/layers/TestLimitingJavaIOStreams.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.layers
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.commons.io.IOUtils
import collection.JavaConverters._
diff --git a/daffodil-japi/build.sbt b/daffodil-japi/build.sbt
index 4ee03aa..14d02d9 100644
--- a/daffodil-japi/build.sbt
+++ b/daffodil-japi/build.sbt
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-addCompilerPlugin("com.typesafe.genjavadoc" %% "genjavadoc-plugin" % "0.11"
cross CrossVersion.full)
+addCompilerPlugin("com.typesafe.genjavadoc" %% "genjavadoc-plugin" % "0.16"
cross CrossVersion.full)
lazy val JavaDoc = config("genjavadoc") extend Compile
diff --git a/daffodil-lib/src/main/scala/passera/unsigned/SmallUInt.scala
b/daffodil-lib/src/main/scala/passera/unsigned/SmallUInt.scala
index e0f6587..e883fe8 100644
--- a/daffodil-lib/src/main/scala/passera/unsigned/SmallUInt.scala
+++ b/daffodil-lib/src/main/scala/passera/unsigned/SmallUInt.scala
@@ -181,19 +181,19 @@ trait SmallUInt[U <: Unsigned[U, UInt, Int]] extends Any
with Unsigned[U, UInt,
def unary_~ = UInt(~intValue)
def <<(x: Int)(implicit d: DummyImplicit) = UInt(intValue << x)
- def <<(x: Long)(implicit d: DummyImplicit) = UInt(intValue << x)
+ def <<(x: Long)(implicit d: DummyImplicit) = UInt(intValue << x.toInt)
def <<(x: UInt) = UInt(intValue << (x.toInt & 0x1f))
- def <<(x: ULong) = UInt(intValue << (x.toLong & 0x1f))
+ def <<(x: ULong) = UInt(intValue << (x.toLong & 0x1f).toInt)
def >>(x: Int)(implicit d: DummyImplicit) = UInt(intValue >>> x)
- def >>(x: Long)(implicit d: DummyImplicit) = UInt(intValue >>> x)
+ def >>(x: Long)(implicit d: DummyImplicit) = UInt(intValue >>> x.toInt)
def >>(x: UInt) = UInt(intValue >>> (x.toInt & 0x1f))
- def >>(x: ULong) = UInt(intValue >>> (x.toLong & 0x1f))
+ def >>(x: ULong) = UInt(intValue >>> (x.toLong & 0x1f).toInt)
def >>>(x: Int)(implicit d: DummyImplicit) = UInt(intValue >>> x)
- def >>>(x: Long)(implicit d: DummyImplicit) = UInt(intValue >>> x)
+ def >>>(x: Long)(implicit d: DummyImplicit) = UInt(intValue >>> x.toInt)
def >>>(x: UInt) = UInt(intValue >>> (x.toInt & 0x1f))
- def >>>(x: ULong) = UInt(intValue >>> (x.toLong & 0x1f))
+ def >>>(x: ULong) = UInt(intValue >>> (x.toLong & 0x1f).toInt)
override def toString = (intValue & 0xffffffffL).toString
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/HowToUseJUnit.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/HowToUseJUnit.scala
index 2da0415..70a7065 100644
--- a/daffodil-lib/src/test/scala/org/apache/daffodil/HowToUseJUnit.scala
+++ b/daffodil-lib/src/test/scala/org/apache/daffodil/HowToUseJUnit.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.Implicits._
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/TestBitOrderByteOrder.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/TestBitOrderByteOrder.scala
index 62bb271..bcaac23 100644
---
a/daffodil-lib/src/test/scala/org/apache/daffodil/TestBitOrderByteOrder.scala
+++
b/daffodil-lib/src/test/scala/org/apache/daffodil/TestBitOrderByteOrder.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil
-import junit.framework.Assert.assertEquals
+import org.junit.Assert.assertEquals
import org.apache.daffodil.util._
import org.junit.Test
import org.apache.daffodil.util._
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/TestImplicits.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/TestImplicits.scala
index 4f2fcfd..ce45f20 100644
--- a/daffodil-lib/src/test/scala/org/apache/daffodil/TestImplicits.scala
+++ b/daffodil-lib/src/test/scala/org/apache/daffodil/TestImplicits.scala
@@ -22,7 +22,7 @@ import org.junit.Test
import org.apache.daffodil.Implicits._
import org.apache.daffodil.exceptions._
import java.io.FileNotFoundException
-import junit.framework.Assert._
+import org.junit.Assert._
class TestImplicits {
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/functionality/icu/TestBigInteger.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/functionality/icu/TestBigInteger.scala
index 8374840..1c2db26 100644
---
a/daffodil-lib/src/test/scala/org/apache/daffodil/functionality/icu/TestBigInteger.scala
+++
b/daffodil-lib/src/test/scala/org/apache/daffodil/functionality/icu/TestBigInteger.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.functionality.icu
import org.junit.Test
-import junit.framework.Assert._
+import org.junit.Assert._
import com.ibm.icu.text.DecimalFormat
import com.ibm.icu.text.DecimalFormatSymbols
import java.text.ParsePosition
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/oolag/TestOOLAG.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/oolag/TestOOLAG.scala
index 64aa375..aa2b66e 100644
--- a/daffodil-lib/src/test/scala/org/apache/daffodil/oolag/TestOOLAG.scala
+++ b/daffodil-lib/src/test/scala/org/apache/daffodil/oolag/TestOOLAG.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.oolag
-import junit.framework.Assert._
+import org.junit.Assert._
import org.apache.daffodil.oolag.OOLAG._
import org.junit.Test
import org.apache.daffodil.exceptions.Assert
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/schema/annotation/props/TestGeneratedProperties.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/schema/annotation/props/TestGeneratedProperties.scala
index adc411e..99ac29c 100644
---
a/daffodil-lib/src/test/scala/org/apache/daffodil/schema/annotation/props/TestGeneratedProperties.scala
+++
b/daffodil-lib/src/test/scala/org/apache/daffodil/schema/annotation/props/TestGeneratedProperties.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.schema.annotation.props
import org.apache.daffodil.schema.annotation.props.gen._
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.oolag.OOLAG.OOLAGHostImpl
import org.apache.daffodil.exceptions.SchemaFileLocation
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestBits.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestBits.scala
index 19df377..3bdce73 100644
--- a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestBits.scala
+++ b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestBits.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.util
import org.junit.Test
-import junit.framework.Assert._
+import org.junit.Assert._
import java.nio.ByteBuffer
class TestBits {
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestBits2.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestBits2.scala
index 257de71..a68a8b0 100644
--- a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestBits2.scala
+++ b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestBits2.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.util
import org.junit.Test
-import junit.framework.Assert._
+import org.junit.Assert._
import java.nio.ByteBuffer
import org.apache.daffodil.schema.annotation.props.gen.BitOrder
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestListMap.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestListMap.scala
index 331bc77..88124a7 100644
--- a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestListMap.scala
+++ b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestListMap.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.util
-import junit.framework.Assert.assertEquals
+import org.junit.Assert.assertEquals
import org.junit.Test
import scala.collection.immutable.ListMap
import scala.util.Random
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestListUtils.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestListUtils.scala
index 024bf8c..71185e9 100644
--- a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestListUtils.scala
+++ b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestListUtils.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.util
-import junit.framework.Assert.assertEquals
+import org.junit.Assert.assertEquals
import org.junit.Test
class TestListUtils {
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestLogger.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestLogger.scala
index 7885867..8a54357 100644
--- a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestLogger.scala
+++ b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestLogger.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.util
-import junit.framework.Assert._
+import org.junit.Assert._
import org.apache.daffodil.exceptions._
import org.junit.Test
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestNumberStuff.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestNumberStuff.scala
index f7600a8..1ce4603 100644
--- a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestNumberStuff.scala
+++ b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestNumberStuff.scala
@@ -27,8 +27,8 @@ import org.junit.Test
import com.ibm.icu.text.DecimalFormat
import com.ibm.icu.text.DecimalFormatSymbols
-import junit.framework.Assert.assertEquals
-import junit.framework.Assert.assertTrue
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
/**
* Tests that characterize ICU number parsing specifically with respect
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestNumbers.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestNumbers.scala
index 5f46b81..c5fb33a 100644
--- a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestNumbers.scala
+++ b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestNumbers.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.util
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.Implicits._; object INoWarn {
ImplicitsSuppressUnusedImportWarning() }
import java.math.{ BigDecimal => JBigDecimal }
@@ -59,7 +59,7 @@ class TestNumbers {
val m = (new JBigDecimal("1048575.0")).doubleValue()
val quotient = n / m
val expected1 = 8.583077033116372E-5
- assertEquals(expected1, quotient)
+ assertEquals(expected1, quotient, 1e-15)
val decimalQuotient = new JBigDecimal(quotient)
//
// The giant number of digits below is in fact what you get as the
@@ -73,7 +73,7 @@ class TestNumbers {
assertEquals(expected2, decimalQuotient)
val double2 = expected2.doubleValue()
- assertEquals(expected1, double2)
+ assertEquals(expected1, double2, 1e-15)
}
@Test def testDecimalAsDoubleDivision2() {
@@ -81,7 +81,7 @@ class TestNumbers {
val m = (new JBigDecimal("1048575.0000000000")).doubleValue()
val quotient = n / m
val expected1 = 8.583077033116372E-5
- assertEquals(expected1, quotient)
+ assertEquals(expected1, quotient, 1e-15)
//
// Must have a rounding mode here, or we get a ArithmeticException
// rounding-necessary
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestSchemaUtils.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestSchemaUtils.scala
index a4f3cd8..9b83d6c 100644
--- a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestSchemaUtils.scala
+++ b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestSchemaUtils.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.util
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import scala.xml._
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestSerializationAndLazy.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestSerializationAndLazy.scala
index 10edd11..c141024 100644
---
a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestSerializationAndLazy.scala
+++
b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestSerializationAndLazy.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.util
-import junit.framework.Assert._
+import org.junit.Assert._
import java.io.ByteArrayOutputStream
import java.io.ObjectOutputStream
import java.io.ByteArrayInputStream
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestUtil.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestUtil.scala
index 2d4e11b..8300d94 100644
--- a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestUtil.scala
+++ b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestUtil.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.util
-import junit.framework.Assert._
+import org.junit.Assert._
import org.apache.daffodil.exceptions._
import org.junit.Test
import org.apache.daffodil.Implicits._
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestXMLCatalogAndValidate.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestXMLCatalogAndValidate.scala
index 89af691..3480f8b 100644
---
a/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestXMLCatalogAndValidate.scala
+++
b/daffodil-lib/src/test/scala/org/apache/daffodil/util/TestXMLCatalogAndValidate.scala
@@ -26,7 +26,7 @@ import org.apache.xml.resolver.{ CatalogManager, Catalog }
import org.junit.Test
import Implicits.using
import javax.xml.parsers.{ SAXParserFactory, SAXParser }
-import junit.framework.Assert.{ fail, assertTrue }
+import org.junit.Assert.{ fail, assertTrue }
import scala.xml.NamespaceBinding
import scala.xml.MetaData
import org.apache.daffodil.exceptions.Assert
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestNamespaces.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestNamespaces.scala
index 4b3f21e..f84f434 100644
---
a/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestNamespaces.scala
+++
b/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestNamespaces.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.xml.test.unit
-import junit.framework.Assert.assertEquals
+import org.junit.Assert.assertEquals
import org.junit.Test
/**
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestQName.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestQName.scala
index 9cf358c..e7b4b96 100644
---
a/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestQName.scala
+++
b/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestQName.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.xml.test.unit
-import junit.framework.Assert.assertEquals
+import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.Assert._
import org.apache.daffodil.xml.QNameRegex
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestUTF8AndUTF16Conversions.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestUTF8AndUTF16Conversions.scala
index fdb7fa2..f7d7a2e 100644
---
a/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestUTF8AndUTF16Conversions.scala
+++
b/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestUTF8AndUTF16Conversions.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.xml.test.unit
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
/**
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestUnicodeXMLI18N.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestUnicodeXMLI18N.scala
index 48181c1..966f583 100644
---
a/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestUnicodeXMLI18N.scala
+++
b/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestUnicodeXMLI18N.scala
@@ -19,7 +19,7 @@ package org.apache.daffodil.xml.test.unit
import scala.xml._
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.Implicits._
import org.apache.daffodil.xml.NS
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLLiterals.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLLiterals.scala
index 63fbbf0..71afc12 100644
---
a/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLLiterals.scala
+++
b/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLLiterals.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.xml.test.unit
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
class TestXMLLiterals {
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLLoader.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLLoader.scala
index 068e000..5ee83d8 100644
---
a/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLLoader.scala
+++
b/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLLoader.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.xml.test.unit
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
class TestXMLLoader {
diff --git
a/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLUtils.scala
b/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLUtils.scala
index 39f6b3b..c1d6cda 100644
---
a/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLUtils.scala
+++
b/daffodil-lib/src/test/scala/org/apache/daffodil/xml/test/unit/TestXMLUtils.scala
@@ -24,7 +24,7 @@ import java.nio.file.StandardOpenOption
import scala.xml._
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.Implicits._
diff --git a/daffodil-lib/src/test/scala/passera/test/UnsignedCheck.scala
b/daffodil-lib/src/test/scala/passera/test/UnsignedCheck.scala
index 985032c..7fdcd7b 100644
--- a/daffodil-lib/src/test/scala/passera/test/UnsignedCheck.scala
+++ b/daffodil-lib/src/test/scala/passera/test/UnsignedCheck.scala
@@ -245,7 +245,7 @@ class UnsignedCheck {
@Test def testLshiftLong = {
assertTrue(
- forAll { (a: Int, b: Long) => a.toUInt << (b & 0x1f) == (a << (b &
0x1f)).toUInt }
+ forAll { (a: Int, b: Long) => a.toUInt << (b & 0x1f) == (a << (b &
0x1f).toInt).toUInt }
)
}
@@ -257,7 +257,7 @@ class UnsignedCheck {
@Test def testLshiftULong = {
assertTrue(
- forAll { (a: Int, b: Long) => a.toUInt << (b & 0x1f).toULong == (a << (b
& 0x1f)).toUInt }
+ forAll { (a: Int, b: Long) => a.toUInt << (b & 0x1f).toULong == (a << (b
& 0x1f).toInt).toUInt }
)
}
@@ -270,7 +270,7 @@ class UnsignedCheck {
@Test def testRshiftLong = {
assertTrue(
- forAll { (a: Int, b: Long) => a.toUInt >> (b & 0x1f) == (a >>> (b &
0x1f)).toUInt }
+ forAll { (a: Int, b: Long) => a.toUInt >> (b & 0x1f) == (a >>> (b &
0x1f).toInt).toUInt }
)
}
@@ -282,7 +282,7 @@ class UnsignedCheck {
@Test def testRshiftULong = {
assertTrue(
- forAll { (a: Int, b: Long) => a.toUInt >> (b & 0x1f).toULong == (a >>>
(b & 0x1f)).toUInt }
+ forAll { (a: Int, b: Long) => a.toUInt >> (b & 0x1f).toULong == (a >>>
(b & 0x1f).toInt).toUInt }
)
}
@@ -295,7 +295,7 @@ class UnsignedCheck {
@Test def testZrshiftLong = {
assertTrue(
- forAll { (a: Int, b: Long) => a.toUInt >>> (b & 0x1f) == (a >>> (b &
0x1f)).toUInt }
+ forAll { (a: Int, b: Long) => a.toUInt >>> (b & 0x1f).toInt == (a >>> (b
& 0x1f).toInt).toUInt }
)
}
@@ -307,7 +307,7 @@ class UnsignedCheck {
@Test def testZrshiftULong = {
assertTrue(
- forAll { (a: Int, b: Long) => a.toUInt >>> (b & 0x1f).toULong == (a >>>
(b & 0x1f)).toUInt }
+ forAll { (a: Int, b: Long) => a.toUInt >>> (b & 0x1f).toULong == (a >>>
(b & 0x1f).toInt).toUInt }
)
}
diff --git
a/daffodil-propgen/src/test/scala/org/apache/daffodil/propGen/TestPropertyGenerator.scala
b/daffodil-propgen/src/test/scala/org/apache/daffodil/propGen/TestPropertyGenerator.scala
index 9830751..757d3ae 100644
---
a/daffodil-propgen/src/test/scala/org/apache/daffodil/propGen/TestPropertyGenerator.scala
+++
b/daffodil-propgen/src/test/scala/org/apache/daffodil/propGen/TestPropertyGenerator.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.propGen
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
class TestPropertyGenerator {
diff --git
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/dpath/TestRounding.scala
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/dpath/TestRounding.scala
index 653ab46..f1d8b52 100644
---
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/dpath/TestRounding.scala
+++
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/dpath/TestRounding.scala
@@ -20,7 +20,7 @@ package org.apache.daffodil.dpath
import org.apache.daffodil.Implicits.ImplicitsSuppressUnusedImportWarning
import org.junit.Test
-import junit.framework.Assert.assertEquals; object INoWarn {
ImplicitsSuppressUnusedImportWarning() }
+import org.junit.Assert.assertEquals; object INoWarn {
ImplicitsSuppressUnusedImportWarning() }
import java.math.{ BigDecimal => JBigDecimal }
import java.math.RoundingMode
diff --git
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/dsom/TestEntityReplacer.scala
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/dsom/TestEntityReplacer.scala
index aa729a6..faa7132 100644
---
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/dsom/TestEntityReplacer.scala
+++
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/dsom/TestEntityReplacer.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.dsom
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.Implicits._
import org.apache.daffodil.cookers.EntityReplacer
diff --git
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/layers/TestAISStreams.scala
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/layers/TestAISStreams.scala
index 45a0888..db98bf9 100644
---
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/layers/TestAISStreams.scala
+++
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/layers/TestAISStreams.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.layers
-import junit.framework.Assert._
+import org.junit.Assert._
import java.io._
import org.junit.Test
import org.apache.daffodil.io.RegexLimitingStream
diff --git
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/layers/TestByteSwapStream.scala
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/layers/TestByteSwapStream.scala
index 9fc279c..d6b47fa 100644
---
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/layers/TestByteSwapStream.scala
+++
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/layers/TestByteSwapStream.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.layers
-import junit.framework.Assert._
+import org.junit.Assert._
import java.io._
import org.junit.Test
import java.nio.charset.StandardCharsets
diff --git
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/layers/TestLengthLimitedLineFoldingStreams.scala
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/layers/TestLengthLimitedLineFoldingStreams.scala
index bf57fa2..6131987 100644
---
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/layers/TestLengthLimitedLineFoldingStreams.scala
+++
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/layers/TestLengthLimitedLineFoldingStreams.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.layers
-import junit.framework.Assert._
+import org.junit.Assert._
import java.io._
import org.junit.Test
import org.apache.daffodil.io.RegexLimitingStream
diff --git
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/layers/TestLineFoldingStreams.scala
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/layers/TestLineFoldingStreams.scala
index 76e0213..3189251 100644
---
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/layers/TestLineFoldingStreams.scala
+++
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/layers/TestLineFoldingStreams.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.layers
-import junit.framework.Assert._
+import org.junit.Assert._
import java.io._
import org.junit.Test
diff --git
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/parser/TestCharsetBehavior.scala
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/parser/TestCharsetBehavior.scala
index 7478a04..620e302 100644
---
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/parser/TestCharsetBehavior.scala
+++
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/parser/TestCharsetBehavior.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.parser
-import junit.framework.Assert._
+import org.junit.Assert._
import java.io._
import java.nio._
import java.nio.charset._
diff --git
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/processors/input/TestDFDLRegularExpressions.scala
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/processors/input/TestDFDLRegularExpressions.scala
index 965707b..9918f76 100644
---
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/processors/input/TestDFDLRegularExpressions.scala
+++
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/processors/input/TestDFDLRegularExpressions.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.processors.input
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.processors.DFDLRegularExpressions
import org.apache.daffodil.schema.annotation.props.gen.TextStringJustification
diff --git
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/processors/input/TestICU.scala
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/processors/input/TestICU.scala
index 782785f..afc0ddb 100644
---
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/processors/input/TestICU.scala
+++
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/processors/input/TestICU.scala
@@ -17,9 +17,9 @@
package org.apache.daffodil.processors.input
-import junit.framework.Assert._
-import org.junit.Test
+import org.junit.Assert._
import java.text.ParsePosition
+
import com.ibm.icu.text.SimpleDateFormat
import com.ibm.icu.util.Calendar
import com.ibm.icu.text.DecimalFormat
@@ -146,7 +146,7 @@ class TestICU {
val df = new DecimalFormat("##.##E+0", dfs)
val pp = new ParsePosition(0)
val num = df.parse("12.34+2", pp)
- assertEquals(12.34, num.doubleValue)
+ assertEquals(12.34, num.doubleValue, 1e-15)
assertEquals(5, pp.getIndex)
//assertEquals(1234L, num)
//assertEquals(7, pp.getIndex)
@@ -177,6 +177,6 @@ class TestICU {
val pp = new ParsePosition(0)
val num = df.parse("123,456", pp)
assertEquals(7, pp.getIndex)
- assertEquals(123.456, num.doubleValue)
+ assertEquals(123.456, num.doubleValue, 1e-15)
}
}
diff --git
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/processors/input/TestRegex.scala
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/processors/input/TestRegex.scala
index 95b62e5..0b5c792 100644
---
a/daffodil-runtime1/src/test/scala/org/apache/daffodil/processors/input/TestRegex.scala
+++
b/daffodil-runtime1/src/test/scala/org/apache/daffodil/processors/input/TestRegex.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.processors.input
-import junit.framework.Assert._
+import org.junit.Assert._
import scala.util.parsing.combinator._
import java.io.StringReader
import org.junit.Test
diff --git
a/daffodil-tdml-lib/src/test/scala/org/apache/daffodil/processors/charset/TestLSBFirstAndUSASCII7BitPacked.scala
b/daffodil-tdml-lib/src/test/scala/org/apache/daffodil/processors/charset/TestLSBFirstAndUSASCII7BitPacked.scala
index 9f02071..6f50d49 100644
---
a/daffodil-tdml-lib/src/test/scala/org/apache/daffodil/processors/charset/TestLSBFirstAndUSASCII7BitPacked.scala
+++
b/daffodil-tdml-lib/src/test/scala/org/apache/daffodil/processors/charset/TestLSBFirstAndUSASCII7BitPacked.scala
@@ -19,7 +19,7 @@ package org.apache.daffodil.processors.charset
import java.nio.CharBuffer
-import junit.framework.Assert.assertEquals
+import org.junit.Assert.assertEquals
import org.junit.Test
import org.apache.daffodil.util.Misc
diff --git
a/daffodil-tdml-lib/src/test/scala/org/apache/daffodil/tdml/TestMoreEncodings.scala
b/daffodil-tdml-lib/src/test/scala/org/apache/daffodil/tdml/TestMoreEncodings.scala
index ea6c85d..bfb0f9a 100644
---
a/daffodil-tdml-lib/src/test/scala/org/apache/daffodil/tdml/TestMoreEncodings.scala
+++
b/daffodil-tdml-lib/src/test/scala/org/apache/daffodil/tdml/TestMoreEncodings.scala
@@ -19,7 +19,7 @@ package org.apache.daffodil.tdml
import org.junit.Test
-import junit.framework.Assert.assertEquals
+import org.junit.Assert.assertEquals
class TestMoreEncodings {
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 af39e42..50f8900 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,9 +20,9 @@ package org.apache.daffodil.tdml
import java.io.File
import org.apache.daffodil.Implicits.using
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert.assertEquals
-import junit.framework.Assert.assertTrue
-import junit.framework.Assert.assertFalse
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Assert.assertFalse
import org.apache.daffodil.util._
import org.junit.Test
import org.apache.daffodil.Implicits._
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestSchemaCache.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestSchemaCache.scala
index 352f1f0..7a83bf2 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestSchemaCache.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestSchemaCache.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.tdml
import java.io.File
-import junit.framework.Assert.assertEquals
+import org.junit.Assert.assertEquals
import org.junit.Test
import org.apache.daffodil.Implicits._
import java.io.FileOutputStream
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLCrossTest.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLCrossTest.scala
index 687ba5d..ca14a1e 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLCrossTest.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLCrossTest.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.tdml
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.Implicits._
import org.junit.AssumptionViolatedException
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRoundTrips.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRoundTrips.scala
index 8f05c6a..76856d6 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRoundTrips.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRoundTrips.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.tdml
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.Implicits._
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunner.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunner.scala
index cc8ac48..61dc9b1 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunner.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunner.scala
@@ -20,9 +20,9 @@ package org.apache.daffodil.tdml
import java.io.File
import org.apache.daffodil.Implicits.using
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert.assertEquals
-import junit.framework.Assert.assertTrue
-import junit.framework.Assert.assertFalse
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Assert.assertFalse
import org.apache.daffodil.util._
import org.junit.Test
import org.apache.daffodil.Implicits._
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunner2.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunner2.scala
index 50ed553..1e1d3e4 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunner2.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunner2.scala
@@ -19,9 +19,9 @@ package org.apache.daffodil.tdml
import org.apache.daffodil.Implicits.using
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert.assertEquals
-import junit.framework.Assert.assertTrue
-import junit.framework.Assert.fail
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Assert.fail
import org.apache.daffodil.util._
import org.junit.Test
import org.apache.daffodil.Implicits._
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunnerConfig.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunnerConfig.scala
index 53085df..afe6cc2 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunnerConfig.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunnerConfig.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.tdml
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert.assertTrue
+import org.junit.Assert.assertTrue
import org.junit.Test
import org.apache.daffodil.Implicits._
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunnerWarnings.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunnerWarnings.scala
index 167546e..0012c6d 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunnerWarnings.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunnerWarnings.scala
@@ -20,7 +20,7 @@ package org.apache.daffodil.tdml
import org.junit.Test
import org.junit.AfterClass
import org.apache.daffodil.Implicits._
-import junit.framework.Assert.fail
+import org.junit.Assert.fail
object TestTDMLRunnerWarnings {
val runner = Runner("/test/tdml/", "testWarnings.tdml")
diff --git
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLUnparseCases.scala
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLUnparseCases.scala
index a4560da..6e05675 100644
---
a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLUnparseCases.scala
+++
b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLUnparseCases.scala
@@ -18,7 +18,7 @@
package org.apache.daffodil.tdml
import org.apache.daffodil.xml.XMLUtils
-import junit.framework.Assert.assertEquals
+import org.junit.Assert.assertEquals
import org.junit.Test
import org.apache.daffodil.Implicits._
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 c98ea47..bcc14d7 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,7 +21,7 @@ package org.apache.daffodil.section00.general
* not related to any specific requirement
*/
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.Implicits.intercept
import org.apache.daffodil.tdml.Runner
diff --git
a/daffodil-test/src/test/scala/org/apache/daffodil/section12/length_properties/TestLengthProperties.scala
b/daffodil-test/src/test/scala/org/apache/daffodil/section12/length_properties/TestLengthProperties.scala
index 0c84f0c..993316b 100644
---
a/daffodil-test/src/test/scala/org/apache/daffodil/section12/length_properties/TestLengthProperties.scala
+++
b/daffodil-test/src/test/scala/org/apache/daffodil/section12/length_properties/TestLengthProperties.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.section12.length_properties
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import org.apache.daffodil.tdml.Runner
import org.junit.AfterClass
diff --git
a/daffodil-test/src/test/scala/org/apache/daffodil/xml/test/unit/TestDaffodilXMLLoader.scala
b/daffodil-test/src/test/scala/org/apache/daffodil/xml/test/unit/TestDaffodilXMLLoader.scala
index aa6637e..d39e413 100644
---
a/daffodil-test/src/test/scala/org/apache/daffodil/xml/test/unit/TestDaffodilXMLLoader.scala
+++
b/daffodil-test/src/test/scala/org/apache/daffodil/xml/test/unit/TestDaffodilXMLLoader.scala
@@ -20,7 +20,7 @@ package org.apache.daffodil.xml.test.unit
import scala.xml._
import org.apache.daffodil.xml.XMLUtils
import org.apache.daffodil.xml.DaffodilXMLLoader
-import junit.framework.Assert._
+import org.junit.Assert._
import org.junit.Test
import java.io.File
import org.apache.daffodil.Implicits._
diff --git a/project/build.properties b/project/build.properties
index acc69d7..b134b76 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -15,4 +15,4 @@
* limitations under the License.
*/
-sbt.version=1.2.7
+sbt.version=1.3.9
