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. --- licentia/source/test/licentia.lux | 62 +++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'licentia/source/test/licentia.lux') diff --git a/licentia/source/test/licentia.lux b/licentia/source/test/licentia.lux index b2302d8ef..e9a1da86e 100644 --- a/licentia/source/test/licentia.lux +++ b/licentia/source/test/licentia.lux @@ -161,16 +161,16 @@ (_.test "Copyright grant is present." (present? grant.copyright)) (_.test "Patent grant is present." - (present? (grant.patent (get@ #license.patent_retaliation? termination)))) + (present? (grant.patent (value@ #license.patent_retaliation? termination)))) (_.test "Effective date for the grants is present." (present? grant.date)) (_.test "Patent grant is present." - (present? (grant.termination (get@ #license.termination_period termination) - (get@ #license.grace_period termination)))) + (present? (grant.termination (value@ #license.termination_period termination) + (value@ #license.grace_period termination)))) (_.test "The termination period is accurately conveyed." - (present? (grant.grant_restoration_clause (get@ #license.termination_period termination)))) + (present? (grant.grant_restoration_clause (value@ #license.termination_period termination)))) (_.test "The grace period is accurately conveyed." - (present? (grant.grace_period_clause (get@ #license.grace_period termination)))) + (present? (grant.grace_period_clause (value@ #license.grace_period termination)))) (_.test "The grants are not retro-actively terminated." (present? grant.no_retroactive_termination)) )) @@ -185,10 +185,10 @@ (_.test "Litigation conditions are present." (present? liability.litigation)) (_.test "Liability acceptance conditions may be present." - (bit\= (get@ #license.can_accept? liability) + (bit\= (value@ #license.can_accept? liability) (present? liability.can_accept))) (_.test "Liability acceptance conditions may be present." - (bit\= (get@ #license.disclaim_high_risk? liability) + (bit\= (value@ #license.disclaim_high_risk? liability) (present? liability.disclaim_high_risk))) )) @@ -207,13 +207,13 @@ (Concern Commercial) ($_ _.and (_.test "Non-commercial clause is present." - (bit\= (not (get@ #license.can_sell? commercial)) + (bit\= (not (value@ #license.can_sell? commercial)) (present? commercial.cannot_sell))) (_.test "Contributor credit condition is present." - (bit\= (get@ #license.require_contributor_credit? commercial) + (bit\= (value@ #license.require_contributor_credit? commercial) (present? commercial.require_contributor_attribution))) (_.test "Anti-endorsement condition is present." - (bit\= (not (get@ #license.allow_contributor_endorsement? commercial)) + (bit\= (not (value@ #license.allow_contributor_endorsement? commercial)) (present? commercial.disallow_contributor_endorsement))) )) @@ -221,21 +221,21 @@ (Concern Extension) ($_ _.and (_.test "The license is viral." - (bit\= (get@ #license.same_license? extension) + (bit\= (value@ #license.same_license? extension) (and (list.every? present? extension.sharing_requirement) (list.every? present? extension.license_conflict_resolution)))) (_.test "Extensions must be distinguishable from the original work." - (bit\= (get@ #license.must_be_distinguishable? extension) + (bit\= (value@ #license.must_be_distinguishable? extension) (present? extension.distinctness_requirement))) (_.test "The community must be notified of new extensions." - (case (get@ #license.notification_period extension) + (case (value@ #license.notification_period extension) (#.Some period) (present? (extension.notification_requirement period)) #.None true)) (_.test "Must describe modifications." - (bit\= (get@ #license.must_describe_modifications? extension) + (bit\= (value@ #license.must_describe_modifications? extension) (present? extension.description_requirement))) )) @@ -243,17 +243,17 @@ (Concern Attribution) ($_ _.and (_.test "The attribution copyright notice is present." - (present? (get@ #license.copyright_notice attribution))) + (present? (value@ #license.copyright_notice attribution))) (_.test "The attribution phrase is present." (|> attribution - (get@ #license.phrase) + (value@ #license.phrase) (maybe\map present?) (maybe.default true))) (_.test "The attribution URL is present." - (present? (get@ #license.url attribution))) + (present? (value@ #license.url attribution))) (_.test "The attribution image is present." (|> attribution - (get@ #license.image) + (value@ #license.image) (maybe\map present?) (maybe.default true))) )) @@ -279,7 +279,7 @@ (Concern Addendum) ($_ _.and (_.test "Commons clause" - (bit\= (get@ #license.commons_clause? value) + (bit\= (value@ #license.commons_clause? value) (present? addendum.commons_clause))) )) @@ -294,10 +294,10 @@ ($_ _.and (_.test "Copyright notices are present." (list.every? (|>> notice.copyright_holder present?) - (get@ #license.copyright_holders license))) + (value@ #license.copyright_holders license))) (_.test "Identification is present (if the license is identified)." - (case (get@ #license.identification license) + (case (value@ #license.identification license) (#.Some identification) (and (present? (output.identification identification)) (present? miscellaneous.new_versions)) @@ -307,19 +307,19 @@ (_.test "Black-lists (if wanted by licensor) are explicitly enumerated and justified." (list.every? (function (_ black_list) - (let [black_list_is_justified? (case (get@ #license.justification black_list) + (let [black_list_is_justified? (case (value@ #license.justification black_list) (#.Some justification) (present? justification) #.None bit.yes) every_entity_is_mentioned? (|> black_list - (get@ #license.entities) + (value@ #license.entities) (list\map black_list.entity) (list.every? present?))] (and black_list_is_justified? every_entity_is_mentioned?))) - (get@ #license.black_lists license))) + (value@ #license.black_lists license))) (_.test "All definitions are present." (list.every? (|>> output.definition present?) @@ -328,7 +328,7 @@ (_.test "Acceptance of the license is demanded." (present? limitation.acceptance)) - (..about_grant present? (get@ #license.termination license)) + (..about_grant present? (value@ #license.termination license)) (_.test "All limitations are present." (present? output.limitation)) @@ -339,15 +339,15 @@ (_.test "The terms of submission are present." (present? submission.contribution)) - (..about_liability present? (get@ #license.liability license)) + (..about_liability present? (value@ #license.liability license)) - (..about_distribution present? (get@ #license.distribution license)) + (..about_distribution present? (value@ #license.distribution license)) - (..about_commercial present? (get@ #license.commercial license)) + (..about_commercial present? (value@ #license.commercial license)) - (..about_extension present? (get@ #license.extension license)) + (..about_extension present? (value@ #license.extension license)) - (case (get@ #license.attribution license) + (case (value@ #license.attribution license) (#.Some attribution) (..about_attribution present? attribution) @@ -357,7 +357,7 @@ (..about_miscellaneous present?) - (..about_addendum present? (get@ #license.addendum license)) + (..about_addendum present? (value@ #license.addendum license)) (_.test "License ending footer is present." (present? notice.end_of_license)) -- cgit v1.2.3