wip3

Author: darkleaf

test/darkleaf/di/dependencies_test.clj

@@ -11,33 +11,32 @@
 ;;   c
 
 (defn root
-  {::di/stop #(swap! % conj [`root :stopped])}
-  [{a `a, b `b, log ::log}]
-  (swap! log conj [`root :built])
-  log)
+  {::di/kind :component}
+  [{a `a, b `b}]
+  :root)
 
 (defn a
-  {::di/stop #(swap! % conj [`a :stopped])}
-  [{c `c, log ::log}]
-  (swap! log conj [`a :built])
-  log)
+  {::di/kind :component}
+  [{c `c}]
+  :a)
 
 (defn b
-  {::di/stop #(swap! % conj [`b :stopped])}
-  [{c `c, log ::log}]
-  (swap! log conj [`b :built])
-  log)
+  {::di/kind :component}
+  [{c `c}]
+  :b)
 
 (defn c
-  {::di/stop #(swap! % conj [`c :stopped])}
-  [{log ::log}]
-  (swap! log conj [`c :built])
-  log)
+  {::di/kind :component}
+  []
+  :c)
 
 (t/deftest order-test
-  (let [log (atom [])]
-    (-> (di/start `root {::log log})
-        (di/stop))
+  (let [log       (atom [])
+        built!    (fn [key obj]
+                    (swap! log conj [key :built]))
+        demolish! (fn [key obj]
+                    (swap! log conj [key :stopped]))]
+    (with-open [root (di/start `root (di/log built! demolish!))])
     (t/is (= [[`c :built]
               [`a :built]
               [`b :built]