✨ Add test runner for cljs on common module

In the same way as frontend tests are run and fix some
tokens related tests

common/test/common_tests/runner.cljc

@@ -0,0 +1,89 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns common-tests.runner
+  (:require
+   [clojure.test :as t]
+   [common-tests.colors-test]
+   [common-tests.data-test]
+   [common-tests.files-builder-test]
+   [common-tests.files-changes-test]
+   [common-tests.files-migrations-test]
+   [common-tests.geom-point-test]
+   [common-tests.geom-shapes-test]
+   [common-tests.geom-test]
+   [common-tests.logic.chained-propagation-test]
+   [common-tests.logic.comp-creation-test]
+   [common-tests.logic.comp-detach-with-nested-test]
+   [common-tests.logic.comp-remove-swap-slots-test]
+   [common-tests.logic.comp-reset-test]
+   [common-tests.logic.comp-sync-test]
+   [common-tests.logic.comp-touched-test]
+   [common-tests.logic.copying-and-duplicating-test]
+   [common-tests.logic.duplicated-pages-test]
+   [common-tests.logic.move-shapes-test]
+   [common-tests.logic.multiple-nesting-levels-test]
+   [common-tests.logic.swap-and-reset-test]
+   [common-tests.logic.swap-as-override-test]
+   [common-tests.pages-helpers-test]
+   [common-tests.record-test]
+   [common-tests.schema-test]
+   [common-tests.svg-path-test]
+   [common-tests.svg-test]
+   [common-tests.text-test]
+   [common-tests.time-test]
+   [common-tests.types-modifiers-test]
+   [common-tests.types-shape-interactions-test]
+   [common-tests.types.shape-decode-encode-test]
+   [common-tests.types.tokens-lib-test]
+   [common-tests.types.types-component-test]
+   [common-tests.types.types-libraries-test]))
+
+#?(:cljs (enable-console-print!))
+
+#?(:cljs
+   (defmethod cljs.test/report [:cljs.test/default :end-run-tests] [m]
+     (if (cljs.test/successful? m)
+       (.exit js/process 0)
+       (.exit js/process 1))))
+
+(defn -main
+  [& args]
+  (t/run-tests
+   'common-tests.colors-test
+   'common-tests.data-test
+   'common-tests.files-builder-test
+   'common-tests.files-changes-test
+   'common-tests.files-migrations-test
+   'common-tests.geom-point-test
+   'common-tests.geom-shapes-test
+   'common-tests.geom-test
+   'common-tests.logic.chained-propagation-test
+   'common-tests.logic.comp-creation-test
+   'common-tests.logic.comp-detach-with-nested-test
+   'common-tests.logic.comp-remove-swap-slots-test
+   'common-tests.logic.comp-reset-test
+   'common-tests.logic.comp-sync-test
+   'common-tests.logic.comp-touched-test
+   'common-tests.logic.copying-and-duplicating-test
+   'common-tests.logic.duplicated-pages-test
+   'common-tests.logic.move-shapes-test
+   'common-tests.logic.multiple-nesting-levels-test
+   'common-tests.logic.swap-and-reset-test
+   'common-tests.logic.swap-as-override-test
+   'common-tests.pages-helpers-test
+   'common-tests.record-test
+   'common-tests.schema-test
+   'common-tests.svg-path-test
+   'common-tests.svg-test
+   'common-tests.text-test
+   'common-tests.types-modifiers-test
+   'common-tests.types-shape-interactions-test
+   'common-tests.types.shape-decode-encode-test
+   'common-tests.types.types-component-test
+   'common-tests.types.types-libraries-test
+   'common-tests.types.tokens-lib-test
+   'common-tests.time-test))

common/test/common_tests/time_test.cljc

@@ -0,0 +1,16 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns common-tests.time-test
+  (:require
+   [app.common.time :as dt]
+   [clojure.test :as t]))
+
+(t/deftest compare-time
+  (let [dta (dt/parse-instant 10000)
+        dtb (dt/parse-instant 20000)]
+    (t/is (false? (dt/is-after? dta dtb)))
+    (t/is (true? (dt/is-before? dta dtb)))))

common/test/common_tests/types/shape_decode_encode_test.cljc

@@ -148,4 +148,4 @@
          ;; (app.common.pprint/pprint shape)
          ;; (app.common.pprint/pprint shape-3)
          (= shape shape-3)))
-     {:num 1000})))
+     {:num 100})))

common/test/common_tests/types/tokens_lib_test.cljc

@@ -14,8 +14,16 @@
    [app.common.types.tokens-lib :as ctob]
    [clojure.test :as t]))
 
-(t/testing "token"
-  (t/deftest make-token
+(defn setup-virtual-time
+  [next]
+  (let [current (volatile! (inst-ms (dt/now)))]
+    (with-redefs [dt/now #(dt/parse-instant (vswap! current inc))]
+      (next))))
+
+(t/use-fixtures :once setup-virtual-time)
+
+(t/deftest tokens
+  (t/testing "make-token"
     (let [now    (dt/now)
           token1 (ctob/make-token :name "test-token-1"
                                   :type :boolean
@@ -40,14 +48,14 @@
       (t/is (= (:modified-at token2) now))
       (t/is (ctob/valid-token? token2))))
 
-  (t/deftest invalid-tokens
+  (t/testing "invalid-tokens"
     (let [args {:name 777
                 :type :invalid}]
-      (t/is (thrown-with-msg? Exception #"expected valid token"
+      (t/is (thrown-with-msg? #?(:cljs js/Error :clj Exception) #"expected valid token"
                               (apply ctob/make-token args)))
       (t/is (false? (ctob/valid-token? {})))))
 
-  (t/deftest find-token-value-references
+  (t/testing "find-token-value-references"
     (t/testing "finds references inside curly braces in a string"
       (t/is (= #{"foo" "bar"} (ctob/find-token-value-references "{foo} + {bar}")))
       (t/testing "ignores extra text"
@@ -57,8 +65,8 @@
     (t/testing "handles edge-case for extra curly braces"
       (t/is (= #{"foo" "bar"} (ctob/find-token-value-references "{foo}} + {bar}"))))))
 
-(t/testing "token-set"
-  (t/deftest make-token-set
+(t/deftest token-set
+  (t/testing "make-token-set"
     (let [now        (dt/now)
           token-set1 (ctob/make-token-set :name "test-token-set-1")
           token-set2 (ctob/make-token-set :name "test-token-set-2"
@@ -76,13 +84,13 @@
       (t/is (= (:modified-at token-set2) now))
       (t/is (empty? (:tokens token-set2)))))
 
-  (t/deftest invalid-token-set
+  (t/testing "invalid-token-set"
     (let [args {:name 777
                 :description 999}]
-      (t/is (thrown-with-msg? Exception #"expected valid token set"
+      (t/is (thrown-with-msg? #?(:cljs js/Error :clj Exception) #"expected valid token set"
                               (apply ctob/make-token-set args)))))
 
-  (t/deftest move-token-set
+  (t/testing "move-token-set"
     (let [tokens-lib (-> (ctob/make-tokens-lib)
                          (ctob/add-set (ctob/make-token-set :name "A"))
                          (ctob/add-set (ctob/make-token-set :name "B"))
@@ -107,7 +115,7 @@
         (t/is (= original-order (move "A" "foo/bar/baz")))
         (t/is (= original-order (move "Missing" "Move"))))))
 
-  (t/deftest tokens-tree
+  (t/testing "tokens-tree"
     (let [tokens-lib (-> (ctob/make-tokens-lib)
                          (ctob/add-set (ctob/make-token-set :name "A"
                                                             :tokens {"foo.bar.baz" (ctob/make-token :name "foo.bar.baz"
@@ -125,8 +133,8 @@
       (t/is (= (get-in expected ["foo" "bar" "bam" :name]) "foo.bar.bam"))
       (t/is (= (get-in expected ["baz" "boo" :name]) "baz.boo")))))
 
-(t/testing "token-theme"
-  (t/deftest make-token-theme
+(t/deftest token-theme
+  (t/testing "make-token-theme"
     (let [now          (dt/now)
           token-theme1 (ctob/make-token-theme :name "test-token-theme-1")
           token-theme2 (ctob/make-token-theme :name "test-token-theme-2"
@@ -150,24 +158,24 @@
       (t/is (= (:modified-at token-theme2) now))
       (t/is (empty? (:sets token-theme2)))))
 
-  (t/deftest invalid-token-theme
+  (t/testing "invalid-token-theme"
     (let [args {:name 777
                 :group nil
                 :description 999
                 :is-source 42}]
-      (t/is (thrown-with-msg? Exception #"expected valid token theme"
+      (t/is (thrown-with-msg? #?(:cljs js/Error :clj Exception) #"expected valid token theme"
                               (apply ctob/make-token-theme args))))))
 
 
-(t/testing "tokens-lib"
-  (t/deftest make-tokens-lib
+(t/deftest tokens-lib
+  (t/testing "make-tokens-lib"
     (let [tokens-lib (ctob/make-tokens-lib)]
       (t/is (= (ctob/set-count tokens-lib) 0))))
 
-  (t/deftest invalid-tokens-lib
+  (t/testing "invalid-tokens-lib"
     (let [args {:sets nil
                 :themes nil}]
-      (t/is (thrown-with-msg? Exception #"expected valid tokens lib"
+      (t/is (thrown-with-msg? #?(:cljs js/Error :clj Exception) #"expected valid tokens lib"
                               (apply ctob/make-tokens-lib args))))))
 
 
@@ -263,8 +271,8 @@
       (t/is (nil? token-set')))))
 
 
-(t/testing "token in a lib"
-  (t/deftest add-token
+(t/deftest token-in-a-lib
+  (t/testing "add-token"
     (let [tokens-lib  (-> (ctob/make-tokens-lib)
                           (ctob/add-set (ctob/make-token-set :name "test-token-set")))
           token       (ctob/make-token :name "test-token"
@@ -283,7 +291,7 @@
       (t/is (= (:name token') "test-token"))
       (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))))
 
-  (t/deftest update-token
+  (t/testing "update-token"
     (let [tokens-lib  (-> (ctob/make-tokens-lib)
                           (ctob/add-set (ctob/make-token-set :name "test-token-set"))
                           (ctob/add-token-in-set "test-token-set"
@@ -324,7 +332,7 @@
       (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))
       (t/is (dt/is-after? (:modified-at token') (:modified-at token)))))
 
-  (t/deftest rename-token
+  (t/testing "rename-token"
     (let [tokens-lib  (-> (ctob/make-tokens-lib)
                           (ctob/add-set (ctob/make-token-set :name "test-token-set"))
                           (ctob/add-token-in-set "test-token-set"
@@ -356,7 +364,7 @@
       (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))
       (t/is (dt/is-after? (:modified-at token') (:modified-at token)))))
 
-  (t/deftest delete-token
+  (t/testing "delete-token"
     (let [tokens-lib  (-> (ctob/make-tokens-lib)
                           (ctob/add-set (ctob/make-token-set :name "test-token-set"))
                           (ctob/add-token-in-set "test-token-set"
@@ -377,7 +385,7 @@
       (t/is (nil? token'))
       (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))))
 
-  (t/deftest list-active-themes-tokens-in-order
+  (t/testing "list-active-themes-tokens-in-order"
     (let [tokens-lib  (-> (ctob/make-tokens-lib)
                           (ctob/add-theme (ctob/make-token-theme :name "out-of-order-theme"
                                                                  ;; Out of order sets in theme
@@ -405,8 +413,8 @@
       (t/is (= ["set-a-token" "set-b-token"] expected-token-names)))))
 
 
-(t/testing "token-theme in a lib"
-  (t/deftest add-token-theme
+(t/deftest token-theme-in-a-lib
+  (t/testing "add-token-theme"
     (let [tokens-lib  (ctob/make-tokens-lib)
           token-theme (ctob/make-token-theme :name "test-token-theme")
           tokens-lib' (ctob/add-theme tokens-lib token-theme)
@@ -418,7 +426,7 @@
       (t/is (= (first token-themes') token-theme))
       (t/is (= token-theme' token-theme))))
 
-  (t/deftest update-token-theme
+  (t/testing "update-token-theme"
     (let [tokens-lib  (-> (ctob/make-tokens-lib)
                           (ctob/add-theme (ctob/make-token-theme :name "test-token-theme")))
 
@@ -440,7 +448,7 @@
       (t/is (= (:description token-theme') "some description"))
       (t/is (dt/is-after? (:modified-at token-theme') (:modified-at token-theme)))))
 
-  (t/deftest rename-token-theme
+  (t/testing "rename-token-theme"
     (let [tokens-lib  (-> (ctob/make-tokens-lib)
                           (ctob/add-theme (ctob/make-token-theme :name "test-token-theme")))
 
@@ -457,7 +465,7 @@
       (t/is (= (:name token-theme') "updated-name"))
       (t/is (dt/is-after? (:modified-at token-theme') (:modified-at token-theme)))))
 
-  (t/deftest delete-token-theme
+  (t/testing "delete-token-theme"
     (let [tokens-lib  (-> (ctob/make-tokens-lib)
                           (ctob/add-theme (ctob/make-token-theme :name "test-token-theme")))
 
@@ -470,7 +478,7 @@
       (t/is (= (ctob/theme-count tokens-lib') 0))
       (t/is (nil? token-theme'))))
 
-  (t/deftest toggle-set-in-theme
+  (t/testing "toggle-set-in-theme"
     (let [tokens-lib   (-> (ctob/make-tokens-lib)
                            (ctob/add-set (ctob/make-token-set :name "token-set-1"))
                            (ctob/add-set (ctob/make-token-set :name "token-set-2"))
@@ -487,8 +495,8 @@
       (t/is (dt/is-after? (:modified-at token-theme') (:modified-at token-theme))))))
 
 
-(t/testing "serialization"
-  (t/deftest transit-serialization
+(t/deftest serialization
+  (t/testing "transit-serialization"
     (let [tokens-lib  (-> (ctob/make-tokens-lib)
                           (ctob/add-set (ctob/make-token-set :name "test-token-set"))
                           (ctob/add-token-in-set "test-token-set" (ctob/make-token :name "test-token"
@@ -503,23 +511,24 @@
       (t/is (= (ctob/set-count tokens-lib') 1))
       (t/is (= (ctob/theme-count tokens-lib') 1))))
 
-  (t/deftest fressian-serialization
-    (let [tokens-lib   (-> (ctob/make-tokens-lib)
-                           (ctob/add-set (ctob/make-token-set :name "test-token-set"))
-                           (ctob/add-token-in-set "test-token-set" (ctob/make-token :name "test-token"
-                                                                                    :type :boolean
-                                                                                    :value true))
-                           (ctob/add-theme (ctob/make-token-theme :name "test-token-theme"))
-                           (ctob/toggle-set-in-theme "" "test-token-theme" "test-token-set"))
-          encoded-blob (fres/encode tokens-lib)
-          tokens-lib'  (fres/decode encoded-blob)]
+  #?(:clj
+     (t/testing "fressian-serialization"
+       (let [tokens-lib   (-> (ctob/make-tokens-lib)
+                              (ctob/add-set (ctob/make-token-set :name "test-token-set"))
+                              (ctob/add-token-in-set "test-token-set" (ctob/make-token :name "test-token"
+                                                                                       :type :boolean
+                                                                                       :value true))
+                              (ctob/add-theme (ctob/make-token-theme :name "test-token-theme"))
+                              (ctob/toggle-set-in-theme "" "test-token-theme" "test-token-set"))
+             encoded-blob (fres/encode tokens-lib)
+             tokens-lib'  (fres/decode encoded-blob)]
 
-      (t/is (ctob/valid-tokens-lib? tokens-lib'))
-      (t/is (= (ctob/set-count tokens-lib') 1))
-      (t/is (= (ctob/theme-count tokens-lib') 1)))))
+         (t/is (ctob/valid-tokens-lib? tokens-lib'))
+         (t/is (= (ctob/set-count tokens-lib') 1))
+         (t/is (= (ctob/theme-count tokens-lib') 1))))))
 
-(t/testing "grouping"
-  (t/deftest split-and-join
+(t/deftest grouping
+  (t/testing "split-and-join"
     (let [name "group/subgroup/name"
           path (ctob/split-path name "/")
           name' (ctob/join-path path "/")]
@@ -528,14 +537,14 @@
       (t/is (= (nth path 2) "name"))
       (t/is (= name' name))))
 
-  (t/deftest remove-spaces
+  (t/testing "remove-spaces"
     (let [name "group / subgroup / name"
           path (ctob/split-path name "/")]
       (t/is (= (first path) "group"))
       (t/is (= (second path) "subgroup"))
       (t/is (= (nth path 2) "name"))))
 
-  (t/deftest group-and-ungroup
+  (t/testing "group-and-ungroup"
     (let [token-set1   (ctob/make-token-set :name "token-set1")
           token-set2   (ctob/make-token-set :name "some group/token-set2")
 
@@ -548,7 +557,7 @@
       (t/is (= (:name token-set1'') "token-set1"))
       (t/is (= (:name token-set2'') "some group/token-set2"))))
 
-  (t/deftest get-groups-str
+  (t/testing "get-groups-str"
     (let [token-set1 (ctob/make-token-set :name "token-set1")
           token-set2 (ctob/make-token-set :name "some-group/token-set2")
           token-set3 (ctob/make-token-set :name "some-group/some-subgroup/token-set3")]
@@ -556,7 +565,7 @@
       (t/is (= (ctob/get-groups-str token-set2 "/") "some-group"))
       (t/is (= (ctob/get-groups-str token-set3 "/") "some-group/some-subgroup"))))
 
-  (t/deftest get-final-name
+  (t/testing "get-final-name"
     (let [token-set1 (ctob/make-token-set :name "token-set1")
           token-set2 (ctob/make-token-set :name "some-group/token-set2")
           token-set3 (ctob/make-token-set :name "some-group/some-subgroup/token-set3")]
@@ -565,7 +574,7 @@
       (t/is (= (ctob/get-final-name token-set3 "/") "token-set3"))))
 
   (t/testing "grouped tokens"
-    (t/deftest grouped-tokens
+    (t/testing "grouped-tokens"
       (let [tokens-lib (-> (ctob/make-tokens-lib)
                            (ctob/add-set (ctob/make-token-set :name "test-token-set"))
                            (ctob/add-token-in-set "test-token-set"
@@ -599,7 +608,7 @@
         (t/is (= (:name (nth tokens-list 3)) "group1.subgroup11.token4"))
         (t/is (= (:name (nth tokens-list 4)) "group2.token5"))))
 
-    (t/deftest update-token-in-groups
+    (t/testing "update-token-in-groups"
       (let [tokens-lib  (-> (ctob/make-tokens-lib)
                             (ctob/add-set (ctob/make-token-set :name "test-token-set"))
                             (ctob/add-token-in-set "test-token-set"
@@ -634,7 +643,7 @@
         (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))
         (t/is (dt/is-after? (:modified-at token') (:modified-at token)))))
 
-    (t/deftest rename-token-in-groups
+    (t/testing "rename-token-in-groups"
       (let [tokens-lib  (-> (ctob/make-tokens-lib)
                             (ctob/add-set (ctob/make-token-set :name "test-token-set"))
                             (ctob/add-token-in-set "test-token-set"
@@ -668,7 +677,7 @@
         (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))
         (t/is (dt/is-after? (:modified-at token') (:modified-at token)))))
 
-    (t/deftest move-token-of-group
+    (t/testing "move-token-of-group"
       (let [tokens-lib  (-> (ctob/make-tokens-lib)
                             (ctob/add-set (ctob/make-token-set :name "test-token-set"))
                             (ctob/add-token-in-set "test-token-set"
@@ -703,7 +712,7 @@
         (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))
         (t/is (dt/is-after? (:modified-at token') (:modified-at token)))))
 
-    (t/deftest delete-token-in-group
+    (t/testing "delete-token-in-group"
       (let [tokens-lib  (-> (ctob/make-tokens-lib)
                             (ctob/add-set (ctob/make-token-set :name "test-token-set"))
                             (ctob/add-token-in-set "test-token-set"
@@ -727,7 +736,7 @@
         (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set))))))
 
   (t/testing "grouped sets"
-    (t/deftest grouped-sets
+    (t/testing "grouped-sets"
       (let [tokens-lib (-> (ctob/make-tokens-lib)
                            (ctob/add-set (ctob/make-token-set :name "token-set-1"))
                            (ctob/add-set (ctob/make-token-set :name "group1/token-set-2"))
@@ -786,7 +795,7 @@
         (t/is (= (ctob/group? (second node-set5)) false))
         (t/is (= (:name (second node-set5)) "group2/token-set-5"))))
 
-    (t/deftest update-set-in-groups
+    (t/testing "update-set-in-groups"
       (let [tokens-lib  (-> (ctob/make-tokens-lib)
                             (ctob/add-set (ctob/make-token-set :name "token-set-1"))
                             (ctob/add-set (ctob/make-token-set :name "group1/token-set-2"))
@@ -812,7 +821,7 @@
         (t/is (= (:description token-set') "some description"))
         (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))))
 
-    (t/deftest rename-set-in-groups
+    (t/testing "rename-set-in-groups"
       (let [tokens-lib  (-> (ctob/make-tokens-lib)
                             (ctob/add-set (ctob/make-token-set :name "token-set-1"))
                             (ctob/add-set (ctob/make-token-set :name "group1/token-set-2"))
@@ -839,7 +848,7 @@
         (t/is (= (:description token-set') nil))
         (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))))
 
-    (t/deftest move-set-of-group
+    (t/testing "move-set-of-group"
       (let [tokens-lib  (-> (ctob/make-tokens-lib)
                             (ctob/add-set (ctob/make-token-set :name "token-set-1"))
                             (ctob/add-set (ctob/make-token-set :name "group1/token-set-2"))
@@ -868,7 +877,7 @@
         (t/is (= (:description token-set') nil))
         (t/is (dt/is-after? (:modified-at token-set') (:modified-at token-set)))))
 
-    (t/deftest delete-set-in-group
+    (t/testing "delete-set-in-group"
       (let [tokens-lib  (-> (ctob/make-tokens-lib)
                             (ctob/add-set (ctob/make-token-set :name "token-set-1"))
                             (ctob/add-set (ctob/make-token-set :name "group1/token-set-2")))
@@ -884,7 +893,7 @@
         (t/is (nil? token-set')))))
 
   (t/testing "grouped themes"
-    (t/deftest grouped-themes
+    (t/testing "grouped-themes"
       (let [tokens-lib (-> (ctob/make-tokens-lib)
                            (ctob/add-theme (ctob/make-token-theme :group "" :name "token-theme-1"))
                            (ctob/add-theme (ctob/make-token-theme :group "group1" :name "token-theme-2"))
@@ -941,7 +950,7 @@
         (t/is (= (ctob/group? (second node-theme4)) false))
         (t/is (= (:name (second node-theme4)) "token-theme-4"))))
 
-    (t/deftest update-theme-in-groups
+    (t/testing "update-theme-in-groups"
       (let [tokens-lib   (-> (ctob/make-tokens-lib)
                              (ctob/add-theme (ctob/make-token-theme :group "" :name "token-theme-1"))
                              (ctob/add-theme (ctob/make-token-theme :group "group1" :name "token-theme-2"))
@@ -967,7 +976,7 @@
         (t/is (= (:description token-theme') "some description"))
         (t/is (dt/is-after? (:modified-at token-theme') (:modified-at token-theme)))))
 
-    (t/deftest get-theme-groups
+    (t/testing "get-theme-groups"
       (let [token-lib (-> (ctob/make-tokens-lib)
                           (ctob/add-theme (ctob/make-token-theme :group "" :name "token-theme-1"))
                           (ctob/add-theme (ctob/make-token-theme :group "group1" :name "token-theme-2"))
@@ -976,13 +985,14 @@
             token-groups (ctob/get-theme-groups token-lib)]
         (t/is (= token-groups ["group1" "group2"]))))
 
-    (t/deftest rename-theme-in-groups
+    (t/testing "rename-theme-in-groups"
       (let [tokens-lib   (-> (ctob/make-tokens-lib)
                              (ctob/add-theme (ctob/make-token-theme :group "" :name "token-theme-1"))
                              (ctob/add-theme (ctob/make-token-theme :group "group1" :name "token-theme-2"))
                              (ctob/add-theme (ctob/make-token-theme :group "group1" :name "token-theme-3"))
                              (ctob/add-theme (ctob/make-token-theme :group "group2" :name "token-theme-4")))
 
+
             tokens-lib'  (-> tokens-lib
                              (ctob/update-theme "group1" "token-theme-2"
                                                 (fn [token-theme]
@@ -1003,7 +1013,7 @@
         (t/is (= (:description token-theme') nil))
         (t/is (dt/is-after? (:modified-at token-theme') (:modified-at token-theme)))))
 
-    (t/deftest move-theme-of-group
+    (t/testing "move-theme-of-group"
       (let [tokens-lib   (-> (ctob/make-tokens-lib)
                              (ctob/add-theme (ctob/make-token-theme :group "" :name "token-theme-1"))
                              (ctob/add-theme (ctob/make-token-theme :group "group1" :name "token-theme-2"))
@@ -1033,7 +1043,7 @@
         (t/is (= (:description token-theme') nil))
         (t/is (dt/is-after? (:modified-at token-theme') (:modified-at token-theme)))))
 
-    (t/deftest delete-theme-in-group
+    (t/testing "delete-theme-in-group"
       (let [tokens-lib   (-> (ctob/make-tokens-lib)
                              (ctob/add-theme (ctob/make-token-theme :group "" :name "token-theme-1"))
                              (ctob/add-theme (ctob/make-token-theme :group "group1" :name "token-theme-2")))
@@ -1049,8 +1059,8 @@
         (t/is (nil? token-theme'))))))
 
 #?(:clj
-   (t/testing "dtcg encoding/decoding"
-     (t/deftest decode-dtcg-json
+   (t/deftest dtcg-encoding-decoding
+     (t/testing "decode-dtcg-json"
        (let [json (-> (slurp "test/common_tests/types/data/tokens-multi-set-example.json")
                       (tr/decode-str))
              lib (ctob/decode-dtcg-json (ctob/ensure-tokens-lib nil) json)
@@ -1078,7 +1088,7 @@
          (t/testing "invalid tokens got discarded"
            (t/is (nil? (get-set-token "typography" "H1.Bold"))))))
 
-     (t/deftest encode-dtcg-json
+     (t/testing "encode-dtcg-json"
        (let [tokens-lib (-> (ctob/make-tokens-lib)
                             (ctob/add-set (ctob/make-token-set :name "core"
                                                                :tokens {"colors.red.600"
@@ -1111,7 +1121,7 @@
                                               "$type" "color"}}}}}
                   expected))))
 
-     (t/deftest encode-decode-dtcg-json
+     (t/testing "encode-decode-dtcg-json"
        (with-redefs [dt/now (constantly #inst "2024-10-16T12:01:20.257840055-00:00")]
          (let [tokens-lib (-> (ctob/make-tokens-lib)
                               (ctob/add-set (ctob/make-token-set :name "core"