finos#1296 fix failing tests in IgniteSqlFilteringTest

junaidzm13 · Apr 29, 2024 · b8ef0b5 · b8ef0b5
1 parent 36e6c13
commit b8ef0b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/...te-plugin/src/test/scala/org/finos/vuu/feature/ignite/filter/IgniteSqlFilteringTest.scala b/...te-plugin/src/test/scala/org/finos/vuu/feature/ignite/filter/IgniteSqlFilteringTest.scala
@@ -47,10 +47,10 @@ class IgniteSqlFilteringTest extends IgniteTestsBase {
       assertEquavalent(filterResult.toArray, Array(testOrder3))
     }
 
-    Scenario("Support mapped field types - [ java.sql.Data -> Long]") {
+    Scenario("Support mapped field types - [ java.sql.Date -> Long ]") {
       givenOrderExistInIgnite(testOrder1, testOrder2, testOrder3)
 
-      val filterResult = applyFilter("createdAt > 1704038400000")
+      val filterResult = applyFilter(s"createdAt > ${getTime("2024-01-01")}")
 
       assertEquavalent(filterResult.toArray, Array(testOrder3))
     }
@@ -170,10 +170,10 @@ class IgniteSqlFilteringTest extends IgniteTestsBase {
     }
 
 
-    Scenario("Support mapped field types - [ java.sql.Data -> Long]") {
+    Scenario("Support mapped field types - [ java.sql.Date -> Long]") {
       givenOrderExistInIgnite(testOrder1, testOrder2, testOrder3)
 
-      val filterResult = applyFilter("createdAt <= 1704038400000")
+      val filterResult = applyFilter(s"createdAt <= ${getTime("2024-01-01")}")
 
       assertEquavalent(filterResult.toArray, Array(testOrder1, testOrder2))
     }
@@ -227,7 +227,7 @@ class IgniteSqlFilteringTest extends IgniteTestsBase {
     Scenario("Support mapped type - [java.sql.Date -> Long]") {
       givenOrderExistInIgnite(testOrder1, testOrder2, testOrder3)
 
-      val filterResult = applyFilter("createdAt = 1602259200000")
+      val filterResult = applyFilter(s"createdAt = ${getTime("2020-10-10")}")
 
       assertEquavalent(filterResult.toArray, Array(testOrder3))
     }
@@ -297,7 +297,7 @@ class IgniteSqlFilteringTest extends IgniteTestsBase {
     Scenario("Support mapped type - [java.sql.Date -> Long]") {
       givenOrderExistInIgnite(testOrder1, testOrder2, testOrder3)
 
-      val filterResult = applyFilter("createdAt != 1704902400000")
+      val filterResult = applyFilter(s"createdAt != ${getTime("2024-01-11")}")
 
       assertEquavalent(filterResult.toArray, Array(testOrder2, testOrder3))
     }
@@ -513,7 +513,7 @@ class IgniteSqlFilteringTest extends IgniteTestsBase {
     Scenario("supports mapped field types - [ java.sql.Date -> Long ]") {
       givenOrderExistInIgnite(testOrder1, testOrder2, testOrder3)
 
-      val filterResult = applyFilter("createdAt in [1580313600000]")
+      val filterResult = applyFilter(s"createdAt in [${getTime("2020-01-30")}]")
 
       assertEquavalent(filterResult.toArray, Array(testOrder3))
     }
@@ -578,4 +578,5 @@ class IgniteSqlFilteringTest extends IgniteTestsBase {
     .with2WayConverter[BigDecimal, Double](classOf[BigDecimal], classOf[Double], _.doubleValue(), BigDecimal.valueOf)
     .build()
 
+  private def getTime(date: String): Long = Date.valueOf(date).getTime
 }
diff --git a/vuu/src/main/scala/org/finos/vuu/util/schema/SchemaMapper.scala b/vuu/src/main/scala/org/finos/vuu/util/schema/SchemaMapper.scala
@@ -2,7 +2,7 @@ package org.finos.vuu.util.schema
 
 import org.finos.vuu.core.table.Column
 import org.finos.vuu.util.schema.SchemaMapper.InvalidSchemaMapException
-import org.finos.vuu.util.types.{TypeConverter, TypeConverterContainer, TypeConverterContainerBuilder, TypeUtils}
+import org.finos.vuu.util.types.{DefaultTypeConverters, TypeConverter, TypeConverterContainer, TypeConverterContainerBuilder, TypeUtils}
 
 import scala.util.Try