solve conflict

Author: ArielA147

test/clojurians_log/slack_msg_test.clj

@@ -1,6 +1,6 @@
 (ns clojurians-log.slack-mgs-test
   (:require [clojurians-log.db.queries :as queries]
-            [clojurians-log.time-util :as time-util]
+            [time-literals.data-readers]
             [clojure.test :refer :all]))
 
 (deftest filter-channel-day-messages-test
@@ -9,49 +9,56 @@
                                                      :message/thread-ts "1512384953.000000"}]))))
   (testing "thread parents should be retained"
     (is (= #:message{:ts   "1014090027.000404"
-                   :inst (time-util/ts->inst "1014090027.000404")}
+                     :inst #time/instant "2002-02-19T03:40:27.000404Z"}
         (first(queries/filter-channel-day-messages  [{:message/ts "1014090027.000404"}])))))
   (testing "broadcast messages should be retained"
     (is (=
          #:message{:ts                "1518095027.000404"
                    :thread-ts         "1518040988.000079"
                    :thread-broadcast? true
                    :top-level?        true
-                   :inst              (time-util/ts->inst "1518095027.000404")}
+                   :inst               #time/instant "2018-02-08T13:03:47.000404Z"}
          (first (queries/filter-channel-day-messages [{:message/ts                "1518095027.000404"
                                                        :message/thread-ts         "1518040988.000079"
                                                        :message/thread-broadcast? true}
                                                       {:message/ts        "1014090027.000404"
                                                        :message/thread-ts "1010040908.000079"}])))))
   (testing "should be sorted by timestamp"
-    (is (=(type
-           {#:messages{:ts   "1512389691.000900"
-                       :inst (time-util/ts->inst "1512389691.000900")}
-            #:messages{:ts   "1512394953.120000"
-                       :inst (time-util/ts->inst "1512394953.120000")}
-            #:messages{:ts   "1518384553.060000"
-                       :inst (time-util/ts->inst "1518384553.060000")}
-            #:messages{:ts   "1518989553.060000"
-                       :inst (time-util/ts->inst "1518989553.060000")}})
-         (type (queries/filter-channel-day-messages [{:message/ts "1518989553.060000"}
-                                                     {:message/ts "1512394953.120000"}
-                                                     {:message/ts "1512389691.000900"}
-                                                     {:message/ts "1518384553.060000"}]))))))
+    (is (=
+         {#:messages{:ts   "1512389691.000900"
+                     :inst  #time/instant "2017-12-04T12:14:51.000900Z"}
+          #:messages{:ts   "1512394953.120000"
+                     :inst  #time/instant "2017-12-04T13:42:33.120Z"}
+          #:messages{:ts   "1518384553.060000"
+                     :inst  #time/instant "2018-02-11T21:29:13.060Z"}
+          #:messages{:ts   "1518989553.060000"
+                     :inst #time/instant "2018-02-18T21:32:33.060Z"}}
+         (queries/filter-channel-day-messages [{:message/ts "1518989553.060000"}
+                                               {:message/ts "1512394953.120000"}
+                                               {:message/ts "1512389691.000900"}
+                                               {:message/ts "1518384553.060000"}])))))
 (testing "should get the message/inst added to the messages"
-  (is (= (type {#:messages {:ts   "1014090027.000404"
-                            :inst (time-util/ts->inst "1014090027.000404")}
-                #:messages {:ts                "1518384553.060000"
-                            :thread-broadcast? true
-                            :top-level         true
-                            :inst               (time-util/ts->inst "1518384553.060000")}})
-          (type (queries/filter-channel-day-messages  [{:message/ts "1014090027.000404"}
-                                                       {:message/ts                "1218384553.060000"
-                                                        :message/thread-broadcast? true}])))))
+  (is (= {#:messages {:ts   "1014090027.000404"
+                      :inst #time/instant "2002-02-19T03:40:27.000404Z"}
+          #:messages {:ts                "1518384553.060000"
+                      :thread-broadcast? true
+                      :top-level         true
+                      :inst              #time/instant "2018-02-11T21:29:13.060Z"}}
+          (queries/filter-channel-day-messages  [{:message/ts "1014090027.000404"}
+                                                 {:message/ts                "1218384553.060000"
+                                                  :message/thread-broadcast? true}]))))
 (testing "top-level messages should get marked as :message/top-level?"
-  (is (=
-       #:message{:ts                "1014090027.000404"
-                 :thread-broadcast? true
-                 :top-level?        true
-                 :inst            (time-util/ts->inst "1014090027.000404")}
-       (first (queries/filter-channel-day-messages  [{:message/ts                "1014090027.000404"
-                                                      :message/thread-broadcast? true}])))))
+  (is (= {#:message{:ts                "1014090027.000404"
+                    :thread-broadcast? true
+                    :top-level?        true
+                    :inst              #time/instant "2002-02-19T03:40:27.000404Z"}
+          #:message{:ts                "1518008583.000370"
+                    :thread-ts 1517995093.000487
+                    :thread-broadcast? true
+                    :top-level?        true
+                    :inst              #time/instant "2018-02-07T13:03:03.000370Z"}}
+        (queries/filter-channel-day-messages  [{:message/ts                "1014090027.000404"
+                                                :message/thread-broadcast? true}
+                                                {:message/ts                "1518008583.000370"
+                                                 :message/thread-ts         "1517995093.000487"
+                                                 :message/thread-broadcast? true}]))))