From e00ba096c8837abe85d366e0c1293c09dbe84d81 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Wed, 18 Aug 2021 03:29:15 -0400 Subject: Some bug fixes. --- .../source/test/aedifex/dependency/resolution.lux | 82 +++++++++++----------- 1 file changed, 41 insertions(+), 41 deletions(-) (limited to 'stdlib/source/test/aedifex/dependency/resolution.lux') diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux index c7f7d6d40..44420243d 100644 --- a/stdlib/source/test/aedifex/dependency/resolution.lux +++ b/stdlib/source/test/aedifex/dependency/resolution.lux @@ -98,7 +98,7 @@ (def: .public (single artifact package) (-> Artifact Package (Mock Any)) - (let [expected (///artifact.uri (get@ #///artifact.version artifact) artifact)] + (let [expected (///artifact.uri (value@ #///artifact.version artifact) artifact)] (implementation (def: the_description "[1]") @@ -106,11 +106,11 @@ (if (text.contains? expected uri) (let [library (: Binary (|> package - (get@ #///package.library) + (value@ #///package.library) product.left)) pom (: Binary (|> package - (get@ #///package.pom) + (value@ #///package.pom) product.left (\ xml.codec encode) (\ utf8.codec encode)))] @@ -144,34 +144,34 @@ (def: the_description "[~SHA-1]") (def: (on_download uri state) - (if (text.contains? (///artifact.uri (get@ #///artifact.version expected_artifact) expected_artifact) uri) + (if (text.contains? (///artifact.uri (value@ #///artifact.version expected_artifact) expected_artifact) uri) (cond (text.ends_with? ///artifact/extension.lux_library uri) (#try.Success [state (|> expected_package - (get@ #///package.library) + (value@ #///package.library) product.left)]) (text.ends_with? ..lux_sha-1 uri) (#try.Success [state (|> expected_package - (get@ #///package.library) + (value@ #///package.library) product.left ..sha-1)]) (text.ends_with? ..lux_md5 uri) (#try.Success [state (|> expected_package - (get@ #///package.library) + (value@ #///package.library) product.left ..md5)]) (text.ends_with? ///artifact/extension.pom uri) (#try.Success [state (|> expected_package - (get@ #///package.pom) + (value@ #///package.pom) product.left (\ xml.codec encode) (\ utf8.codec encode))]) (text.ends_with? ..pom_sha-1 uri) (#try.Success [state (|> dummy_package - (get@ #///package.pom) + (value@ #///package.pom) product.left (\ xml.codec encode) (\ utf8.codec encode) @@ -179,7 +179,7 @@ (text.ends_with? ..pom_md5 uri) (#try.Success [state (|> expected_package - (get@ #///package.pom) + (value@ #///package.pom) product.left (\ xml.codec encode) (\ utf8.codec encode) @@ -197,34 +197,34 @@ (def: the_description "[~MD5]") (def: (on_download uri state) - (if (text.contains? (///artifact.uri (get@ #///artifact.version expected_artifact) expected_artifact) uri) + (if (text.contains? (///artifact.uri (value@ #///artifact.version expected_artifact) expected_artifact) uri) (cond (text.ends_with? ///artifact/extension.lux_library uri) (#try.Success [state (|> expected_package - (get@ #///package.library) + (value@ #///package.library) product.left)]) (text.ends_with? ..lux_sha-1 uri) (#try.Success [state (|> expected_package - (get@ #///package.library) + (value@ #///package.library) product.left ..sha-1)]) (text.ends_with? ..lux_md5 uri) (#try.Success [state (|> dummy_package - (get@ #///package.library) + (value@ #///package.library) product.left ..md5)]) (text.ends_with? ///artifact/extension.pom uri) (#try.Success [state (|> expected_package - (get@ #///package.pom) + (value@ #///package.pom) product.left (\ xml.codec encode) (\ utf8.codec encode))]) (text.ends_with? ..pom_sha-1 uri) (#try.Success [state (|> expected_package - (get@ #///package.pom) + (value@ #///package.pom) product.left (\ xml.codec encode) (\ utf8.codec encode) @@ -232,7 +232,7 @@ (text.ends_with? ..pom_md5 uri) (#try.Success [state (|> dummy_package - (get@ #///package.pom) + (value@ #///package.pom) product.left (\ xml.codec encode) (\ utf8.codec encode) @@ -250,7 +250,7 @@ [expected_artifact $///artifact.random [_ expected_package] $///package.random [_ dummy_package] (random.only (|>> product.right - (set@ #///package.pom (get@ #///package.pom expected_package)) + (with@ #///package.pom (value@ #///package.pom expected_package)) (\ ///package.equivalence = expected_package) not) $///package.random) @@ -266,7 +266,7 @@ (case actual_package (#try.Success actual_package) (\ ///package.equivalence = - (set@ #///package.origin (#///repository/origin.Remote "") expected_package) + (with@ #///package.origin (#///repository/origin.Remote "") expected_package) actual_package) (#try.Failure _) @@ -295,7 +295,7 @@ [expected_artifact $///artifact.random [_ expected_package] $///package.random [_ dummy_package] (random.only (|>> product.right - (set@ #///package.pom (get@ #///package.pom expected_package)) + (with@ #///package.pom (value@ #///package.pom expected_package)) (\ ///package.equivalence = expected_package) not) $///package.random) @@ -315,7 +315,7 @@ (case actual_package (#try.Success actual_package) (\ ///package.equivalence = - (set@ #///package.origin (#///repository/origin.Remote "") expected_package) + (with@ #///package.origin (#///repository/origin.Remote "") expected_package) actual_package) (#try.Failure _) @@ -344,8 +344,8 @@ (\ ///artifact.equivalence = dependee_artifact)) $///artifact.random) ignored_artifact (random.only (predicate.complement - (predicate.unite (\ ///artifact.equivalence = dependee_artifact) - (\ ///artifact.equivalence = depender_artifact))) + (predicate.and (\ ///artifact.equivalence = dependee_artifact) + (\ ///artifact.equivalence = depender_artifact))) $///artifact.random)] (in [dependee_artifact depender_artifact ignored_artifact]))) @@ -366,34 +366,34 @@ #///dependency.type ///artifact/type.lux_library} dependee_pom (|> (\ ///.monoid identity) - (set@ #///.identity (#.Some dependee_artifact)) + (with@ #///.identity (#.Some dependee_artifact)) ///pom.write try.trusted) depender_pom (|> (\ ///.monoid identity) - (set@ #///.identity (#.Some depender_artifact)) - (set@ #///.dependencies (set.of_list ///dependency.hash (list dependee))) + (with@ #///.identity (#.Some depender_artifact)) + (with@ #///.dependencies (set.of_list ///dependency.hash (list dependee))) ///pom.write try.trusted) ignored_pom (|> (\ ///.monoid identity) - (set@ #///.identity (#.Some ignored_artifact)) + (with@ #///.identity (#.Some ignored_artifact)) ///pom.write try.trusted) - dependee_package (set@ #///package.pom - [dependee_pom - (|> dependee_pom (\ xml.codec encode) (\ utf8.codec encode)) + dependee_package (with@ #///package.pom + [dependee_pom + (|> dependee_pom (\ xml.codec encode) (\ utf8.codec encode)) + #///dependency/status.Unverified] + dependee_package) + depender_package (with@ #///package.pom + [depender_pom + (|> depender_pom (\ xml.codec encode) (\ utf8.codec encode)) + #///dependency/status.Unverified] + depender_package) + ignored_package (with@ #///package.pom + [ignored_pom + (|> ignored_pom (\ xml.codec encode) (\ utf8.codec encode)) #///dependency/status.Unverified] - dependee_package) - depender_package (set@ #///package.pom - [depender_pom - (|> depender_pom (\ xml.codec encode) (\ utf8.codec encode)) - #///dependency/status.Unverified] - depender_package) - ignored_package (set@ #///package.pom - [ignored_pom - (|> ignored_pom (\ xml.codec encode) (\ utf8.codec encode)) - #///dependency/status.Unverified] - ignored_package)]] + ignored_package)]] (in [[dependee depender ignored] [dependee_package depender_package ignored_package]]))) -- cgit v1.2.3