emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/emms 83490a7218 38/42: Change all tests to use emms-tes


From: ELPA Syncer
Subject: [elpa] externals/emms 83490a7218 38/42: Change all tests to use emms-test- prefix
Date: Wed, 1 Nov 2023 15:58:02 -0400 (EDT)

branch: externals/emms
commit 83490a72180844d494ad9593b41edb0990a75def
Author: Petteri Hintsanen <petterih@iki.fi>
Commit: Petteri Hintsanen <petterih@iki.fi>

    Change all tests to use emms-test- prefix
---
 test/emms-info-native-flac-tests.el   | 12 ++++++------
 test/emms-info-native-mp3-tests.el    | 14 +++++++-------
 test/emms-info-native-ogg-tests.el    | 20 ++++++++++----------
 test/emms-info-native-tests.el        |  8 ++++----
 test/emms-info-native-vorbis-tests.el |  4 ++--
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/test/emms-info-native-flac-tests.el 
b/test/emms-info-native-flac-tests.el
index dcadfadac2..cbd49e8e5d 100644
--- a/test/emms-info-native-flac-tests.el
+++ b/test/emms-info-native-flac-tests.el
@@ -26,7 +26,7 @@
 (require 'emms-info-native-flac)
 (require 'ert)
 
-(defmacro emms-flac-test-make-data-func (name bytes)
+(defmacro emms-test-flac-make-data-func (name bytes)
   "Macro for defining test data generator.
 This macro defines a suitable function with NAME that outputs
 BYTES after FLAC signature.  The function NAME can then be passed
@@ -36,11 +36,11 @@ for `emms-info-native-flac--decode-meta-blocks'."
        (erase-buffer)
        (insert (substring bytes offset end)))))
 
-(emms-flac-test-make-data-func emms-test-invalid-flac-block-length 
"\x01\xff\xff\xff\x00\x01\x02\x03")
-(emms-flac-test-make-data-func emms-test-invalid-flac-block-type 
"\x09\x00\x00\x00\x00\x01\x02\x03")
-(emms-flac-test-make-data-func emms-test-valid-flac-block 
"\x00\x00\x00\x08\x10\x11\x12\x13\x14\x15\x16\x17\x84\x00\x00\x04\x01\x02\x03\x04")
+(emms-test-flac-make-data-func emms-test-invalid-flac-block-length 
"\x01\xff\xff\xff\x00\x01\x02\x03")
+(emms-test-flac-make-data-func emms-test-invalid-flac-block-type 
"\x09\x00\x00\x00\x00\x01\x02\x03")
+(emms-test-flac-make-data-func emms-test-valid-flac-block 
"\x00\x00\x00\x08\x10\x11\x12\x13\x14\x15\x16\x17\x84\x00\x00\x04\x01\x02\x03\x04")
 
-(ert-deftest emms-flac-test-meta-blocks ()
+(ert-deftest emms-test-flac-meta-blocks ()
   (should-error (emms-info-native-flac--decode-meta-blocks
                  #'emms-test-invalid-flac-block-length))
   (should-error (emms-info-native-flac--decode-meta-blocks
@@ -50,7 +50,7 @@ for `emms-info-native-flac--decode-meta-blocks'."
                  (list "\x01\x02\x03\x04"
                        "\x10\x11\x12\x13\x14\x15\x16\x17"))))
 
-(ert-deftest emms-flac-test-decode-duration ()
+(ert-deftest emms-test-flac-decode-duration ()
   ;; The corresponding sample metadata bytes are [10 196 66 240 1 8 36 0].
   (should (= (emms-info-native-flac--decode-duration 775818634391462912) 392)))
 
diff --git a/test/emms-info-native-mp3-tests.el 
b/test/emms-info-native-mp3-tests.el
index 75a9fd8cec..683517b3f3 100644
--- a/test/emms-info-native-mp3-tests.el
+++ b/test/emms-info-native-mp3-tests.el
@@ -26,7 +26,7 @@
 (require 'emms-info-native-mp3)
 (require 'ert)
 
-(ert-deftest emms-id3v2-test-valid-frame-id-p ()
+(ert-deftest emms-test-id3v2-valid-frame-id-p ()
   (let ((emms-info-native-id3v2--version 2))
     (should (emms-info-native-id3v2--valid-frame-id-p "A1B"))
     (should (not (emms-info-native-id3v2--valid-frame-id-p "~B1")))
@@ -38,7 +38,7 @@
     (should (not (emms-info-native-id3v2--valid-frame-id-p "XXX")))
     (should (not (emms-info-native-id3v2--valid-frame-id-p "XXXXX")))))
 
-(ert-deftest emms-id3v2-test-checked-size ()
+(ert-deftest emms-test-id3v2-checked-size ()
   (should (= (emms-info-native-id3v2--checked-size 'tag [0 0 2 1]) 257))
   (should (= (emms-info-native-id3v2--checked-size 'tag [1 1 1 1]) 2113665))
   (should (= (emms-info-native-id3v2--checked-size 'tag [#xff #xff #xff #xff])
@@ -54,7 +54,7 @@
     (should (= (emms-info-native-id3v2--checked-size 'frame [#xff #xff #xff 
#xff])
                (1- (* 4 1024 1024 1024))))))
 
-(ert-deftest emms-id3v2-test-decode-size ()
+(ert-deftest emms-test-id3v2-decode-size ()
   (should (= (emms-info-native-id3v2--decode-size [01 01 01 01] nil)
              16843009))
   (should (= (emms-info-native-id3v2--decode-size [01 01 01 01] t)
@@ -64,7 +64,7 @@
   (should (= (emms-info-native-id3v2--decode-size [00 00 02 01] t)
              257)))
 
-(ert-deftest emms-mp3-test-find-and-decode-frame-header ()
+(ert-deftest emms-test-mp3-find-and-decode-frame-header ()
   (with-temp-buffer
     (set-buffer-multibyte nil)
     (insert 
"\x00\x00\x00\x00\x00\x00\x00\xff\xfb\xb0\x04\x00\x00\x00\x00\x00\x69\x06\x00\x00\x00\x00\x00\x0d\x20\xc0\x00\x00\x00\x00\x01\xa4\x1c\x00\x00\x00\x00\x00\x34\x83\x80\x00\x00\x4c\x41\x4d\x45\x33\x2e\x39\x31\x55\x55")
@@ -83,19 +83,19 @@
                      (emphasis . 0)
                      (original . 1))))))
 
-(ert-deftest emms-mp3-test-find-and-decode-xing-header ()
+(ert-deftest emms-test-mp3-find-and-decode-xing-header ()
   (with-temp-buffer
     (set-buffer-multibyte nil)
     (insert 
"\xff\xea\x90\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x58\x69\x6e\x67\x00\x00\x00\x0f\x00\x00\x21\x59\x00\x50\x1d\x79\x00\x03\x06\x08\x0b\x0e\x0f\x12\x15\x17\x1a\x1d\x1f\x22\x25\x27\x2a\x2d\x2f\x32\x35\x37\x39\x3c\x3e\x41\x44\x46\x49\x4c\x4e\x51\x54\x56\x59\x5c\x5e\x61\x64\x65\x68\x6b\x6d\x70\x73\x75\x78\x7a\x7b\x7d\x7f\x82\x85\x87\x8a\x8d\x8f\x92\x95\x97\x9a\x9d\x9f\xa2\xa5\xa7\xaa\xa
 [...]
     (should (= (emms-info-native-mp3--find-and-decode-xing-header) 8537))))
 
-(ert-deftest emms-mp3-test-find-decode-xing-header-2 ()
+(ert-deftest emms-test-mp3-find-decode-xing-header-2 ()
   (with-temp-buffer
     (set-buffer-multibyte nil)
     (insert 
"\xff\xfb\x50\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x49\x6e\x66\x6f\x00\x00\x00\x0f\x00\x00\x23\xd8\x00\x3a\x86\x09\x00\x02\x05\x08\x0a\x0d\x10\x12\x14\x17\x19\x1c\x1f\x21\x24\x26\x29\x2b\x2e\x31\x33\x36\x38\x3a\x3d\x40\x42\x45\x48\x4a\x4c\x4f\x52\x54\x57\x5a\x5b\x5e\x61\x63\x66\x69\x6c\x6d\x70\x73\x75\x78\x7b\x7d\x80\x82\x85\x87\x8a\x8d\x8f\x92\x94\x96\x99\x9c\x9e\xa1\xa4\xa6\xa8\xa
 [...]
     (should (= (emms-info-native-mp3--find-and-decode-xing-header) 9176))))
 
-(ert-deftest emms-mp3-test-find-and-decode-vbri-header ()
+(ert-deftest emms-test-mp3-find-and-decode-vbri-header ()
   (with-temp-buffer
     (set-buffer-multibyte nil)
     (insert 
"\xff\xfb\xa1\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x56\x42\x52\x49\x00\x01\x0d\xb1\x00\x64\x00\x62\xdb\x91\x00\x00\x21\x3a\x00\x84\x00\x01\x00\x02\x00\x40\x98\xb1\xbd\xa8\xbb\x36\xba\xce\xbb\x37\xba\xcf\xba\x67\xbb\x37\xbc\xd7\xbb\x9f\xba\xcf\xb9\x2c\xbb\x35\xbb\x38\xbc\x08\xbb\x9f\xb9\x95\xbe\xe0\xbc\x08\xb9\xfa\xba\x63\xb8\x5a\xb6")
diff --git a/test/emms-info-native-ogg-tests.el 
b/test/emms-info-native-ogg-tests.el
index 681c0ada2a..9cf1665d96 100644
--- a/test/emms-info-native-ogg-tests.el
+++ b/test/emms-info-native-ogg-tests.el
@@ -27,7 +27,7 @@
 (require 'emms-info-native-ogg)
 (require 'ert)
 
-(ert-deftest emms-ogg-test-decode-page ()
+(ert-deftest emms-test-ogg-decode-page ()
   (let* ((bytes 
"\x4f\x67\x67\x53\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x86\xd1\x9e\x17\x00\x00\x00\x00\x35\x52\xfb\x88\x01\x1e\x01\x76\x6f\x72\x62\x69\x73\x00\x00\x00\x00\x01\x44\xac\x00\x00\x00\x00\x00\x00\x80\x38\x01\x00\x00\x00\x00\x00\xb8\x01")
          (page (bindat-unpack emms-info-native-ogg--page-bindat-spec bytes)))
     (should (= (emms-info-native-ogg--num-packets page) 1))
@@ -35,7 +35,7 @@
     (should (equal (bindat-get-field page 'payload)
                    
"\x01\x76\x6f\x72\x62\x69\x73\x00\x00\x00\x00\x01\x44\xac\x00\x00\x00\x00\x00\x00\x80\x38\x01\x00\x00\x00\x00\x00\xb8\x01"))))
 
-(ert-deftest emms-ogg-test-decode-vorbis-headers ()
+(ert-deftest emms-test-ogg-decode-vorbis-headers ()
   "Test `emms-info-ogg--decode-headers' with Vorbis data."
   (let ((bytes 
"\x01\x76\x6f\x72\x62\x69\x73\x00\x00\x00\x00\x01\x44\xac\x00\x00\x00\x00\x00\x00\x80\x38\x01\x00\x00\x00\x00\x00\xb8\x01\x03\x76\x6f\x72\x62\x69\x73\x34\x00\x00\x00\x58\x69\x70\x68\x2e\x4f\x72\x67\x20\x6c\x69\x62\x56\x6f\x72\x62\x69\x73\x20\x49\x20\x32\x30\x32\x30\x30\x37\x30\x34\x20\x28\x52\x65\x64\x75\x63\x69\x6e\x67\x20\x45\x6e\x76\x69\x72\x6f\x6e\x6d\x65\x6e\x74\x29\x02\x00\x00\x00\x07\x00\x00\x00\x66\x6f\x6f\x3d\x62\x61\x72\x1b\x00\x00\x00\x4b\x65\x79\x3d\xce\x9f\xe1
 [...]
     (should
@@ -65,7 +65,7 @@
            (user-comment . "Key=\316\237\341\275\220\317\207\341\275\266 
\316\244\316\261\341\275\220\317\204\341\275\260")))
          (framing-bit . 1)))))))
 
-(ert-deftest emms-ogg-test-decode-opus-headers ()
+(ert-deftest emms-test-ogg-decode-opus-headers ()
   "Test `emms-info-ogg--decode-headers' with Opus data."
   (let ((bytes 
"\x4f\x70\x75\x73\x48\x65\x61\x64\x01\x01\x38\x01\x44\xac\x00\x00\x00\x00\x00\x4f\x70\x75\x73\x54\x61\x67\x73\x0d\x00\x00\x00\x6c\x69\x62\x6f\x70\x75\x73\x20\x31\x2e\x33\x2e\x31\x03\x00\x00\x00\x26\x00\x00\x00\x45\x4e\x43\x4f\x44\x45\x52\x3d\x6f\x70\x75\x73\x65\x6e\x63\x20\x66\x72\x6f\x6d\x20\x6f\x70\x75\x73\x2d\x74\x6f\x6f\x6c\x73\x20\x30\x2e\x31\x2e\x31\x30\x07\x00\x00\x00\x66\x6f\x6f\x3d\x62\x61\x72\x1b\x00\x00\x00\x4b\x65\x79\x3d\xce\x9f\xe1\xbd\x90\xcf\x87\xe1\xbd\xb6
 [...]
     (emms-equal-lists
@@ -91,16 +91,16 @@
          ((length . 27)
           (user-comment . "Key=\316\237\341\275\220\317\207\341\275\266 
\316\244\316\261\341\275\220\317\204\341\275\260"))))))))
 
-(defun emms-ogg-test--decode-last-page (bytes)
+(defun emms-test-ogg--decode-last-page (bytes)
   "Call `emms-info-ogg--decode-last-page' with BYTES input.
 
-This is a helper function for `emms-ogg-test-decode-last-page'."
+This is a helper function for `emms-test-ogg-decode-last-page'."
   (with-temp-buffer
     (set-buffer-multibyte nil)
     (insert (concat bytes))
     (emms-info-native-ogg--decode-last-page)))
 
-(ert-deftest emms-ogg-test-decode-last-page()
+(ert-deftest emms-test-ogg-decode-last-page()
   (let ((valid 
"\x01\x02\x03\x04\x4f\x67\x67\x53\x00\x04\x00\x24\x08\x01\x00\x00\x00\x00\x9c\x39\x6e\x47\x40\x08\x00\x00\x19\x4e\xac\xa3\x01\x0a\x4f\x67\x67\x53\x31\x32\x33\x34\x35\x36")
         (notlast 
"\x01\x02\x03\x04\x4f\x67\x67\x53\x00\x00\x00\x24\x08\x01\x00\x00\x00\x00\x9c\x39\x6e\x47\x40\x08\x00\x00\x19\x4e\xac\xa3\x01\x0a\x4f\x67\x67\x53\x31\x32\x33\x34\x35\x36")
         (invalid 
"\x01\x02\x03\x04\x4f\x67\x67\x53\x00\x04\x00\x24\x08\x01\x00\x00\x00\x00\x9c\x39\x6e\x47\x40\x08\x00\x00\x01\x02\x03\x04\x01\x0a\x4f\x67\x67\x53\x31\x32\x33\x34\x35\x36")
@@ -118,12 +118,12 @@ This is a helper function for 
`emms-ogg-test-decode-last-page'."
            (payload . "OggS123456")))))
     (unless (eval-when-compile (fboundp 'bindat-type))
       (push (cons 'granule-position-bytes [0 36 8 1 0 0 0 0]) valid-result))
-    (should (emms-equal-lists (emms-ogg-test--decode-last-page valid)
+    (should (emms-equal-lists (emms-test-ogg--decode-last-page valid)
                               valid-result))
-    (should (equal (emms-ogg-test--decode-last-page notlast) nil))
-    (should (equal (emms-ogg-test--decode-last-page invalid) nil))))
+    (should (equal (emms-test-ogg--decode-last-page notlast) nil))
+    (should (equal (emms-test-ogg--decode-last-page invalid) nil))))
 
-(ert-deftest emms-ogg-test-calculate-checksum ()
+(ert-deftest emms-test-ogg-calculate-checksum ()
   (let ((bytes 
"\x01\x02\x03\x04\x4f\x67\x67\x53\x00\x04\x00\x24\x08\x01\x00\x00\x00\x00\x9c\x39\x6e\x47\x40\x08\x00\x00\x19\x4e\xac\xa3\x01\x0a\x4f\x67\x67\x53\x31\x32\x33\x34\x35\x36"))
     (should (= (emms-info-native-ogg--checksum bytes) 445885580))))
 
diff --git a/test/emms-info-native-tests.el b/test/emms-info-native-tests.el
index 71c410e786..89f906cc90 100644
--- a/test/emms-info-native-tests.el
+++ b/test/emms-info-native-tests.el
@@ -31,7 +31,7 @@
 (require 'emms-info-native)
 (require 'ert)
 
-(ert-deftest emms-info-native-test-mp3 ()
+(ert-deftest emms-test-info-native-mp3 ()
   (should (equal (emms-info-native--decode-info-fields
                   "resources/sine.mp3")
                  '(("year" . "2023")
@@ -40,7 +40,7 @@
                    ("title" . "440 Hz sine wave")
                    ("playing-time" . 5)))))
 
-(ert-deftest emms-info-native-test-ogg ()
+(ert-deftest emms-test-info-native-ogg ()
   (should (equal (emms-info-native--decode-info-fields
                   "resources/sine.ogg")
                  '(("artist" . "EMMS project")
@@ -49,7 +49,7 @@
                    ("album" . "Test Data ☺")
                    ("playing-time" . 5)))))
 
-(ert-deftest emms-info-native-test-flac ()
+(ert-deftest emms-test-info-native-flac ()
   (should (equal (emms-info-native--decode-info-fields
                   "resources/sine.flac")
                  '(("artist" . "EMMS project")
@@ -58,7 +58,7 @@
                    ("album" . "Test Data ☺")
                    ("playing-time" . 5)))))
 
-(ert-deftest emms-info-native-test-opus ()
+(ert-deftest emms-test-info-native-opus ()
   (should (equal (emms-info-native--decode-info-fields
                   "resources/sine.opus")
                  '(("artist" . "EMMS project")
diff --git a/test/emms-info-native-vorbis-tests.el 
b/test/emms-info-native-vorbis-tests.el
index 680b44c620..bccdda6521 100644
--- a/test/emms-info-native-vorbis-tests.el
+++ b/test/emms-info-native-vorbis-tests.el
@@ -26,7 +26,7 @@
 (require 'emms-info-native-vorbis)
 (require 'ert)
 
-(ert-deftest emms-vorbis-test-extract-comments ()
+(ert-deftest emms-test-vorbis-extract-comments ()
   (let ((comments
          (quote (((user-comment . 
"MUSICBRAINZ_RELEASEGROUPID=9b307293-d2e6-34a9-a289-161c5baf187f")
                   (length . 63))
@@ -45,7 +45,7 @@
                            ("originalyear" . "1997")
                            ("originaldate" . "1997-03-31")))))))
 
-(ert-deftest emms-vorbis-test-split-comment ()
+(ert-deftest emms-test-vorbis-split-comment ()
   (should (equal (emms-info-native-vorbis--split-comment "") nil))
   (should (equal (emms-info-native-vorbis--split-comment "x") nil))
   (should (equal (emms-info-native-vorbis--split-comment "x=") nil))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]