02/02: tests: Move beatify-description tests to import-tests.

[Ben Woodcroft]

benwoodcroft pushed a commit to branch master
in repository guix.

commit a132f7d68f4c61133c0c97d8e5125c48f7205ac9
Author: Ben Woodcroft <address@hidden>
Date:   Sun Jan 17 10:20:59 2016 +1000

    tests: Move beatify-description tests to import-tests.
    
    Fixes <http://bugs.gnu.org/22391>.
    
    * tests/cran.scm (beautify-description: use double spacing,
    beautify-description: transform fragment into sentence). Move
    from here ...
    * tests/import-utils.scm: ... to here. New file.
    * Makefile.am (SCM_TESTS): Add import-utils.
---
 Makefile.am            |    3 ++-
 tests/cran.scm         |   10 ----------
 tests/import-utils.scm |   39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 74bc8b5..7e41990 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -241,7 +241,8 @@ SCM_TESTS =                                 \
   tests/cve.scm                                        \
   tests/file-systems.scm                       \
   tests/services.scm                           \
-  tests/containers.scm
+  tests/containers.scm                         \
+  tests/import-utils.scm
 
 if HAVE_GUILE_JSON
 
diff --git a/tests/cran.scm b/tests/cran.scm
index e4f2235..83d2e7f 100644
--- a/tests/cran.scm
+++ b/tests/cran.scm
@@ -86,16 +86,6 @@ Date/Publication: 2015-07-14 14:15:16
   '()
   ((@@ (guix import cran) listify) simple-alist "BadList"))
 
-(test-equal "beautify-description: use double spacing"
-  "This is a package.  It is great.  Trust me Mr.  Hendrix."
-  ((@@ (guix import cran) beautify-description)
-   "This is a package. It is great. Trust me Mr. Hendrix."))
-
-(test-equal "beautify-description: transform fragment into sentence"
-  "This package provides a function to establish world peace"
-  ((@@ (guix import cran) beautify-description)
-   "A function to establish world peace"))
-
 (test-assert "description->package"
   ;; Replace network resources with sample data.
   (mock ((guix build download) url-fetch
diff --git a/tests/import-utils.scm b/tests/import-utils.scm
new file mode 100644
index 0000000..0836581
--- /dev/null
+++ b/tests/import-utils.scm
@@ -0,0 +1,39 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2016 Ben Woodcroft <address@hidden>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix 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.
+;;;
+;;; GNU Guix 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 GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (test-import-utils)
+  #:use-module (guix tests)
+  #:use-module (guix import utils)
+  #:use-module (srfi srfi-64))
+
+(test-begin "import-utils")
+
+(test-equal "beautify-description: use double spacing"
+  "This is a package.  It is great.  Trust me Mr.  Hendrix."
+  (beautify-description
+   "This is a package. It is great. Trust me Mr. Hendrix."))
+
+(test-equal "beautify-description: transform fragment into sentence"
+  "This package provides a function to establish world peace"
+  (beautify-description "A function to establish world peace"))
+
+(test-end "import-utils")
+
+
+(exit (= (test-runner-fail-count (test-runner-current)) 0))