fix: testing

hablapps · Aug 16, 2023 · 235709e · 235709e
1 parent ac5a787
commit 235709e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/core/src/main/scala/doric/syntax/NumericColumns.scala b/core/src/main/scala/doric/syntax/NumericColumns.scala
@@ -582,7 +582,8 @@ protected trait NumericColumns {
       *
       * @todo decimal type
       * @group Numeric Type
-      * @see [[org.apache.spark.sql.functions.round(e:org\.apache\.spark\.sql\.Column,scale:* org.apache.spark.sql.functions.round]]
+      * @see org.apache.spark.sql.functions.round
+      * @todo scaladoc link (issue #135)
       */
     def round(scale: IntegerColumn): DoricColumn[T] = (column.elem, scale.elem)
       .mapN((c, s) => new Column(Round(c.expr, s.expr)))

diff --git a/core/src/test/scala/doric/syntax/NumericOperationsSpec.scala b/core/src/test/scala/doric/syntax/NumericOperationsSpec.scala
@@ -546,16 +546,6 @@ trait NumericOperationsSpec
         )
       }
 
-      it(s"round function with scale and round mode") {
-        val scale = 2
-        val mode  = BigDecimal.RoundingMode.FLOOR
-        testOnlyDoricDecimals[T, T](
-          List(Some(1.466666f), Some(0.7111111f), Some(1.0f), None),
-          List(Some(1.46f), Some(0.71f), Some(1.0f), None),
-          _.round(scale.lit, mode)
-        )
-      }
-
       it(s"naNvl function with param") {
         testDoricSparkDecimals2[T, T, T](
           List(

diff --git a/core/src/test/spark_3.1_3.2_3.3_3.4/scala/doric/syntax/Numeric31Spec.scala b/core/src/test/spark_3.1_3.2_3.3_3.4/scala/doric/syntax/Numeric31Spec.scala
@@ -7,6 +7,7 @@ import doric.Equalities._
 import doric.types.NumericType
 import doric.types.SparkType.Primitive
 import java.sql.Timestamp
+import org.scalactic.Equality
 import org.scalatest.funspec.AnyFunSpecLike
 
 import org.apache.spark.sql.{DataFrame, SparkSession, functions => f}
@@ -19,7 +20,7 @@ trait NumericOperations31Spec
   def df: DataFrame
 
   import scala.reflect.runtime.universe._
-  def test[T: NumericType: Primitive: ClassTag: TypeTag]()(implicit
+  def test[T: NumericType: Primitive: ClassTag: TypeTag: Equality]()(implicit
       spark: SparkSession,
       fun: FromInt[T]
   ): Unit = {
@@ -48,7 +49,7 @@ trait NumericOperations31Spec
     }
   }
 
-  def testDecimals[T: NumWithDecimalsType: Primitive: ClassTag: TypeTag]()(
+  def testDecimals[T: NumWithDecimalsType: Primitive: ClassTag: TypeTag: Equality]()(
       implicit
       spark: SparkSession,
       fun: FromFloat[T]
@@ -64,14 +65,22 @@ trait NumericOperations31Spec
           f.atanh
         )
       }
+
+      it(s"round function with scale and round mode") {
+        val scale = 2
+        val mode = BigDecimal.RoundingMode.FLOOR
+        testOnlyDoricDecimals[T, T](
+          List(Some(1.466666f), Some(0.7111111f), Some(1.0f), None),
+          List(Some(1.46f), Some(0.71f), Some(1.0f), None),
+          _.round(scale.lit, mode)
+        )
+      }
     }
   }
 }
 
 class Numeric31Spec
     extends SparkSessionTestWrapper
-    with AnyFunSpecLike
-    with TypedColumnTest
     with NumericOperations31Spec {
 
   import spark.implicits._