Added regex for additional TCON to id3v1 genre mapping and testcases

svn path=/trunk/; revision=2823

10 files changed, 51 insertions, 0 deletions

diff --git a/tests/tracker-extract/data/mp3/create_mp3_testdata b/tests/tracker-extract/data/mp3/create_mp3_testdata
index 73ab61f58..8a4118743 100755
--- a/tests/tracker-extract/data/mp3/create_mp3_testdata
+++ b/tests/tracker-extract/data/mp3/create_mp3_testdata
@@ -38,6 +38,26 @@ id3v2 --id3v2-only -t "The titlev23"  -a "The artistv23" -A "The album namev23"
 echo Basic id3v23 tags 1| text2wave - | lame --resample 48 - "id3v23_comm_3.mp3"
 id3v2 --id3v2-only -t "The titlev23"  -a "The artistv23" -A "The album namev23" -y 1969 -c "c"  -T 8  -g 8  "id3v23_comm_3.mp3"
 
+#TCON
+echo id3v23 tcon 1| text2wave - | lame --resample 48 - "id3v23_tcon_1.mp3"
+id3v2 --id3v2-only --TCON "Red Metal"  "id3v23_tcon_1.mp3"
+
+echo id3v23 tcon 2| text2wave - | lame --resample 48 - "id3v23_tcon_2.mp3"
+id3v2 --id3v2-only --TCON "(42)"  "id3v23_tcon_2.mp3"
+
+echo id3v23 tcon 3| text2wave - | lame --resample 48 - "id3v23_tcon_3.mp3"
+id3v2 --id3v2-only --TCON "(42)Soul"  "id3v23_tcon_3.mp3"
+
+echo id3v23 tcon 4| text2wave - | lame --resample 48 - "id3v23_tcon_4.mp3"
+id3v2 --id3v2-only --TCON "(42)Smooth Soul Metal"  "id3v23_tcon_4.mp3"
+
+#TCON the next ones are "against the spec", but usually handled this way
+echo id3v23 tcon 5| text2wave - | lame --resample 48 - "id3v23_tcon_5.mp3"
+id3v2 --id3v2-only --TCON "42"  "id3v23_tcon_5.mp3"
+
+echo id3v23 tcon 6| text2wave - | lame --resample 48 - "id3v23_tcon_6.mp3"
+id3v2 --id3v2-only --TCON "42 Red Metal"  "id3v23_tcon_6.mp3"
+
 #Others
 echo Basic id3v23 tags 1| text2wave - | lame --resample 48 - "id3v23_tags_1.mp3"
 id3v2 --id3v2-only  --PCNT "4" --TALB "Album/Movie/Show" --TCON "content type" --TCOP "copyright me" --TDAT "2312" --TENC "julkaisija" --TEXT "Monday, monday.. yeah yeah.. monday" --TIT2 "Title or songname" --TLAN "fin" --TPE1 "lead performer" --TYER "2003" "id3v23_tags_1.mp3"
diff --git a/tests/tracker-extract/data/mp3/id3v23_tcon_1.data b/tests/tracker-extract/data/mp3/id3v23_tcon_1.data
new file mode 100644
index 000000000..046b057cd
--- /dev/null
+++ b/tests/tracker-extract/data/mp3/id3v23_tcon_1.data
@@ -0,0 +1 @@
+Audio:Genre       = "Red Metal"
diff --git a/tests/tracker-extract/data/mp3/id3v23_tcon_2.data b/tests/tracker-extract/data/mp3/id3v23_tcon_2.data
new file mode 100644
index 000000000..c0602713f
--- /dev/null
+++ b/tests/tracker-extract/data/mp3/id3v23_tcon_2.data
@@ -0,0 +1 @@
+Audio:Genre       = "Soul"
diff --git a/tests/tracker-extract/data/mp3/id3v23_tcon_3.data b/tests/tracker-extract/data/mp3/id3v23_tcon_3.data
new file mode 100644
index 000000000..c0602713f
--- /dev/null
+++ b/tests/tracker-extract/data/mp3/id3v23_tcon_3.data
@@ -0,0 +1 @@
+Audio:Genre       = "Soul"
diff --git a/tests/tracker-extract/data/mp3/id3v23_tcon_4.data b/tests/tracker-extract/data/mp3/id3v23_tcon_4.data
new file mode 100644
index 000000000..c0602713f
--- /dev/null
+++ b/tests/tracker-extract/data/mp3/id3v23_tcon_4.data
@@ -0,0 +1 @@
+Audio:Genre       = "Soul"
diff --git a/tests/tracker-extract/data/mp3/id3v23_tcon_5.data b/tests/tracker-extract/data/mp3/id3v23_tcon_5.data
new file mode 100644
index 000000000..c0602713f
--- /dev/null
+++ b/tests/tracker-extract/data/mp3/id3v23_tcon_5.data
@@ -0,0 +1 @@
+Audio:Genre       = "Soul"
diff --git a/tests/tracker-extract/data/mp3/id3v23_tcon_6.data b/tests/tracker-extract/data/mp3/id3v23_tcon_6.data
new file mode 100644
index 000000000..cebfdebc2
--- /dev/null
+++ b/tests/tracker-extract/data/mp3/id3v23_tcon_6.data
@@ -0,0 +1 @@
+Audio:Genre       = "42 Red Metal"
diff --git a/tests/tracker-extract/tracker-extract-mp3-test.c b/tests/tracker-extract/tracker-extract-mp3-test.c
index 4aa1661b0..c329c75f0 100644
--- a/tests/tracker-extract/tracker-extract-mp3-test.c
+++ b/tests/tracker-extract/tracker-extract-mp3-test.c
@@ -51,6 +51,8 @@ main (int argc, char **argv) {
 			      data, test_tracker_extract_mp3_id3v1_basic);
 	g_test_add_data_func ("/tracker-extract/tracker-extract-mp3/id3v23_basic",
 			      data, test_tracker_extract_mp3_id3v23_basic);
+	g_test_add_data_func ("/tracker-extract/tracker-extract-mp3/id3v23_tcon",
+			      data, test_tracker_extract_mp3_id3v23_tcon);
 	g_test_add_data_func ("/tracker-extract/tracker-extract-mp3/id3v23_tags",
 			      data, test_tracker_extract_mp3_id3v23_tags);
 	g_test_add_data_func ("/tracker-extract/tracker-extract-mp3/header_bitrate",
diff --git a/tests/tracker-extract/tracker-extract-testsuite-mp3.c b/tests/tracker-extract/tracker-extract-testsuite-mp3.c
index ffd0b7849..809b28c64 100644
--- a/tests/tracker-extract/tracker-extract-testsuite-mp3.c
+++ b/tests/tracker-extract/tracker-extract-testsuite-mp3.c
@@ -43,6 +43,16 @@ static const ExtractData data_id3v23_basic[] = {
 	{ NULL, NULL }
 };
 
+static const ExtractData data_id3v23_tcon[] = { 
+	{ "/mp3/id3v23_tcon_1.mp3", "/mp3/id3v23_tcon_1.data" },
+	{ "/mp3/id3v23_tcon_2.mp3", "/mp3/id3v23_tcon_2.data" },
+	{ "/mp3/id3v23_tcon_3.mp3", "/mp3/id3v23_tcon_3.data" },
+	{ "/mp3/id3v23_tcon_4.mp3", "/mp3/id3v23_tcon_4.data" },
+	{ "/mp3/id3v23_tcon_5.mp3", "/mp3/id3v23_tcon_5.data" },
+	{ "/mp3/id3v23_tcon_6.mp3", "/mp3/id3v23_tcon_6.data" },
+	{ NULL, NULL }
+};
+
 static const ExtractData data_id3v23_tags[] = { 
 	{ "/mp3/id3v23_trck_1.mp3", "/mp3/id3v23_trck_1.data" },
 	{ "/mp3/id3v23_comm_1.mp3", "/mp3/id3v23_comm_1.data" },
@@ -128,6 +138,18 @@ void test_tracker_extract_mp3_id3v23_tags(gconstpointer data)
 	}
 }
 
+void test_tracker_extract_mp3_id3v23_tcon(gconstpointer data)
+{
+	const TrackerExtractorData *extractor = data;
+	guint i;
+
+	for (i=0; data_id3v23_tcon[i].filename; i++) {
+		extract_file (data,
+			      data_id3v23_tcon[i].filename,
+			      data_id3v23_tcon[i].testdata);		
+	}
+}
+
 void test_tracker_extract_mp3_header_bitrate(gconstpointer data)
 {
 	const TrackerExtractorData *extractor = data;
diff --git a/tests/tracker-extract/tracker-extract-testsuite-mp3.h b/tests/tracker-extract/tracker-extract-testsuite-mp3.h
index 381c127ef..d110d5e37 100644
--- a/tests/tracker-extract/tracker-extract-testsuite-mp3.h
+++ b/tests/tracker-extract/tracker-extract-testsuite-mp3.h
@@ -25,6 +25,7 @@
 
 void test_tracker_extract_mp3_id3v1_basic       (gconstpointer data);
 void test_tracker_extract_mp3_id3v23_basic      (gconstpointer data);
+void test_tracker_extract_mp3_id3v23_tcon       (gconstpointer data);
 void test_tracker_extract_mp3_id3v23_tags       (gconstpointer data);
 void test_tracker_extract_mp3_header_bitrate    (gconstpointer data);
 void test_tracker_extract_mp3_header_bitrate_vbr(gconstpointer data);