From ad66b8796a8e994c52ebec6eb6ef24b358b047e2 Mon Sep 17 00:00:00 2001
From: Johannes Baiter <johannes.baiter@gmail.com>
Date: Tue, 28 May 2013 13:50:20 +0200
Subject: [PATCH] Fix tests for albums from manual ID

---
 test/test_mb.py | 16 ++++++++++++++++
 test/test_ui.py | 22 ----------------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/test/test_mb.py b/test/test_mb.py
index e23201706..278e5cd1f 100644
--- a/test/test_mb.py
+++ b/test/test_mb.py
@@ -277,6 +277,22 @@ class MBAlbumInfoTest(unittest.TestCase):
         self.assertEqual(track.artist_sort, 'TRACK ARTIST SORT NAME')
         self.assertEqual(track.artist_credit, 'TRACK ARTIST CREDIT')
 
+    def test_album_for_id_correct(self):
+        id_string = "28e32c71-1450-463e-92bf-e0a46446fc11"
+        out = mb.album_for_id(id_string)
+        self.assertEqual(out.album_id, id_string)
+
+    def test_album_for_id_non_id_returns_none(self):
+        id_string = "blah blah"
+        out = mb.album_for_id(id_string)
+        self.assertEqual(out, None)
+
+    def test_album_for_id_url_finds_id(self):
+        id_string = "28e32c71-1450-463e-92bf-e0a46446fc11"
+        id_url = "http://musicbrainz.org/entity/%s" % id_string
+        out = mb.album_for_id(id_url)
+        self.assertEqual(out.album_id, id_string)
+
 class ArtistFlatteningTest(unittest.TestCase):
     def _credit_dict(self, suffix=''):
         return {
diff --git a/test/test_ui.py b/test/test_ui.py
index c9d57a466..b679021f7 100644
--- a/test/test_ui.py
+++ b/test/test_ui.py
@@ -585,28 +585,6 @@ class ShowdiffTest(_common.TestCase):
 
         self.assertEqual(complete_diff, partial_diff)
 
-AN_ID = "28e32c71-1450-463e-92bf-e0a46446fc11"
-class ManualIDTest(_common.TestCase):
-    def setUp(self):
-        super(ManualIDTest, self).setUp()
-        _common.log.setLevel(logging.CRITICAL)
-        self.io.install()
-
-    def test_id_accepted(self):
-        self.io.addinput(AN_ID)
-        out = commands.manual_id(False)
-        self.assertEqual(out, AN_ID)
-
-    def test_non_id_returns_none(self):
-        self.io.addinput("blah blah")
-        out = commands.manual_id(False)
-        self.assertEqual(out, None)
-
-    def test_url_finds_id(self):
-        self.io.addinput("http://musicbrainz.org/entity/%s?something" % AN_ID)
-        out = commands.manual_id(False)
-        self.assertEqual(out, AN_ID)
-
 class ShowChangeTest(_common.TestCase):
     def setUp(self):
         super(ShowChangeTest, self).setUp()