summaryrefslogtreecommitdiff
path: root/examples/crossBuilds/simple2/js
diff options
context:
space:
mode:
authorLi Haoyi <haoyi@dropbox.com>2014-11-09 23:11:06 -0800
committerLi Haoyi <haoyi@dropbox.com>2014-11-09 23:11:06 -0800
commitaaea4afbf3b47d623f396cb1eae247fa92053032 (patch)
treed462a508e545d5ec3637557b632cd0b7366e56cd /examples/crossBuilds/simple2/js
parent52306f10ce3d1e462b171688de04b37174c0b74a (diff)
downloadhands-on-scala-js-aaea4afbf3b47d623f396cb1eae247fa92053032.tar.gz
hands-on-scala-js-aaea4afbf3b47d623f396cb1eae247fa92053032.tar.bz2
hands-on-scala-js-aaea4afbf3b47d623f396cb1eae247fa92053032.zip
.
Diffstat (limited to 'examples/crossBuilds/simple2/js')
-rw-r--r--examples/crossBuilds/simple2/js/shared/main/scala/simple/Simple.scala4
-rw-r--r--examples/crossBuilds/simple2/js/shared/test/scala/simple/SimpleTest.scala15
-rw-r--r--examples/crossBuilds/simple2/js/src/main/scala/simple/Platform.scala2
3 files changed, 14 insertions, 7 deletions
diff --git a/examples/crossBuilds/simple2/js/shared/main/scala/simple/Simple.scala b/examples/crossBuilds/simple2/js/shared/main/scala/simple/Simple.scala
index d3b0278..4ed0285 100644
--- a/examples/crossBuilds/simple2/js/shared/main/scala/simple/Simple.scala
+++ b/examples/crossBuilds/simple2/js/shared/main/scala/simple/Simple.scala
@@ -1,7 +1,7 @@
/*shared/main/scala/simple/Simple.scala*/
package simple
object Simple{
- def formatTimes(timestamps: Seq[Long]): String = {
- timestamps.map(Platform.format).mkString("\n")
+ def formatTimes(timestamps: Seq[Long]): Seq[String] = {
+ timestamps.map(Platform.format).map(_.dropRight(5))
}
} \ No newline at end of file
diff --git a/examples/crossBuilds/simple2/js/shared/test/scala/simple/SimpleTest.scala b/examples/crossBuilds/simple2/js/shared/test/scala/simple/SimpleTest.scala
index ec6b29f..b348c6f 100644
--- a/examples/crossBuilds/simple2/js/shared/test/scala/simple/SimpleTest.scala
+++ b/examples/crossBuilds/simple2/js/shared/test/scala/simple/SimpleTest.scala
@@ -5,9 +5,16 @@ import utest._
object SimpleTest extends TestSuite{
val tests = TestSuite{
'format{
- 'nil - assert(Simple.formatTimes(Nil) == "")
- 'timeZero - assert(
- Simple.formatTimes(Seq(0)) == "December 31, 1969 4:00:00 PM PST")
- }
+ 'nil - assert(Simple.formatTimes(Nil) == Nil)
+ 'timeZero - {
+ val timestamps = Seq(0L, 1L << 32)
+ val expected = Seq(
+ "1970-01-01T00:00:00",
+ "1970-02-19T17:02:47"
+ )
+ val formatted = Simple.formatTimes(timestamps)
+ assert(formatted == expected)
+ }
+ }
}
} \ No newline at end of file
diff --git a/examples/crossBuilds/simple2/js/src/main/scala/simple/Platform.scala b/examples/crossBuilds/simple2/js/src/main/scala/simple/Platform.scala
index 2a02a5e..42cc7dc 100644
--- a/examples/crossBuilds/simple2/js/src/main/scala/simple/Platform.scala
+++ b/examples/crossBuilds/simple2/js/src/main/scala/simple/Platform.scala
@@ -4,6 +4,6 @@ import scala.scalajs.js
object Platform{
def format(ts: Long) = {
- new js.Date(ts).toLocaleString()
+ new js.Date(ts).toISOString()
}
} \ No newline at end of file