Skip to content

Commit

Permalink
Fix tests after removing form-id from expr and return
Browse files Browse the repository at this point in the history
  • Loading branch information
@jpmonettas
jpmonettas committed Dec 21, 2023
1 parent 6f4da3d commit bc130a1
Show file tree
Hide file tree
Showing 4 changed files with 148 additions and 148 deletions.
120 changes: 60 additions & 60 deletions src/test/cljs/cljs/storm/bodies_test.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
(let [r (b/tried)]
(is (= 4 r) "function return should be right.")
(is (= [[:fn-call "cljs.storm.tests-code.bodies" "tried" [] 375669735]
[:expr-exec 2 "3,1" 375669735]
[:expr-exec "#object[...]" "3,2,1" 375669735]
[:expr-exec 2 "3,1"]
[:expr-exec "#object[...]" "3,2,1"]
[:bind "e" "#object[...]" ""]
[:fn-return 4 "3,3,3" 375669735]]
[:fn-return 4 "3,3,3"]]
(u/capture)) "captured traces should match.")))

(deftest letfn-test
Expand All @@ -21,11 +21,11 @@
(is (= [[:fn-call "cljs.storm.tests-code.bodies" "letfn-fn" [] 1673004201]
[:fn-call "cljs.storm.tests-code.bodies" "square" [2] 1673004201]
[:bind "x" 2 ""]
[:expr-exec 2 "3,1,0,2,1" 1673004201]
[:expr-exec 2 "3,1,0,2,2" 1673004201]
[:fn-return 4 "3,1,0,2" 1673004201]
[:expr-exec 4 "3,2,2" 1673004201]
[:fn-return 5 "3,2" 1673004201]]
[:expr-exec 2 "3,1,0,2,1"]
[:expr-exec 2 "3,1,0,2,2"]
[:fn-return 4 "3,1,0,2"]
[:expr-exec 4 "3,2,2"]
[:fn-return 5 "3,2"]]
(u/capture)) "captured traces should match.")))

(deftest loops-test
Expand All @@ -37,120 +37,120 @@

[:bind "s" 0 "3"]
[:bind "n" 2 "3"]
[:expr-exec 2 "3,2,1,1" -1606941997]
[:expr-exec false "3,2,1" -1606941997]
[:expr-exec 0 "3,2,3,1,1" -1606941997]
[:expr-exec 2 "3,2,3,1,2" -1606941997]
[:expr-exec 2 "3,2,3,1" -1606941997]
[:expr-exec 2 "3,2,3,2,1" -1606941997]
[:expr-exec 1 "3,2,3,2" -1606941997]
[:expr-exec 2 "3,2,1,1"]
[:expr-exec false "3,2,1"]
[:expr-exec 0 "3,2,3,1,1"]
[:expr-exec 2 "3,2,3,1,2"]
[:expr-exec 2 "3,2,3,1"]
[:expr-exec 2 "3,2,3,2,1"]
[:expr-exec 1 "3,2,3,2"]

[:bind "s" 2 "3"]
[:bind "n" 1 "3"]
[:expr-exec 1 "3,2,1,1" -1606941997]
[:expr-exec false "3,2,1" -1606941997]
[:expr-exec 2 "3,2,3,1,1" -1606941997]
[:expr-exec 1 "3,2,3,1,2" -1606941997]
[:expr-exec 3 "3,2,3,1" -1606941997]
[:expr-exec 1 "3,2,3,2,1" -1606941997]
[:expr-exec 0 "3,2,3,2" -1606941997]
[:expr-exec 1 "3,2,1,1"]
[:expr-exec false "3,2,1"]
[:expr-exec 2 "3,2,3,1,1"]
[:expr-exec 1 "3,2,3,1,2"]
[:expr-exec 3 "3,2,3,1"]
[:expr-exec 1 "3,2,3,2,1"]
[:expr-exec 0 "3,2,3,2"]

[:bind "s" 3 "3"]
[:bind "n" 0 "3"]
[:expr-exec 0 "3,2,1,1" -1606941997]
[:expr-exec true "3,2,1" -1606941997]
[:expr-exec 0 "3,2,1,1"]
[:expr-exec true "3,2,1"]

[:fn-return 3 "3,2,2" -1606941997]]
[:fn-return 3 "3,2,2"]]
(u/capture)) "captured traces should match.")))

(deftest let-test
(let [r (b/letter)]
(is (= 15 r) "function return should be right.")
(is (= [[:fn-call "cljs.storm.tests-code.bodies" "letter" [] 844078910]
[:bind "a" 5 "3"]
[:expr-exec 5 "3,1,3,1" 844078910]
[:expr-exec 10 "3,1,3" 844078910]
[:expr-exec 5 "3,1,3,1"]
[:expr-exec 10 "3,1,3"]
[:bind "b" 10 "3"]
[:expr-exec 5 "3,1,5,1,1,1" 844078910]
[:expr-exec 10 "3,1,5,1,1,2" 844078910]
[:expr-exec 15 "3,1,5,1,1" 844078910]
[:expr-exec 5 "3,1,5,1,1,1"]
[:expr-exec 10 "3,1,5,1,1,2"]
[:expr-exec 15 "3,1,5,1,1"]
[:bind "z" 15 "3,1,5"]
[:bind "c" 15 "3"]
[:fn-return 15 "3,2" 844078910]]
[:fn-return 15 "3,2"]]
(u/capture)) "captured traces should match.")))

(deftest case-test
(let [r (b/casey :first)]
(is (= 42 r) "function return should be right.")
(is (= [[:fn-call "cljs.storm.tests-code.bodies" "casey" [":first"] -742825312]
[:bind "x" ":first" ""]
[:expr-exec ":first" "3,1" -742825312]
[:fn-return 42 "3,3" -742825312]]
[:expr-exec ":first" "3,1"]
[:fn-return 42 "3,3"]]
(u/capture)) "captured traces should match.")))

(deftest do-test
(let [r (b/doer)]
(is (= 8 r) "function return should be right.")
(is (= [[:fn-call "cljs.storm.tests-code.bodies" "doer" [] -1895706795]
[:expr-exec 2 "3,1" -1895706795]
[:expr-exec 4 "3,2" -1895706795]
[:expr-exec 6 "3,3,1" -1895706795]
[:fn-return 8 "3,3,2" -1895706795]]
[:expr-exec 2 "3,1"]
[:expr-exec 4 "3,2"]
[:expr-exec 6 "3,3,1"]
[:fn-return 8 "3,3,2"]]
(u/capture)) "captured traces should match.")))

(deftest set!-test
(let [r (b/setter)]
(is (= 42 r) "function return should be right.")
(is (= [[:fn-call "cljs.storm.tests-code.bodies" "setter" [] 807580509]
[:expr-exec 2 "3" 807580509]
[:expr-exec 40 "4" 807580509]
#_[:expr-exec 2 "5,1" 807580509] ;; TODO: bring this back
#_[:expr-exec 40 "5,2" 807580509]
[:fn-return 42 "5" 807580509]]
[:expr-exec 2 "3"]
[:expr-exec 40 "4"]
#_[:expr-exec 2 "5,1"] ;; TODO: bring this back
#_[:expr-exec 40 "5,2"]
[:fn-return 42 "5"]]
(u/capture)) "captured traces should match.")))

(deftest interop-test
(let [r (b/interopter #js {:num 2 :f (fn f [x] x)})]
(is (= 42 r) "function return should be right.")
(is (= [[:fn-call "cljs.storm.tests-code.bodies" "interopter" ["#js {:num 2, :f #object[...]}"] 919708180]
[:bind "o" "#js {:num 2, :f #object[...]}" ""]
[:expr-exec "#js {:num 2, :f #object[...]}" "3,1,1" 919708180]
[:expr-exec 2 "3,1" 919708180]
[:expr-exec "#js {:num 2, :f #object[...]}" "3,2,1" 919708180]
[:expr-exec 40 "3,2" 919708180]
[:fn-return 42 "3" 919708180]]
[:expr-exec "#js {:num 2, :f #object[...]}" "3,1,1"]
[:expr-exec 2 "3,1"]
[:expr-exec "#js {:num 2, :f #object[...]}" "3,2,1"]
[:expr-exec 40 "3,2"]
[:fn-return 42 "3"]]
(u/capture)) "captured traces should match.")))

(deftest integration-1-test
(let [r (b/integration-1 {:x 2})]
(is (= 4 r) "function return should be right.")
(is (= [[:fn-call "cljs.storm.tests-code.bodies" "integration-1" [{:x 2}] -608980379]
[:bind "m" {:x 2} ""]
[:expr-exec {:x 2} "3,1,1,1,1" -608980379]
[:expr-exec true "3,1,1,1" -608980379]
[:expr-exec {:x 2} "3,1,1,2,1" -608980379]
[:expr-exec 2 "3,1,1,2" -608980379]
[:expr-exec {:x 2} "3,1,1,1,1"]
[:expr-exec true "3,1,1,1"]
[:expr-exec {:x 2} "3,1,1,2,1"]
[:expr-exec 2 "3,1,1,2"]
[:bind "x" 2 "3"]
[:expr-exec 2 "3,2,1" -608980379]
[:expr-exec 2 "3,2,2" -608980379]
[:fn-return 4 "3,2" -608980379]]
[:expr-exec 2 "3,2,1"]
[:expr-exec 2 "3,2,2"]
[:fn-return 4 "3,2"]]
(u/capture)) "captured traces should match.")))

(deftest js-fn-call-test
(let [r (b/js-fn-call)]
(is (instance? js/Promise r) "function return should be right.")
(is (= [[:fn-call "cljs.storm.tests-code.bodies" "js-fn-call" [] -166767748]
[:fn-return "#object[...]" "3" -166767748]]
[:fn-return "#object[...]" "3"]]
(u/capture)) "captured traces should match.")))

(deftest clj-fn-call-test
(let [r (b/clj-fn-call {})]
(is (= {:a {:b 42}, [:c] 42} r) "function return should be right.")
(is (= [[:fn-call "cljs.storm.tests-code.bodies" "clj-fn-call" [{}] -1988855813]
[:bind "m" {} ""]
[:expr-exec {} "3,1,1" -1988855813]
[:expr-exec {:a {:b 42}} "3,1" -1988855813]
[:expr-exec {} "3,2,1" -1988855813]
[:expr-exec {[:c] 42} "3,2" -1988855813]
[:fn-return {:a {:b 42}, [:c] 42} "3" -1988855813]]
[:expr-exec {} "3,1,1"]
[:expr-exec {:a {:b 42}} "3,1"]
[:expr-exec {} "3,2,1"]
[:expr-exec {[:c] 42} "3,2"]
[:fn-return {:a {:b 42}, [:c] 42} "3"]]
(u/capture)) "captured traces should match.")))
Loading

0 comments on commit bc130a1

Please sign in to comment.