From ad87b718eda20924b378fcf2d1ea2888a146caa6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 14 Nov 2025 22:26:20 +0100 Subject: import/cran: Reduce false positives in extracting imports. * tests/import/cran.scm: Add tests for extract-imports. * guix/import/cran.scm (extract-imports): New procedure, extracted from... (needed-test-inputs-in-directory): ...this procedure, which now uses it. (import-pattern): Update regex pattern. Change-Id: I07ac3f685ff08a0fa7da3c25cf1f63fbca18b95f --- tests/import/cran.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/import/cran.scm b/tests/import/cran.scm index 5c820b1ab32..6b1bcc297dd 100644 --- a/tests/import/cran.scm +++ b/tests/import/cran.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Ricardo Wurmus +;;; Copyright © 2015, 2025 Ricardo Wurmus ;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. @@ -20,6 +20,7 @@ (define-module (test-cran) #:use-module (gnu packages statistics) #:use-module (guix import cran) + #:use-module (guix sets) #:use-module (guix tests) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64) @@ -88,7 +89,21 @@ Date/Publication: 2015-07-14 14:15:16 '() ((@@ (guix import cran) listify) simple-alist "BadList")) -(test-equal "r-mininal is not a cran package" +(test-equal "extract-imports: finds data.table" + (list "data.table") + (set->list ((@ (guix import cran) extract-imports) "abc + data.table::some_procedure()"))) + +(test-equal "extract-imports: ignores text inside strings" + (list) + (set->list ((@ (guix import cran) extract-imports) + "\"hello::world\", \"this is not data.table::some_procedure(), actually\""))) + +(test-equal "extract-imports: ignores other colon separated things" + (list) + (set->list ((@ (guix import cran) extract-imports) + "this:is:not::a:procedure"))) + +(test-equal "r-minimal is not a cran package" #f ((@@ (guix import cran) cran-package?) r-minimal)) -- cgit v1.2.3