rbrainz 0.1.1 → 0.2.0

data/test/test_mbxml.rb

@@ -1,10 +1,13 @@
-# $Id: test_mbxml.rb 33 2007-05-29 14:48:47Z phw $
-# Copyright (c) 2007, Philipp Wolfer
-# All rights reserved.
-# See LICENSE for permissions.
+# $Id: test_mbxml.rb 146 2007-07-19 16:33:38Z phw $
+#
+# Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
+# Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
+# License::   RBrainz is free software distributed under a BSD style license.
+#             See LICENSE[file:../LICENSE.html] for permissions.
 
 require 'test/unit'
 require 'rbrainz'
+require 'test_factory'
 include MusicBrainz
 
 # Unit test for the MBXML class.
@@ -23,46 +26,52 @@ class TestMBXML < Test::Unit::TestCase
   
   def test_empty
     # The first test result is completely empty
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'artist/empty_1.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/empty_1.xml')
     assert_equal nil, mbxml.get_entity(:artist)
     assert_equal nil, mbxml.get_entity(:release)
     assert_equal nil, mbxml.get_entity(:track)
     assert_equal nil, mbxml.get_entity(:label)
-    assert_equal nil, mbxml.get_entity_list(:artist)
-    assert_equal nil, mbxml.get_entity_list(:release)
-    assert_equal nil, mbxml.get_entity_list(:track)
-    assert_equal nil, mbxml.get_entity_list(:label)
+    assert_raise(Webservice::MBXML::ParseError) { mbxml.get_entity_list(:artist) }
+    assert_raise(Webservice::MBXML::ParseError) { mbxml.get_entity_list(:release) }
+    assert_raise(Webservice::MBXML::ParseError) { mbxml.get_entity_list(:track) }
+    assert_raise(Webservice::MBXML::ParseError) { mbxml.get_entity_list(:label) }
     
     # The second contains an empty artist list
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'artist/empty_2.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/empty_2.xml')
     assert_equal nil, mbxml.get_entity(:artist)
     assert_equal nil, mbxml.get_entity(:release)
     assert_equal nil, mbxml.get_entity(:track)
     assert_equal nil, mbxml.get_entity(:label)
-    assert_equal Array.new, mbxml.get_entity_list(:artist)
-    assert_equal nil, mbxml.get_entity_list(:release)
-    assert_equal nil, mbxml.get_entity_list(:track)
-    assert_equal nil, mbxml.get_entity_list(:label)
+    assert mbxml.get_entity_list(:artist).empty?
+    assert_raise(Webservice::MBXML::ParseError) { mbxml.get_entity_list(:release) }
+    assert_raise(Webservice::MBXML::ParseError) { mbxml.get_entity_list(:track) }
+    assert_raise(Webservice::MBXML::ParseError) { mbxml.get_entity_list(:label) }
   end
   
   def test_artist_search
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'artist/search_result_1.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/search_result_1.xml')
     assert_equal nil, mbxml.get_entity(:artist)
     assert_equal nil, mbxml.get_entity(:release)
     assert_equal nil, mbxml.get_entity(:track)
     assert_equal nil, mbxml.get_entity(:label)
 
     artist_list = mbxml.get_entity_list(:artist)
+    assert_equal 0, artist_list.offset
+    assert_equal 47, artist_list.count
+    
     assert_equal 3, artist_list.size, artist_list.inspect
-    assert_equal 'c0b2500e-0cef-4130-869d-732b23ed9df5', artist_list[0].id.uuid
-    assert_equal Model::Artist::TYPE_PERSON, artist_list[0].type
-    assert_equal 'Tori Amos', artist_list[0].name
-    assert_equal 'Amos, Tori', artist_list[0].sort_name
-    assert_equal '1963-08-22', artist_list[0].begin_date.to_s
+    assert_equal 'c0b2500e-0cef-4130-869d-732b23ed9df5', artist_list[0].entity.id.uuid
+    assert_equal Model::Artist::TYPE_PERSON, artist_list[0].entity.type
+    assert_equal 'Tori Amos', artist_list[0].entity.name
+    assert_equal 'Amos, Tori', artist_list[0].entity.sort_name
+    assert_equal '1963-08-22', artist_list[0].entity.begin_date.to_s
+    assert_equal 100, artist_list[0].score
+    assert_equal 44, artist_list[1].score
+    assert_equal 44, artist_list[2].score
   end
   
   def test_artist_tchaikovsky_1
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'artist/Tchaikovsky-1.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/Tchaikovsky-1.xml')
     artist = mbxml.get_entity(:artist)
     
     assert_equal '9ddd7abc-9e1b-471d-8031-583bc6bc8be9', artist.id.uuid
@@ -74,8 +83,26 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 80, artist.aliases.size
   end
   
+  def test_artist_tchaikovsky_2
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/Tchaikovsky-2.xml')
+    artist = mbxml.get_entity(:artist)
+    
+    assert_equal '9ddd7abc-9e1b-471d-8031-583bc6bc8be9', artist.id.uuid
+    assert_equal Model::Artist::TYPE_PERSON, artist.type
+    assert_equal 'Пётр Ильич Чайковский', artist.name
+    assert_equal 4, artist.tags.size
+    assert_equal 'classical', artist.tags[0].text
+    assert_equal 100, artist.tags[0].count
+    assert_equal 'russian', artist.tags[1].text
+    assert_equal 60, artist.tags[1].count
+    assert_equal 'romantic era', artist.tags[2].text
+    assert_equal 40, artist.tags[2].count
+    assert_equal 'composer', artist.tags[3].text
+    assert_equal 120, artist.tags[3].count
+  end
+ 
   def test_artist_tori_amos_1
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'artist/Tori_Amos_1.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/Tori_Amos_1.xml')
     artist = mbxml.get_entity(:artist)
     
     assert_equal 'c0b2500e-0cef-4130-869d-732b23ed9df5', artist.id.uuid
@@ -86,7 +113,7 @@ class TestMBXML < Test::Unit::TestCase
   end
 
   def test_artist_tori_amos_2
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'artist/Tori_Amos_2.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/Tori_Amos_2.xml')
     artist = mbxml.get_entity(:artist)
     
     assert_equal 'c0b2500e-0cef-4130-869d-732b23ed9df5', artist.id.uuid
@@ -97,14 +124,17 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 3, artist.releases.size
     assert_equal 'a7ccb022-f437-4492-8eee-8f85d85cdb96', artist.releases[0].id.uuid
     assert_equal artist, artist.releases[0].artist
+    assert_equal 3, artist.releases[0].discs.count
     assert_equal '9cbf7040-dbdc-403c-940f-7562d9712514', artist.releases[1].id.uuid
     assert_equal artist, artist.releases[1].artist
+    assert_equal 2, artist.releases[1].discs.count
     assert_equal '290e10c5-7efc-4f60-ba2c-0dfc0208fbf5', artist.releases[2].id.uuid
     assert_equal artist, artist.releases[2].artist
+    assert_equal 4, artist.releases[2].discs.count
   end
 
   def test_artist_tori_amos_3
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'artist/Tori_Amos_3.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/Tori_Amos_3.xml')
     artist = mbxml.get_entity(:artist)
     
     assert_equal 'c0b2500e-0cef-4130-869d-732b23ed9df5', artist.id.uuid
@@ -129,7 +159,7 @@ class TestMBXML < Test::Unit::TestCase
   end
 
   def test_artist_tori_amos_4
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'artist/Tori_Amos_4.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/Tori_Amos_4.xml')
     artist = mbxml.get_entity(:artist)
     
     assert_equal 'c0b2500e-0cef-4130-869d-732b23ed9df5', artist.id.uuid
@@ -143,11 +173,11 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 'Myra Amos', artist.aliases[1].name
     assert_equal 'Torie Amos', artist.aliases[2].name
     assert_equal 'Latn', artist.aliases[2].script
-    assert_equal 'Misspelling', artist.aliases[2].type
+    assert_equal Model::NS_MMD_1 + 'Misspelling', artist.aliases[2].type
   end
 
   def test_artist_tori_amos_5
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'artist/Tori_Amos_5.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/Tori_Amos_5.xml')
     artist = mbxml.get_entity(:artist)
     
     assert_equal 'c0b2500e-0cef-4130-869d-732b23ed9df5', artist.id.uuid
@@ -158,37 +188,88 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 1, artist.releases.size
     assert_equal 'a7ccb022-f437-4492-8eee-8f85d85cdb96', artist.releases[0].id.uuid
     assert_equal 'Strange Little Girls', artist.releases[0].title
+    assert_equal 6, artist.releases.offset
+    assert_equal 9, artist.releases.count
     assert artist.releases[0].types.include?(Model::Release::TYPE_ALBUM)
     assert artist.releases[0].types.include?(Model::Release::TYPE_OFFICIAL)
   end
 
   def test_release_search
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'release/search_result_1.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/search_result_1.xml')
     assert_equal nil, mbxml.get_entity(:artist)
     assert_equal nil, mbxml.get_entity(:release)
     assert_equal nil, mbxml.get_entity(:track)
     assert_equal nil, mbxml.get_entity(:label)
 
     release_list = mbxml.get_entity_list(:release)
+    assert_equal 0, release_list.offset
+    assert_equal 234, release_list.count
+    
     assert_equal 2, release_list.size, release_list.inspect
-    assert_equal '290e10c5-7efc-4f60-ba2c-0dfc0208fbf5', release_list[0].id.uuid
-    assert release_list[0].types.include?(Model::Release::TYPE_ALBUM)
-    assert release_list[0].types.include?(Model::Release::TYPE_OFFICIAL)
-    assert_equal 'Under the Pink', release_list[0].title
-    assert_equal 'c0b2500e-0cef-4130-869d-732b23ed9df5', release_list[0].artist.id.uuid
-    assert_equal 1, release_list[0].release_events.size
-    assert_equal Model::IncompleteDate.new('1994-01-28'), release_list[0].release_events[0].date
+    assert_equal '290e10c5-7efc-4f60-ba2c-0dfc0208fbf5', release_list[0].entity.id.uuid
+    assert release_list[0].entity.types.include?(Model::Release::TYPE_ALBUM)
+    assert release_list[0].entity.types.include?(Model::Release::TYPE_OFFICIAL)
+    assert_equal 'Under the Pink', release_list[0].entity.title
+    assert_equal 'c0b2500e-0cef-4130-869d-732b23ed9df5', release_list[0].entity.artist.id.uuid
+    assert_equal 1, release_list[0].entity.release_events.size
+    assert_equal Model::IncompleteDate.new('1994-01-28'), release_list[0].entity.release_events[0].date
+    assert_equal 100, release_list[0].score
+    assert_equal 80, release_list[1].score
   end
   
   def test_release_highway_61_revisited_1
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'release/Highway_61_Revisited_1.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/Highway_61_Revisited_1.xml')
     release = mbxml.get_entity(:release)
     
-    assert false, 'Test not implemented'
+    assert_equal 'd61a2bd9-81ac-4023-bd22-1c884d4a176c', release.id.uuid
+    assert release.types.include?(Model::Release::TYPE_ALBUM)
+    assert release.types.include?(Model::Release::TYPE_OFFICIAL)
+    assert_equal 'Highway 61 Revisited', release.title
+    assert_equal 'ENG', release.text_language
+    assert_equal 'Latn', release.text_script
+    assert_equal 'B0000C8AVR', release.asin
+    assert_equal '72c536dc-7137-4477-a521-567eeb840fa8', release.artist.id.uuid
+    assert_equal 2, release.release_events.size
+    assert_equal Model::IncompleteDate.new('1965-08-30'), release.release_events[0].date
+    assert_equal 'US', release.release_events[0].country
+    assert_equal 6, release.discs.size
+    assert_equal 'PNd4XY_ixr5GwjOGBwG2ssR94q8-', release.discs[5].id
+    #assert_equal 75, release.puids.count
+    assert_equal 9, release.tracks.size
+    assert_equal '430aa3d3-3dac-4bd5-857d-eb10212ffefb', release.tracks[0].id.uuid
+    assert_equal 'd315625a-3976-41b4-b2e0-43336b0f67bc', release.tracks[8].id.uuid
+  
+    url_rels = release.get_relations(:target_type => Model::Relation::TO_URL)
+    assert_equal 2, url_rels.size, release.get_relations.inspect
+    assert_equal Model::NS_REL_1 + 'Wikipedia', url_rels[0].type
+    assert_equal nil, url_rels[0].direction
+    assert_equal 'http://en.wikipedia.org/wiki/Highway_61_Revisited', url_rels[0].target
+    assert_equal Model::NS_REL_1 + 'AmazonAsin', url_rels[1].type
+    assert_equal nil, url_rels[1].direction
+    assert_equal 'http://www.amazon.com/gp/product/B0000024SI', url_rels[1].target
+  end
+  
+  def test_release_highway_61_revisited_2
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/Highway_61_Revisited_2.xml')
+    release = mbxml.get_entity(:release)
+    
+    assert_equal 'd61a2bd9-81ac-4023-bd22-1c884d4a176c', release.id.uuid
+    assert release.types.include?(Model::Release::TYPE_ALBUM)
+    assert release.types.include?(Model::Release::TYPE_OFFICIAL)
+    assert_equal 'Highway 61 Revisited', release.title
+    assert_equal 4, release.tags.size
+    assert_equal 'rock', release.tags[0].text
+    assert_equal 100, release.tags[0].count
+    assert_equal 'blues rock', release.tags[1].text
+    assert_equal 40, release.tags[1].count
+    assert_equal 'folk rock', release.tags[2].text
+    assert_equal 40, release.tags[2].count
+    assert_equal 'dylan', release.tags[3].text
+    assert_equal 4, release.tags[3].count
   end
   
   def test_release_little_earthquakes_1
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'release/Little_Earthquakes_1.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/Little_Earthquakes_1.xml')
     release = mbxml.get_entity(:release)
     
     assert_equal '02232360-337e-4a3f-ad20-6cdd4c34288c', release.id.uuid
@@ -207,7 +288,7 @@ class TestMBXML < Test::Unit::TestCase
   end
 
   def test_release_little_earthquakes_2
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'release/Little_Earthquakes_2.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/Little_Earthquakes_2.xml')
     release = mbxml.get_entity(:release)
     
     assert_equal '02232360-337e-4a3f-ad20-6cdd4c34288c', release.id.uuid
@@ -231,7 +312,7 @@ class TestMBXML < Test::Unit::TestCase
 
   # This is a various artist release.
   def test_release_mission_impossible_2
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'release/Mission_Impossible_2.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/Mission_Impossible_2.xml')
     release = mbxml.get_entity(:release)
     
     assert_equal '81683d13-e014-4d35-9774-6f536f4ef557', release.id.uuid
@@ -251,45 +332,82 @@ class TestMBXML < Test::Unit::TestCase
   end
 
   def test_release_under_the_pink_1
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'release/Under_the_Pink_1.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/Under_the_Pink_1.xml')
     release = mbxml.get_entity(:release)
     
-    assert false, 'Test not implemented'
+    assert_equal '290e10c5-7efc-4f60-ba2c-0dfc0208fbf5', release.id.uuid
+    assert release.types.include?(Model::Release::TYPE_ALBUM)
+    assert release.types.include?(Model::Release::TYPE_OFFICIAL)
+    assert_equal 'Under the Pink', release.title
+    assert_equal 'ENG', release.text_language
+    assert_equal 'Latn', release.text_script
+    assert_equal 'B000002IXU', release.asin
+    assert_equal 'c0b2500e-0cef-4130-869d-732b23ed9df5', release.artist.id.uuid
+    assert_equal 'Tori Amos', release.artist.name
+    assert_equal 1, release.release_events.size
+    assert_equal Model::IncompleteDate.new('1994-01-28'), release.release_events[0].date
+    assert_equal 4, release.discs.count
+    assert_equal 12, release.tracks.count
   end
 
   def test_release_under_the_pink_2
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'release/Under_the_Pink_2.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/Under_the_Pink_2.xml')
     release = mbxml.get_entity(:release)
     
-    assert false, 'Test not implemented'
+    assert_equal '290e10c5-7efc-4f60-ba2c-0dfc0208fbf5', release.id.uuid
+    assert release.types.include?(Model::Release::TYPE_ALBUM)
+    assert release.types.include?(Model::Release::TYPE_OFFICIAL)
+    assert_equal 'Under the Pink', release.title
+    assert_equal 'c0b2500e-0cef-4130-869d-732b23ed9df5', release.artist.id.uuid
+    assert_equal 'Tori Amos', release.artist.name
+    assert_equal 1, release.tracks.size
+    assert_equal '0a984e3b-e38a-4b86-80be-f3a3eb1114ca', release.tracks[0].id.uuid
+    assert_equal 'God', release.tracks[0].title
   end
 
   def test_release_under_the_pink_3
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'release/Under_the_Pink_3.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/Under_the_Pink_3.xml')
     release = mbxml.get_entity(:release)
     
-    assert false, 'Test not implemented'
+    assert_equal '290e10c5-7efc-4f60-ba2c-0dfc0208fbf5', release.id.uuid
+    assert release.types.include?(Model::Release::TYPE_ALBUM)
+    assert release.types.include?(Model::Release::TYPE_OFFICIAL)
+    assert_equal 'Under the Pink', release.title
+    assert_equal 'c0b2500e-0cef-4130-869d-732b23ed9df5', release.artist.id.uuid
+    assert_equal 'Tori Amos', release.artist.name
+    assert_equal 1, release.release_events.size
+    assert_equal Model::IncompleteDate.new('1994-01-31'), release.release_events[0].date
+    assert_equal '82567-2', release.release_events[0].catalog_number
+    assert_equal '07567825672', release.release_events[0].barcode
+    assert_equal '50c384a2-0b44-401b-b893-8181173339c7', release.release_events[0].label.id.uuid
+    assert_equal 'Atlantic Records', release.release_events[0].label.name
   end
 
   def test_track_search
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'track/search_result_1.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'track/search_result_1.xml')
     assert_equal nil, mbxml.get_entity(:artist)
     assert_equal nil, mbxml.get_entity(:release)
     assert_equal nil, mbxml.get_entity(:track)
     assert_equal nil, mbxml.get_entity(:label)
 
     track_list = mbxml.get_entity_list(:track)
+    assert_equal 7, track_list.offset
+    assert_equal 100, track_list.count
+    
     assert_equal 3, track_list.size, track_list.inspect
-    assert_equal '748f2b79-8c50-4581-adb1-7708118a48fc', track_list[0].id.uuid
-    assert_equal 'Little Earthquakes', track_list[0].title
-    assert_equal 457760, track_list[0].duration
-    assert_equal 'c0b2500e-0cef-4130-869d-732b23ed9df5', track_list[0].artist.id.uuid
-    assert_equal 1, track_list[0].releases.size
-    assert_equal '93264fe5-dff2-47ab-9ca8-1c865733aad9', track_list[0].releases[0].id.uuid
+    assert_equal '748f2b79-8c50-4581-adb1-7708118a48fc', track_list[0].entity.id.uuid
+    assert_equal 'Little Earthquakes', track_list[0].entity.title
+    assert_equal 457760, track_list[0].entity.duration
+    assert_equal 'c0b2500e-0cef-4130-869d-732b23ed9df5', track_list[0].entity.artist.id.uuid
+    assert_equal 1, track_list[0].entity.releases.size
+    assert_equal '93264fe5-dff2-47ab-9ca8-1c865733aad9', track_list[0].entity.releases[0].id.uuid
+    assert_equal 100, track_list[0].score
+    assert_equal 99, track_list[1].score
+    assert_equal 80, track_list[2].score
   end
   
   def test_track_silent_all_these_years_1
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'track/Silent_All_These_Years_1.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'track/Silent_All_These_Years_1.xml')
     track = mbxml.get_entity(:track)
     
     assert_equal 'd6118046-407d-4e06-a1ba-49c399a4c42f', track.id.uuid
@@ -298,7 +416,7 @@ class TestMBXML < Test::Unit::TestCase
   end
 
   def test_track_silent_all_these_years_2
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'track/Silent_All_These_Years_2.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'track/Silent_All_These_Years_2.xml')
     track = mbxml.get_entity(:track)
     
     assert_equal 'd6118046-407d-4e06-a1ba-49c399a4c42f', track.id.uuid
@@ -315,7 +433,7 @@ class TestMBXML < Test::Unit::TestCase
   end
 
   def test_track_silent_all_these_years_3
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'track/Silent_All_These_Years_3.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'track/Silent_All_These_Years_3.xml')
     track = mbxml.get_entity(:track)
     
     assert_equal 'd6118046-407d-4e06-a1ba-49c399a4c42f', track.id.uuid
@@ -327,7 +445,7 @@ class TestMBXML < Test::Unit::TestCase
   end
 
   def test_track_silent_all_these_years_4
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'track/Silent_All_These_Years_4.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'track/Silent_All_These_Years_4.xml')
     track = mbxml.get_entity(:track)
     
     assert_equal 'd6118046-407d-4e06-a1ba-49c399a4c42f', track.id.uuid
@@ -344,7 +462,7 @@ class TestMBXML < Test::Unit::TestCase
   # This test is similiar to silent_all_these_years_3, but it includes an
   # schema exctension which mustn't disturb the parsing.
   def test_track_silent_all_these_years_5
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'track/Silent_All_These_Years_5.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'track/Silent_All_These_Years_5.xml')
     track = mbxml.get_entity(:track)
     
     assert_equal 'd6118046-407d-4e06-a1ba-49c399a4c42f', track.id.uuid
@@ -354,28 +472,43 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 'c2a2cee5-a8ca-4f89-a092-c3e1e65ab7e6', track.puids[0]
     assert_equal '42ab76ea-5d42-4259-85d7-e7f2c69e4485', track.puids[6]
   end
+  
+  def test_track_silent_all_these_years_6
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'track/Silent_All_These_Years_6.xml')
+    track = mbxml.get_entity(:track)
+    
+    assert_equal 'd6118046-407d-4e06-a1ba-49c399a4c42f', track.id.uuid
+    assert_equal 'Silent All These Years', track.title
+    assert_equal 253466, track.duration
+    assert_equal 0, track.tags.size
+  end
 
   def test_label_search
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'label/search_result_1.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'label/search_result_1.xml')
     assert_equal nil, mbxml.get_entity(:artist)
     assert_equal nil, mbxml.get_entity(:release)
     assert_equal nil, mbxml.get_entity(:track)
     assert_equal nil, mbxml.get_entity(:label)
 
     label_list = mbxml.get_entity_list(:label)
+    assert_equal 0, label_list.offset
+    assert_equal 2, label_list.count
+    
     assert_equal 2, label_list.size, label_list.inspect
-    assert_equal '50c384a2-0b44-401b-b893-8181173339c7', label_list[0].id.uuid
-    assert_equal Model::Label::TYPE_ORIGINAL_PRODUCTION, label_list[0].type
-    assert_equal 'Atlantic Records', label_list[0].name
-    assert_equal 'US', label_list[0].country
-    assert_equal 'c2ccaec8-0dfe-4dd5-a710-bddf5fd7c1a7', label_list[1].id.uuid
-    assert_equal nil, label_list[1].type
-    assert_equal 'DRO Atlantic', label_list[1].name
-    assert_equal 'SP', label_list[1].country
+    assert_equal '50c384a2-0b44-401b-b893-8181173339c7', label_list[0].entity.id.uuid
+    assert_equal Model::Label::TYPE_ORIGINAL_PRODUCTION, label_list[0].entity.type
+    assert_equal 'Atlantic Records', label_list[0].entity.name
+    assert_equal 'US', label_list[0].entity.country
+    assert_equal 100, label_list[0].score
+    assert_equal 'c2ccaec8-0dfe-4dd5-a710-bddf5fd7c1a7', label_list[1].entity.id.uuid
+    assert_equal nil, label_list[1].entity.type
+    assert_equal 'DRO Atlantic', label_list[1].entity.name
+    assert_equal 'SP', label_list[1].entity.country
+    assert_equal 46, label_list[1].score
   end
   
   def test_label_atlantic_records_1
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'label/Atlantic_Records_1.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'label/Atlantic_Records_1.xml')
     label = mbxml.get_entity(:label)
     
     assert_equal '50c384a2-0b44-401b-b893-8181173339c7', label.id.uuid
@@ -383,11 +516,11 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 'Atlantic Records', label.name
     assert_equal '121', label.code
     assert_equal 'US', label.country
-    assert_equal '1947', label.founding_date.to_s
+    assert_equal '1947', label.begin_date.to_s
   end
 
   def test_label_atlantic_records_2
-    mbxml = Webservice::MBXML.new IO.read(DATA_PATH + 'label/Atlantic_Records_2.xml')
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'label/Atlantic_Records_2.xml')
     label = mbxml.get_entity(:label)
     
     assert_equal Model::Label::TYPE_DISTRIBUTOR, label.type
@@ -396,8 +529,45 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal '121', label.code
     assert_equal 'fake', label.disambiguation
     assert_equal 'US', label.country
-    assert_equal '1947', label.founding_date.to_s
-    assert_equal '2047', label.dissolving_date.to_s
+    assert_equal '1947', label.begin_date.to_s
+    assert_equal '2047', label.end_date.to_s
+    assert_equal 1, label.aliases.size
+    assert_equal 'Atlantic Rec.', label.aliases[0].name
   end
 
+  def test_label_atlantic_records_3
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'label/Atlantic_Records_3.xml')
+    label = mbxml.get_entity(:label)
+    
+    assert_equal '50c384a2-0b44-401b-b893-8181173339c7', label.id.uuid
+    assert_equal Model::Label::TYPE_ORIGINAL_PRODUCTION, label.type
+    assert_equal 'Atlantic Records', label.name
+    assert_equal 3, label.tags.size
+    assert_equal 'american', label.tags[0].text
+    assert_equal 'jazz', label.tags[1].text
+    assert_equal 'blues', label.tags[2].text
+  end
+  
+  def test_user_1
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'user/User_1.xml')
+    users = mbxml.get_entity_list(:user, Model::NS_EXT_1).entities
+    
+    assert_equal 1, users.size
+    assert_equal 'matt', users[0].name
+    assert_equal false, users[0].show_nag?
+    assert_equal 2, users[0].types.size
+    assert_equal Model::NS_EXT_1 + 'AutoEditor', users[0].types[0]
+    assert_equal Model::NS_EXT_1 + 'RelationshipEditor', users[0].types[1]
+  end
+  
+  def test_new_with_factory
+    factory = MyFactory.new
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/Tori_Amos_2.xml'), factory
+    artist = mbxml.get_entity(:artist)
+    assert artist.is_a?(MyArtist)
+    artist.releases.each do |release|
+      assert release.is_a?(MyRelease)
+    end
+  end
+  
 end