From 04c7f49a732380a2b9f72b1b937171b341c24323 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sat, 9 Apr 2022 03:03:46 -0400 Subject: Better names for testing macros (plus better indentation). --- licentia/source/test/licentia.lux | 260 +++++++++++++++++++------------------- 1 file changed, 130 insertions(+), 130 deletions(-) (limited to 'licentia') diff --git a/licentia/source/test/licentia.lux b/licentia/source/test/licentia.lux index c24c1231e..a6274a7b5 100644 --- a/licentia/source/test/licentia.lux +++ b/licentia/source/test/licentia.lux @@ -158,129 +158,129 @@ (def: (about_grant present? termination) (Concern Termination) (all _.and - (_.test "Copyright grant is present." - (present? grant.copyright)) - (_.test "Patent grant is present." - (present? (grant.patent (the license.#patent_retaliation? termination)))) - (_.test "Effective date for the grants is present." - (present? grant.date)) - (_.test "Patent grant is present." - (present? (grant.termination (the license.#termination_period termination) - (the license.#grace_period termination)))) - (_.test "The termination period is accurately conveyed." - (present? (grant.grant_restoration_clause (the license.#termination_period termination)))) - (_.test "The grace period is accurately conveyed." - (present? (grant.grace_period_clause (the license.#grace_period termination)))) - (_.test "The grants are not retro-actively terminated." - (present? grant.no_retroactive_termination)) + (_.property "Copyright grant is present." + (present? grant.copyright)) + (_.property "Patent grant is present." + (present? (grant.patent (the license.#patent_retaliation? termination)))) + (_.property "Effective date for the grants is present." + (present? grant.date)) + (_.property "Patent grant is present." + (present? (grant.termination (the license.#termination_period termination) + (the license.#grace_period termination)))) + (_.property "The termination period is accurately conveyed." + (present? (grant.grant_restoration_clause (the license.#termination_period termination)))) + (_.property "The grace period is accurately conveyed." + (present? (grant.grace_period_clause (the license.#grace_period termination)))) + (_.property "The grants are not retro-actively terminated." + (present? grant.no_retroactive_termination)) )) (def: (about_liability present? liability) (Concern Liability) (all _.and - (_.test "Warranty liability disclaimer is present." - (present? liability.warranty)) - (_.test "Limitation of liability is present." - (present? liability.limitation)) - (_.test "Litigation conditions are present." - (present? liability.litigation)) - (_.test "Liability acceptance conditions may be present." - (bit#= (the license.#can_accept? liability) - (present? liability.can_accept))) - (_.test "Liability acceptance conditions may be present." - (bit#= (the license.#disclaim_high_risk? liability) - (present? liability.disclaim_high_risk))) + (_.property "Warranty liability disclaimer is present." + (present? liability.warranty)) + (_.property "Limitation of liability is present." + (present? liability.limitation)) + (_.property "Litigation conditions are present." + (present? liability.litigation)) + (_.property "Liability acceptance conditions may be present." + (bit#= (the license.#can_accept? liability) + (present? liability.can_accept))) + (_.property "Liability acceptance conditions may be present." + (bit#= (the license.#disclaim_high_risk? liability) + (present? liability.disclaim_high_risk))) )) (def: (about_distribution present? distribution) (Concern Distribution) (all _.and - (_.test "Conditions for source-code distribution are present." - (present? distribution.source_code_form)) - (_.test "Conditions for object-code distribution are present." - (present? distribution.object_form)) - (_.test "Conditions for extension distribution are present." - (present? (distribution.extension distribution))) + (_.property "Conditions for source-code distribution are present." + (present? distribution.source_code_form)) + (_.property "Conditions for object-code distribution are present." + (present? distribution.object_form)) + (_.property "Conditions for extension distribution are present." + (present? (distribution.extension distribution))) )) (def: (about_commercial present? commercial) (Concern Commercial) (all _.and - (_.test "Non-commercial clause is present." - (bit#= (not (the license.#can_sell? commercial)) - (present? commercial.cannot_sell))) - (_.test "Contributor credit condition is present." - (bit#= (the license.#require_contributor_credit? commercial) - (present? commercial.require_contributor_attribution))) - (_.test "Anti-endorsement condition is present." - (bit#= (not (the license.#allow_contributor_endorsement? commercial)) - (present? commercial.disallow_contributor_endorsement))) + (_.property "Non-commercial clause is present." + (bit#= (not (the license.#can_sell? commercial)) + (present? commercial.cannot_sell))) + (_.property "Contributor credit condition is present." + (bit#= (the license.#require_contributor_credit? commercial) + (present? commercial.require_contributor_attribution))) + (_.property "Anti-endorsement condition is present." + (bit#= (not (the license.#allow_contributor_endorsement? commercial)) + (present? commercial.disallow_contributor_endorsement))) )) (def: (about_extension present? extension) (Concern Extension) (all _.and - (_.test "The license is viral." - (bit#= (the 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#= (the license.#must_be_distinguishable? extension) - (present? extension.distinctness_requirement))) - (_.test "The community must be notified of new extensions." - (case (the license.#notification_period extension) - {.#Some period} - (present? (extension.notification_requirement period)) - - {.#None} - true)) - (_.test "Must describe modifications." - (bit#= (the license.#must_describe_modifications? extension) - (present? extension.description_requirement))) + (_.property "The license is viral." + (bit#= (the license.#same_license? extension) + (and (list.every? present? extension.sharing_requirement) + (list.every? present? extension.license_conflict_resolution)))) + (_.property "Extensions must be distinguishable from the original work." + (bit#= (the license.#must_be_distinguishable? extension) + (present? extension.distinctness_requirement))) + (_.property "The community must be notified of new extensions." + (case (the license.#notification_period extension) + {.#Some period} + (present? (extension.notification_requirement period)) + + {.#None} + true)) + (_.property "Must describe modifications." + (bit#= (the license.#must_describe_modifications? extension) + (present? extension.description_requirement))) )) (def: (about_attribution present? attribution) (Concern Attribution) (all _.and - (_.test "The attribution copyright notice is present." - (present? (the license.#copyright_notice attribution))) - (_.test "The attribution phrase is present." - (|> attribution - (the license.#phrase) - (maybe#each present?) - (maybe.default true))) - (_.test "The attribution URL is present." - (present? (the license.#url attribution))) - (_.test "The attribution image is present." - (|> attribution - (the license.#image) - (maybe#each present?) - (maybe.default true))) + (_.property "The attribution copyright notice is present." + (present? (the license.#copyright_notice attribution))) + (_.property "The attribution phrase is present." + (|> attribution + (the license.#phrase) + (maybe#each present?) + (maybe.default true))) + (_.property "The attribution URL is present." + (present? (the license.#url attribution))) + (_.property "The attribution image is present." + (|> attribution + (the license.#image) + (maybe#each present?) + (maybe.default true))) )) (def: (about_miscellaneous present?) (-> (-> Text Bit) Test) (all _.and - (_.test "License constitutes the entire agreement." - (present? miscellaneous.entire_agreement)) - (_.test "Disclaims relationship of parties." - (present? miscellaneous.relationship_of_parties)) - (_.test "Explicitly allows independent development." - (present? miscellaneous.independent_development)) - (_.test "Clarifies consent to breach does not waiver." - (present? miscellaneous.not_waiver)) - (_.test "Provides severability." - (present? miscellaneous.severability)) - (_.test "Covers export restrictions." - (present? miscellaneous.export_restrictions)) + (_.property "License constitutes the entire agreement." + (present? miscellaneous.entire_agreement)) + (_.property "Disclaims relationship of parties." + (present? miscellaneous.relationship_of_parties)) + (_.property "Explicitly allows independent development." + (present? miscellaneous.independent_development)) + (_.property "Clarifies consent to breach does not waiver." + (present? miscellaneous.not_waiver)) + (_.property "Provides severability." + (present? miscellaneous.severability)) + (_.property "Covers export restrictions." + (present? miscellaneous.export_restrictions)) )) (def: (about_addendum present? value) (Concern Addendum) (all _.and - (_.test "Commons clause" - (bit#= (the license.#commons_clause? value) - (present? addendum.commons_clause))) + (_.property "Commons clause" + (bit#= (the license.#commons_clause? value) + (present? addendum.commons_clause))) )) (def: test @@ -292,52 +292,52 @@ (function (_ snippet) (text.contains? snippet writ)))]] (all _.and - (_.test "Copyright notices are present." - (list.every? (|>> notice.copyright_holder present?) - (the license.#copyright_holders license))) + (_.property "Copyright notices are present." + (list.every? (|>> notice.copyright_holder present?) + (the license.#copyright_holders license))) - (_.test "Identification is present (if the license is identified)." - (case (the license.#identification license) - {.#Some identification} - (and (present? (output.identification identification)) - (present? miscellaneous.new_versions)) - - {.#None} - (not (present? miscellaneous.new_versions)))) - - (_.test "Black-lists (if wanted by licensor) are explicitly enumerated and justified." - (list.every? (function (_ black_list) - (let [black_list_is_justified? (case (the license.#justification black_list) - {.#Some justification} - (present? justification) - - {.#None} - bit.yes) - every_entity_is_mentioned? (|> black_list - (the license.#entities) - (list#each black_list.entity) - (list.every? present?))] - (and black_list_is_justified? - every_entity_is_mentioned?))) - (the license.#black_lists license))) + (_.property "Identification is present (if the license is identified)." + (case (the license.#identification license) + {.#Some identification} + (and (present? (output.identification identification)) + (present? miscellaneous.new_versions)) + + {.#None} + (not (present? miscellaneous.new_versions)))) + + (_.property "Black-lists (if wanted by licensor) are explicitly enumerated and justified." + (list.every? (function (_ black_list) + (let [black_list_is_justified? (case (the license.#justification black_list) + {.#Some justification} + (present? justification) + + {.#None} + bit.yes) + every_entity_is_mentioned? (|> black_list + (the license.#entities) + (list#each black_list.entity) + (list.every? present?))] + (and black_list_is_justified? + every_entity_is_mentioned?))) + (the license.#black_lists license))) - (_.test "All definitions are present." - (list.every? (|>> output.definition present?) - definition.all)) + (_.property "All definitions are present." + (list.every? (|>> output.definition present?) + definition.all)) - (_.test "Acceptance of the license is demanded." - (present? limitation.acceptance)) + (_.property "Acceptance of the license is demanded." + (present? limitation.acceptance)) (..about_grant present? (the license.#termination license)) - (_.test "All limitations are present." - (present? output.limitation)) + (_.property "All limitations are present." + (present? output.limitation)) - (_.test "All assurances are present." - (present? output.assurance)) + (_.property "All assurances are present." + (present? output.assurance)) - (_.test "The terms of submission are present." - (present? submission.contribution)) + (_.property "The terms of submission are present." + (present? submission.contribution)) (..about_liability present? (the license.#liability license)) @@ -352,15 +352,15 @@ (..about_attribution present? attribution) {.#None} - (_.test "Attribution is missing." - bit.yes)) + (_.property "Attribution is missing." + bit.yes)) (..about_miscellaneous present?) (..about_addendum present? (the license.#addendum license)) - (_.test "License ending footer is present." - (present? notice.end_of_license)) + (_.property "License ending footer is present." + (present? notice.end_of_license)) ))) (program: args -- cgit v1.2.3