fix: [~] deprecated methods problem

.github/workflows/github-actions-basic.yml

@@ -29,15 +29,15 @@ jobs:
       SPARK_VERSION: ${{ matrix.spark }}
     steps:
     - name: Checkout spark-testing-base
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4.1.1
       # In order to fetch changed files
-      with:
-        fetch-depth: 0
-        repository: holdenk/spark-testing-base
-        ref: main
+#      with:
+#        fetch-depth: 0
+#        repository: holdenk/spark-testing-base
+#        ref: main
     - name: Cache maven modules
       id: cache-maven
-      uses: actions/cache@v3
+      uses: actions/cache@v4.0.0
       env:
         cache-name: cache-maven
       with:
@@ -51,15 +51,15 @@ jobs:
           ${{ runner.os }}-${{ matrix.spark }}-build-
           ${{ runner.os }}-${{ matrix.spark }}-
           ${{ runner.os }}
-    - name: Sync the current branch with the latest in spark-testing-base
-      if: github.repository != 'holdenk/spark-testing-base'
-      id: sync-branch
-      run: |
-        apache_spark_ref=`git rev-parse HEAD`
-        git fetch https://github.com/$GITHUB_REPOSITORY.git ${GITHUB_REF##*/}
-        git -c user.name='Spark Test Account' -c user.email='[email protected]' merge --no-commit --progress --squash FETCH_HEAD
-        git -c user.name='Spark Test Account' -c user.email='[email protected]' commit -m "Merged commit"
-        echo "::set-output name=SPARK_REF::$apache_spark_ref"
+#    - name: Sync the current branch with the latest in spark-testing-base
+#      if: github.repository != 'holdenk/spark-testing-base'
+#      id: sync-branch
+#      run: |
+#        apache_spark_ref=`git rev-parse HEAD`
+#        git fetch https://github.com/$GITHUB_REPOSITORY.git ${GITHUB_REF##*/}
+#        git -c user.name='Spark Test Account' -c user.email='[email protected]' merge --no-commit --progress --squash FETCH_HEAD
+#        git -c user.name='Spark Test Account' -c user.email='[email protected]' commit -m "Merged commit"
+#        echo "::set-output name=SPARK_REF::$apache_spark_ref"
     # Cache local repositories. Note that GitHub Actions cache has a 2G limit.
     # Run the tests.
     - name: Run tests

core/src/main/2.0/scala/com/holdenkarau/spark/testing/DataFrameSuiteBase.scala

@@ -261,21 +261,17 @@ trait DataFrameSuiteBaseLike extends SparkContextProvider
     * Compares if two [[DataFrame]]s are equal, checks that the schemas are the same.
     * When comparing inexact fields uses tol.
     *
-    * @param tol          max acceptable tolerance for numeric (between(0, 1)) &
-    *                     timestamp (millis).
-    * @param customShow   unit function to customize the '''show''' method
-    *                     when dataframes are not equal. IE: '''df.show(false)''' or
-    *                     '''df.toJSON.show(false)'''.
+    * @param tol max acceptable tolerance for numeric (between(0, 1)) &
+    *            timestamp (millis).
     */
   @deprecated(
     "Use `assertDataFrameApproximateEquals` with timestamp tolerance",
     since = "1.5.0"
   )
-  def assertDataFrameApproximateEquals(
-    expected: DataFrame, result: DataFrame,
-    tol: Double, customShow: DataFrame => Unit = _.show()): Unit =
+  def assertDataFrameApproximateEquals(expected: DataFrame, result: DataFrame,
+                                       tol: Double): Unit =
     assertDataFrameApproximateEquals(expected, result, tol,
-      Duration.ofNanos((tol * 1000).toLong), customShow)
+      Duration.ofMillis(tol.toLong), _.show())
 
   /**
     * Compares if two [[DataFrame]]s are equal, checks that the schemas are the same.
@@ -417,7 +413,7 @@ trait DataFrameSuiteBaseLike extends SparkContextProvider
   }
 
   def approxEquals(r1: Row, r2: Row, tol: Double): Boolean = {
-    DataFrameSuiteBase.approxEquals(r1, r2, tol, Duration.ofNanos((tol*1000).toLong))
+    DataFrameSuiteBase.approxEquals(r1, r2, tol, Duration.ofMillis(tol.toLong))
   }
 
   def approxEquals(r1: Row, r2: Row, tolTimestamp: Duration): Boolean = {

core/src/main/2.0/scala/com/holdenkarau/spark/testing/DatasetSuiteBase.scala

@@ -45,21 +45,16 @@ trait DatasetSuiteBaseLike extends DataFrameSuiteBaseLike {
     *
     * @param tol        max acceptable tolerance for numeric (between(0, 1)) &
     *                   timestamp (millis).
-    * @param customShow unit function to customize the '''show''' method
-    *                   when dataframes are not equal. IE: '''df.show(false)''' or
-    *                   '''df.toJSON.show(false)'''.
     */
   @deprecated(
     "Use `assertDatasetApproximateEquals` with timestamp tolerance",
     since = "1.5.0"
   )
-  def assertDatasetApproximateEquals[U]
-    (expected: Dataset[U], result: Dataset[U], tol: Double,
-     customShow: DataFrame => Unit = _.show())
+  def assertDatasetApproximateEquals[U](expected: Dataset[U], result: Dataset[U],
+                                        tol: Double)
     (implicit UCT: ClassTag[U]): Unit = {
-
     assertDataFrameApproximateEquals(expected.toDF, result.toDF, tol,
-      Duration.ofNanos((tol * 1000).toLong), customShow)
+      Duration.ofMillis(tol.toLong), _.show())
   }
 
   /**