From c4bbfea18d995948012f45a6afda7a6e6ba56f84 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 24 Nov 2020 05:18:04 -0400
Subject: Better error messages when re-using a name when making a definition.

---
 stdlib/source/test/aedifex/cache.lux | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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

diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux
index e1b4abfc5..7dff44202 100644
--- a/stdlib/source/test/aedifex/cache.lux
+++ b/stdlib/source/test/aedifex/cache.lux
@@ -18,7 +18,7 @@
      ["." set]
      ["." dictionary]]]
    [math
-    ["." random (#+ Random) ("#@." monad)]]
+    ["." random (#+ Random) ("#\." monad)]]
    [world
     ["." file]]]
   [//
@@ -42,8 +42,8 @@
 (def: type
   (Random Type)
   ($_ random.either
-      (random@wrap //artifact/type.lux-library)
-      (random@wrap //artifact/type.jvm-library)))
+      (random\wrap //artifact/type.lux-library)
+      (random\wrap //artifact/type.jvm-library)))
 
 (def: profile
   (Random [Artifact Profile XML])
@@ -69,7 +69,7 @@
      content ..content]
     (wrap [{#//dependency.artifact identity
             #//dependency.type type}
-           (//package.local pom content)])))
+           (set@ #//package.origin #//package.Remote (//package.local pom content))])))
 
 (def: resolution
   (Random Resolution)
@@ -89,7 +89,7 @@
                                                         ..profile)
                                         content ..content]
                                        (wrap [dependency
-                                              (//package.local pom content)])))))]
+                                              (set@ #//package.origin #//package.Remote (//package.local pom content))])))))]
     (wrap (dictionary.from-list //dependency.hash (list& [main-dependency main-package] dependencies)))))
 
 (def: singular
@@ -107,7 +107,7 @@
                            [_ wrote!
                             actual-package read!]
                            (wrap (:: //package.equivalence =
-                                     expected-package
+                                     (set@ #//package.origin #//package.Local expected-package)
                                      actual-package)))))))))
 
 (def: plural
@@ -125,7 +125,9 @@
                            [_ wrote!
                             actual read!]
                            (wrap (:: //dependency/resolution.equivalence =
-                                     expected
+                                     (:: dictionary.functor map
+                                         (set@ #//package.origin #//package.Local)
+                                         expected)
                                      actual)))))))))
 
 (def: #export test
-- 
cgit v1.2.3