From 43a33c5f03510c378cc462ed160fe888dc9e41c5 Mon Sep 17 00:00:00 2001
From: Sambhav Kothari <sambhavs.email@gmail.com>
Date: Thu, 13 Jul 2017 16:57:47 +0530
Subject: [PATCH] Add more test data

---
 test/data/ws_data/artist.json        |  2 +-
 test/data/ws_data/country.json       |  2 +-
 test/data/ws_data/media.json         |  2 +-
 test/data/ws_data/recording.json     |  2 +-
 test/data/ws_data/release.json       | 12 ++++++++----
 test/data/ws_data/release_group.json |  9 ++++++++-
 test/data/ws_data/track.json         |  2 +-
 test/test_mbjson.py                  |  7 +++++--
 8 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/test/data/ws_data/artist.json b/test/data/ws_data/artist.json
index 363ce2a084..c37c6115cf 100644
--- a/test/data/ws_data/artist.json
+++ b/test/data/ws_data/artist.json
@@ -35,4 +35,4 @@
         "begin":"1991-02-17",
         "ended":false
     }
-}
\ No newline at end of file
+}
diff --git a/test/data/ws_data/country.json b/test/data/ws_data/country.json
index c31242ff3a..8d2de834fc 100644
--- a/test/data/ws_data/country.json
+++ b/test/data/ws_data/country.json
@@ -36,4 +36,4 @@
     "id":"03e4ebe1-0a44-411c-8e19-78e0768603f8",
     "status":"Official",
     "packaging-id":"f7101ce3-0384-39ce-9fde-fbbd0044d35f"
-}
\ No newline at end of file
+}
diff --git a/test/data/ws_data/media.json b/test/data/ws_data/media.json
index 963552b980..c392fc62ce 100644
--- a/test/data/ws_data/media.json
+++ b/test/data/ws_data/media.json
@@ -8,4 +8,4 @@
     "tracks":[
 
     ]
-}
\ No newline at end of file
+}
diff --git a/test/data/ws_data/recording.json b/test/data/ws_data/recording.json
index fd2debc022..90d9af2dcc 100644
--- a/test/data/ws_data/recording.json
+++ b/test/data/ws_data/recording.json
@@ -629,4 +629,4 @@
     ],
     "length":281000,
     "title":"Thinking Out Loud"
-}
\ No newline at end of file
+}
diff --git a/test/data/ws_data/release.json b/test/data/ws_data/release.json
index e1b3f1afa2..1d88cf5915 100644
--- a/test/data/ws_data/release.json
+++ b/test/data/ws_data/release.json
@@ -1,4 +1,11 @@
 {
+    "tags": [
+        {"name": "test", "count": 5},
+        {"name": "test2", "count": 3}
+    ],
+    "user-tags": [
+        {"name": "test"}
+    ],
     "release-group": {
         "first-release-date": "1973-03-24",
         "artist-credit": [
@@ -153,9 +160,6 @@
         "script": "Latn"
     },
     "barcode": "123",
-    "tags": [
-        
-    ],
     "relations": [
         {
             "attributes": [
@@ -287,4 +291,4 @@
     ],
     "country": "GB",
     "status-id": "4e304316-386d-3409-af2e-78857eec5cfe"
-}
\ No newline at end of file
+}
diff --git a/test/data/ws_data/release_group.json b/test/data/ws_data/release_group.json
index f7de370592..2c60e9b5ca 100644
--- a/test/data/ws_data/release_group.json
+++ b/test/data/ws_data/release_group.json
@@ -1,5 +1,12 @@
 {
     "first-release-date":"1973-03-24",
+    "tags": [
+        {"name": "test", "count": 5},
+        {"name": "test2", "count": 3}
+    ],
+    "user-tags": [
+        {"name": "test"}
+    ],
     "disambiguation":"",
     "title":"The Dark Side of the Moon",
     "id":"f5093c06-23e3-404f-aeaa-40f72885ee3a",
@@ -1016,4 +1023,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/test/data/ws_data/track.json b/test/data/ws_data/track.json
index 748023c99b..295cc61929 100644
--- a/test/data/ws_data/track.json
+++ b/test/data/ws_data/track.json
@@ -10,4 +10,4 @@
     "number":"A1",
     "id":"d4156411-b884-368f-a4cb-7c0101a557a2",
     "title":"Speak to Me"
-}
\ No newline at end of file
+}
diff --git a/test/test_mbjson.py b/test/test_mbjson.py
index 0937bd58ba..74a59e979f 100644
--- a/test/test_mbjson.py
+++ b/test/test_mbjson.py
@@ -10,9 +10,9 @@
                            release_group_to_metadata, country_list_from_node,
                            media_formats_from_node)
 from picard.metadata import Metadata
+from picard.releasegroup import ReleaseGroup
 from picard.track import Track
 
-
 settings = {
     "standardize_tracks": False,
     "standardize_artists": False,
@@ -56,6 +56,7 @@ def test_release(self):
         self.assertEqual(m['~albumartists'], 'Pink Floyd')
         self.assertEqual(m['~albumartists_sort'], 'Pink Floyd')
         self.assertEqual(m['~releaselanguage'], 'eng')
+        self.assertEqual(a.folksonomy_tags, {'test2': 3, 'test': 6})
 
     def test_media_formats_from_node(self):
         formats = media_formats_from_node(self.json_doc['media'])
@@ -145,13 +146,15 @@ def setUp(self):
 
     def test_release_group(self):
         m = Metadata()
-        release_group_to_metadata(self.json_doc, m)
+        r = ReleaseGroup("1")
+        release_group_to_metadata(self.json_doc, m, r)
         self.assertEqual(m['musicbrainz_releasegroupid'], 'f5093c06-23e3-404f-aeaa-40f72885ee3a')
         self.assertEqual(m['originaldate'], '1973-03-24')
         self.assertEqual(m['originalyear'], '1973')
         self.assertEqual(m['releasetype'], 'album')
         self.assertEqual(m['~primaryreleasetype'], 'album')
         self.assertEqual(m['~releasegroup'], 'The Dark Side of the Moon')
+        self.assertEqual(r.folksonomy_tags, {'test2': 3, 'test': 6})
 
 
 class CountryListTest(MBJSONTest):