From 3c4a04a11589c630a9601ecc3ed418424724eb1e Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 25 Jun 2026 16:38:00 +0100 Subject: tests: Spin off test-condition to new test utilities module. --- test-utils/utils.scm | 29 +++++++++++++++++++++++++++++ tests/ccwl.scm | 11 ++--------- 2 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 test-utils/utils.scm diff --git a/test-utils/utils.scm b/test-utils/utils.scm new file mode 100644 index 0000000..9a8897c --- /dev/null +++ b/test-utils/utils.scm @@ -0,0 +1,29 @@ +;;; ccwl --- Concise Common Workflow Language +;;; Copyright © 2026 Arun Isaac +;;; +;;; This file is part of ccwl. +;;; +;;; ccwl is free software: you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation, either version 3 of the License, or +;;; (at your option) any later version. +;;; +;;; ccwl is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;;; General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with ccwl. If not, see . + +(define-module (test-utils utils) + #:use-module (rnrs exceptions) + #:use-module (srfi srfi-64) + #:export (test-condition)) + +(define-syntax-rule (test-condition test-name condition-predicate test-expression) + (test-assert test-name + (guard (condition + (else (condition-predicate condition))) + (begin test-expression + #f)))) diff --git a/tests/ccwl.scm b/tests/ccwl.scm index bd852e9..d6703c7 100644 --- a/tests/ccwl.scm +++ b/tests/ccwl.scm @@ -16,11 +16,11 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with ccwl. If not, see . -(use-modules (rnrs exceptions) - (srfi srfi-1) +(use-modules (srfi srfi-1) (srfi srfi-64) (srfi srfi-71) (ice-9 match) + (test-utils utils) (ccwl ccwl) (ccwl conditions)) @@ -46,13 +46,6 @@ ((@@ (ccwl ccwl) construct-type-syntax) #'type-spec))))) -(define-syntax-rule (test-condition test-name condition-predicate test-expression) - (test-assert test-name - (guard (condition - (else (condition-predicate condition))) - (begin test-expression - #f)))) - (define (ccwl-violation-with-message? message) (lambda (condition) (and (ccwl-violation? condition) -- cgit 1.4.1