From a82bd1eabe94763162c2b0707d9c198fbe9835e3 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Fri, 18 Jun 2021 14:21:41 -0400
Subject: Refactored the machinery to make local macros into its own module.

---
 stdlib/source/test/aedifex/command/deps.lux | 43 ++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 10 deletions(-)

(limited to 'stdlib/source/test/aedifex/command/deps.lux')

diff --git a/stdlib/source/test/aedifex/command/deps.lux b/stdlib/source/test/aedifex/command/deps.lux
index 99856c83c..8b5e3820e 100644
--- a/stdlib/source/test/aedifex/command/deps.lux
+++ b/stdlib/source/test/aedifex/command/deps.lux
@@ -14,10 +14,14 @@
      ["." environment]]]
    [data
     ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
+     ["%" format (#+ format)]
+     [encoding
+      ["." utf8]]]
     [collection
      ["." dictionary]
-     ["." set]]]
+     ["." set]]
+    [format
+     ["." xml]]]
    [math
     ["." random (#+ Random)]]
    [world
@@ -81,10 +85,14 @@
                
                dependee_package (|> dependee_package
                                     (set@ #///package.origin (#///repository/origin.Remote ""))
-                                    (set@ #///package.pom [dependee_pom #///dependency/status.Unverified]))
+                                    (set@ #///package.pom [dependee_pom
+                                                           (|> dependee_pom (\ xml.codec encode) (\ utf8.codec encode))
+                                                           #///dependency/status.Unverified]))
                depender_package (|> depender_package
                                     (set@ #///package.origin (#///repository/origin.Remote ""))
-                                    (set@ #///package.pom [depender_pom #///dependency/status.Unverified]))
+                                    (set@ #///package.pom [depender_pom
+                                                           (|> depender_pom (\ xml.codec encode) (\ utf8.codec encode))
+                                                           #///dependency/status.Unverified]))
 
                fs (file.mock (\ file.default separator))
                program (program.async (program.mock environment.empty home working_directory))]]
@@ -97,14 +105,29 @@
                                     (///dependency/deployment.all local))
                             post (|> (\ ///.monoid identity)
                                      (set@ #///.dependencies (set.from_list ///dependency.hash (list dependee depender)))
-                                     (/.do! console local (list (///repository.mock ($///dependency/resolution.single depender_artifact depender_package) []))))
+                                     (/.do! console local (list (///repository.mock ($///dependency/resolution.single depender_artifact depender_package)
+                                                                                    []))))
                             logging! (\ ///action.monad map
                                         (text\= //clean.success)
-                                        (!.use (\ console read_line) []))]
+                                        (!.use (\ console read_line) []))
+
+                            #let [had_dependee_before!
+                                  (set.member? pre dependee_artifact)
+
+                                  lacked_depender_before!
+                                  (not (set.member? pre depender_artifact))
+
+                                  had_dependee_after!
+                                  (dictionary.key? post dependee)
+                                  
+                                  had_depender_after!
+                                  (dictionary.key? post depender)]]
                            (wrap (and logging!
-                                      (and (set.member? pre dependee_artifact)
-                                           (not (set.member? pre depender_artifact)))
-                                      (and (dictionary.key? post dependee)
-                                           (dictionary.key? post depender)))))]
+
+                                      had_dependee_before!
+                                      lacked_depender_before!
+                                      
+                                      had_dependee_after!
+                                      had_depender_after!)))]
                 (_.cover' [/.do!]
                           (try.default false verdict)))))))
-- 
cgit v1.2.3