Repository: spark
Updated Branches:
  refs/heads/branch-1.4 4b31a07b6 -> 79bb7dcec


[CORE] [TEST] Fix SimpleDateParamTest

```
sbt.ForkMain$ForkError: 1424424077190 was not equal to 1424474477190
        at 
org.scalatest.MatchersHelper$.newTestFailedException(MatchersHelper.scala:160)
        at 
org.scalatest.Matchers$ShouldMethodHelper$.shouldMatcher(Matchers.scala:6231)
        at org.scalatest.Matchers$AnyShouldWrapper.should(Matchers.scala:6265)
        at 
org.apache.spark.status.api.v1.SimpleDateParamTest$$anonfun$1.apply$mcV$sp(SimpleDateParamTest.scala:25)
        at 
org.apache.spark.status.api.v1.SimpleDateParamTest$$anonfun$1.apply(SimpleDateParamTest.scala:23)
        at 
org.apache.spark.status.api.v1.SimpleDateParamTest$$anonfun$1.apply(SimpleDateParamTest.scala:23)
        at 
org.scalatest.Transformer$$anonfun$apply$1.apply$mcV$sp(Transformer.scala:22)
        at org.scalatest.OutcomeOf$class.outcomeOf(OutcomeOf.scala:85)
        at org.scalatest.OutcomeOf$.outcomeOf(OutcomeOf.scala:104)
        at org.scalatest.Transformer.apply(Transformer.scala:22)
        at org.scalatest.Transformer.apply(Transformer.scala:20)
        at org.scalatest.FunSuiteLike$$anon$1.apply(FunSuiteLike.scala:166)
        at org.scalatest.Suite$class.withFixture(Suite.scala:
```

Set timezone to fix SimpleDateParamTest

Author: scwf <wangf...@huawei.com>
Author: Fei Wang <wangf...@huawei.com>

Closes #6377 from scwf/fix-SimpleDateParamTest and squashes the following 
commits:

b8df1e5 [Fei Wang] Update SimpleDateParamSuite.scala
8bb74f0 [scwf] fix SimpleDateParamSuite

(cherry picked from commit bf49c22130af9a729dcc510743e4c1ea4c5d2439)
Signed-off-by: Imran Rashid <iras...@cloudera.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/79bb7dce
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/79bb7dce
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/79bb7dce

Branch: refs/heads/branch-1.4
Commit: 79bb7dcecac8e53c83700ae4f1551ef617049f42
Parents: 4b31a07
Author: scwf <wangf...@huawei.com>
Authored: Tue May 26 08:42:52 2015 -0500
Committer: Imran Rashid <iras...@cloudera.com>
Committed: Tue May 26 08:43:36 2015 -0500

----------------------------------------------------------------------
 .../status/api/v1/SimpleDateParamSuite.scala    | 29 ++++++++++++++++++++
 .../status/api/v1/SimpleDateParamTest.scala     | 29 --------------------
 2 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/79bb7dce/core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamSuite.scala
----------------------------------------------------------------------
diff --git 
a/core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamSuite.scala 
b/core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamSuite.scala
new file mode 100644
index 0000000..731d1f5
--- /dev/null
+++ 
b/core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamSuite.scala
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.spark.status.api.v1
+
+import org.scalatest.{Matchers, FunSuite}
+
+class SimpleDateParamSuite extends FunSuite with Matchers {
+
+  test("date parsing") {
+    new SimpleDateParam("2015-02-20T23:21:17.190GMT").timestamp should be 
(1424474477190L)
+    new SimpleDateParam("2015-02-20T17:21:17.190EST").timestamp should be 
(1424470877190L)
+    new SimpleDateParam("2015-02-20").timestamp should be (1424390400000L) // 
GMT
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/spark/blob/79bb7dce/core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamTest.scala
----------------------------------------------------------------------
diff --git 
a/core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamTest.scala 
b/core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamTest.scala
deleted file mode 100644
index 5274df9..0000000
--- 
a/core/src/test/scala/org/apache/spark/status/api/v1/SimpleDateParamTest.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.spark.status.api.v1
-
-import org.scalatest.{Matchers, FunSuite}
-
-class SimpleDateParamTest extends FunSuite with Matchers {
-
-  test("date parsing") {
-    new SimpleDateParam("2015-02-20T23:21:17.190GMT").timestamp should be 
(1424474477190L)
-    new SimpleDateParam("2015-02-20T17:21:17.190CST").timestamp should be 
(1424474477190L)
-    new SimpleDateParam("2015-02-20").timestamp should be (1424390400000L)  // 
GMT
-  }
-
-}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to