diff options
author | Zach Smith <zach@driver.xyz> | 2017-03-06 19:13:16 -0800 |
---|---|---|
committer | Zach Smith <zach@driver.xyz> | 2017-03-06 19:13:16 -0800 |
commit | 278b15ce4ac191f3133c6cd9f5a0e36dcb12a7b9 (patch) | |
tree | e30852f65f5efde1541f6b2a58ab705f365657be /src | |
parent | c676b2b3b774d332f9e303a873db5688de657352 (diff) | |
download | driver-core-278b15ce4ac191f3133c6cd9f5a0e36dcb12a7b9.tar.gz driver-core-278b15ce4ac191f3133c6cd9f5a0e36dcb12a7b9.tar.bz2 driver-core-278b15ce4ac191f3133c6cd9f5a0e36dcb12a7b9.zip |
Remove arithmetic from year component in date conversion. Add unit tests
Diffstat (limited to 'src')
-rw-r--r-- | src/main/scala/xyz/driver/core/database/package.scala | 4 | ||||
-rw-r--r-- | src/test/scala/xyz/driver/core/database/DatabaseTest.scala | 14 |
2 files changed, 15 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/core/database/package.scala b/src/main/scala/xyz/driver/core/database/package.scala index c88260b..32b240e 100644 --- a/src/main/scala/xyz/driver/core/database/package.scala +++ b/src/main/scala/xyz/driver/core/database/package.scala @@ -23,9 +23,7 @@ package object database { private[database] def dateToSqlDate(date: Date): SqlDate = { val cal = Calendar.getInstance() - cal.set(Calendar.YEAR, date.year - 1900) - cal.set(Calendar.MONTH, date.month) - cal.set(Calendar.DAY_OF_MONTH, date.day) + cal.set(date.year, date.month, date.day, 0, 0, 0) new SqlDate(cal.getTime.getTime) } } diff --git a/src/test/scala/xyz/driver/core/database/DatabaseTest.scala b/src/test/scala/xyz/driver/core/database/DatabaseTest.scala new file mode 100644 index 0000000..dafcd80 --- /dev/null +++ b/src/test/scala/xyz/driver/core/database/DatabaseTest.scala @@ -0,0 +1,14 @@ +package xyz.driver.core.database + +import org.scalatest.{FlatSpec, Matchers} +import org.scalatest.prop.Checkers + +class DatabaseTest extends FlatSpec with Matchers with Checkers { + "Date SQL converter" should "correctly convert back and forth to SQL dates" in { + import xyz.driver.core.generators.nextDate + + for (date <- 1 to 100 map (_ => nextDate())) { + sqlDateToDate(dateToSqlDate(date)) should be(date) + } + } +} |