From 58451f9718f96905f6f605b8447b15a451693572 Mon Sep 17 00:00:00 2001
From: Marius Gavrilescu <marius@ieval.ro>
Date: Tue, 3 Sep 2013 11:04:10 +0300
Subject: [PATCH] Update tests

---
 MANIFEST            |   1 +
 empty.ogg           | Bin 0 -> 6770 bytes
 t/App-MusicExpo.t   |  17 ++++++++++++++---
 t/musicexpo-cache.t |   3 +--
 4 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 empty.ogg

diff --git a/MANIFEST b/MANIFEST
index 3aac6cc..6b43953 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -9,3 +9,4 @@ lib/App/MusicExpo.pm
 musicexpo
 empty.mp3
 empty.flac
+empty.ogg
diff --git a/empty.ogg b/empty.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..62ca55268e2cbcea62b4b37798cd0b7ba65fa77e
GIT binary patch
literal 6770
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

literal 0
HcmV?d00001

diff --git a/t/App-MusicExpo.t b/t/App-MusicExpo.t
index 6dfc455..ca2c37d 100644
--- a/t/App-MusicExpo.t
+++ b/t/App-MusicExpo.t
@@ -2,7 +2,7 @@
 use v5.14;
 use warnings;
 
-use Test::More tests => 19;
+use Test::More tests => 28;
 
 use Storable qw/thaw/;
 
@@ -10,6 +10,7 @@ BEGIN { use_ok('App::MusicExpo'); }
 
 my $flacinfo = thaw App::MusicExpo::flacinfo 'empty.flac';
 my $mp3info = thaw App::MusicExpo::mp3info 'empty.mp3';
+my $vorbisinfo = thaw App::MusicExpo::vorbisinfo 'empty.ogg';
 
 is $flacinfo->{format}, 'FLAC', 'flacinfo format';
 is $flacinfo->{title}, 'Cellule', 'flacinfo title';
@@ -19,7 +20,7 @@ is $flacinfo->{album}, 'L\'autre endroit', 'flacinfo album';
 is $flacinfo->{tracknumber}, '01', 'flacinfo tracknumber';
 is $flacinfo->{tracktotal}, '09', 'flacinfo tracktotal';
 is $flacinfo->{genre}, 'Electro', 'flacinfo genre';
-is $flacinfo->{path}, '/music/empty.flac', 'flacinfo path';
+is $flacinfo->{file}, 'empty.flac', 'flacinfo path';
 
 is $mp3info->{format}, 'MP3', 'mp3info format';
 is $mp3info->{title}, 'Cellule', 'mp3info title';
@@ -29,4 +30,14 @@ is $mp3info->{album}, 'L\'autre endroit', 'mp3info album';
 is $mp3info->{tracknumber}, '01', 'mp3info tracknumber';
 is $mp3info->{tracktotal}, '09', 'mp3info tracktotal';
 is $mp3info->{genre}, 'Electro', 'mp3info genre';
-is $mp3info->{path}, '/music/empty.mp3', 'mp3info path';
+is $mp3info->{file}, 'empty.mp3', 'mp3info path';
+
+is $vorbisinfo->{format}, 'Vorbis', 'vorbisinfo format';
+is $vorbisinfo->{title}, 'Cellule', 'vorbisinfo title';
+is $vorbisinfo->{artist}, 'Silence', 'vorbisinfo artist';
+is $vorbisinfo->{year}, 2005, 'vorbisinfo year';
+is $vorbisinfo->{album}, 'L\'autre endroit', 'vorbisinfo album';
+is $vorbisinfo->{tracknumber}, '01', 'vorbisinfo tracknumber';
+is $vorbisinfo->{tracktotal}, '09', 'vorbisinfo tracktotal';
+is $vorbisinfo->{genre}, 'Electro', 'vorbisinfo genre';
+is $vorbisinfo->{file}, 'empty.ogg', 'vorbisinfo path';
diff --git a/t/musicexpo-cache.t b/t/musicexpo-cache.t
index 21f5d99..1f464ed 100644
--- a/t/musicexpo-cache.t
+++ b/t/musicexpo-cache.t
@@ -32,8 +32,7 @@ is $out, <<'OUT', 'output is correct';
 <thead>
 <tr><th>Title<th>Artist<th>Album<th>Genre<th>Track<th>Year<th>Type
 <tbody>
-<tr><td><a href="%2Fmusic%2Fempty.flac">Cellule</a><td>Silence<td>L&#39;autre endroit<td>Electro<td>01/09<td>2005<td>FLAC
-<tr><td><a href="%2Fmusic%2Fempty.mp3">Cellule</a><td>Silence<td>L&#39;autre endroit<td>Electro<td>01/09<td>2005<td>MP3
+<tr><td><a href=Cellule<td>Silence<td>L&#39;autre endroit<td>Electro<td>01/09<td>2005<td><a href="/music/empty.flac">FLAC</a> <a href="/music/empty.mp3">MP3</a> 
 </table>
 OUT
 
-- 
2.30.2