rbrainz 0.4.2 → 0.5.0

data/test/test-data/valid/track/Silent_All_These_Years_4.xml

@@ -5,6 +5,9 @@
     <track id="d6118046-407d-4e06-a1ba-49c399a4c42f">
 	<title>Silent All These Years</title>
 	<duration>253466</duration>
+	<isrc-list>
+          <isrc id="USPR37300012"/>
+	</isrc-list>
         <artist id="c0b2500e-0cef-4130-869d-732b23ed9df5" type="Person">
             <name>Tori Amos</name>
             <sort-name>Amos, Tori</sort-name>

data/test/test-data/valid/track/Silent_All_These_Years_6.xml

@@ -3,6 +3,14 @@
     <track id="d6118046-407d-4e06-a1ba-49c399a4c42f">
 	<title>Silent All These Years</title>
 	<duration>253466</duration>
+	<isrc-list>
+          <isrc id="USPR37300012"/>
+	</isrc-list>
 	<tag-list></tag-list>
+    <user-tag-list>
+        <user-tag>foo</user-tag>
+    </user-tag-list>
+    <rating votes-count="10">4.5</rating>
+    <user-rating>3</user-rating>
     </track>
 </metadata>

data/test/test_alias.rb

@@ -1,4 +1,5 @@
-# $Id: test_alias.rb 139 2007-07-17 10:02:30Z phw $
+# -*- coding: utf-8 -*-
+# $Id: test_alias.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer

data/test/test_artist.rb

@@ -1,11 +1,15 @@
-# $Id: test_artist.rb 138 2007-07-17 09:05:01Z phw $
+# -*- coding: utf-8 -*-
+# $Id: test_artist.rb 258 2009-05-17 17:43:58Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
-# Copyright:: Copyright (c) 2007, Philipp Wolfer
+# Copyright:: Copyright (c) 2007-2009, Philipp Wolfer
 # License::   RBrainz is free software distributed under a BSD style license.
 #             See LICENSE[file:../LICENSE.html] for permissions.
 
 require 'test_entity'
+require 'test_rateable'
+require 'test_relateable'
+require 'test_taggable'
 
 # Unit test for the Artist model.
 class TestArtist < Test::Unit::TestCase
@@ -13,6 +17,7 @@ class TestArtist < Test::Unit::TestCase
   def setup
     @tested_class = Model::Artist
     @invalid_entity_types = [:release, :track, :label]
+    @release_groups = [Model::ReleaseGroup.new, Model::ReleaseGroup.new]
     @releases = [Model::Release.new, Model::Release.new]
     @aliases = [Model::Alias.new, Model::Alias.new]
   end
@@ -22,6 +27,9 @@ class TestArtist < Test::Unit::TestCase
   
   # Include the tests for Entity
   include TestEntity
+  include TestRateable
+  include TestRelateable
+  include TestTaggable
 
   def test_new_artist
     artist = nil
@@ -107,6 +115,20 @@ class TestArtist < Test::Unit::TestCase
     assert_equal Model::IncompleteDate.new('1988-04-20'), artist.end_date
   end
 
+  def test_add_and_remove_release_groups
+    artist = Model::Artist.new
+    assert_equal 0, artist.release_groups.size
+    assert_nothing_raised {artist.release_groups << @release_groups[0]}
+    assert_equal 1, artist.release_groups.size
+    assert_nothing_raised {artist.release_groups << @release_groups[1]}
+    assert_equal 2, artist.release_groups.size
+    
+    assert_nothing_raised {artist.release_groups.delete @release_groups[1]}
+    assert_equal 1, artist.release_groups.size
+    assert_nothing_raised {artist.release_groups.delete @release_groups[0]}
+    assert_equal 0, artist.release_groups.size
+  end
+  
   # Many releases can be added
   def test_add_and_remove_releases
     artist = Model::Artist.new

data/test/test_artist_filter.rb

@@ -1,4 +1,5 @@
-# $Id: test_artist_filter.rb 121 2007-07-12 08:56:19Z phw $
+# -*- coding: utf-8 -*-
+# $Id: test_artist_filter.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer

data/test/test_artist_includes.rb

@@ -1,4 +1,5 @@
-# $Id: test_artist_includes.rb 203 2008-03-17 11:00:15Z phw $
+# -*- coding: utf-8 -*-
+# $Id: test_artist_includes.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer
@@ -26,9 +27,13 @@ class TestArtistIncludes < Test::Unit::TestCase
       :track_rels => true,
       :label_rels => true,
       :url_rels => true,
+      :release_groups => true,
       :releases => [Model::Release::TYPE_ALBUM, 'Official'],
       :va_releases => ['Album', Model::Release::TYPE_OFFICIAL],
-      :tags => true
+      :tags => true,
+      :user_tags => true,
+      :ratings => true,
+      :user_ratings => true
       )
     result_string = includes.to_s
     assert_equal 'inc=', result_string[0..3]
@@ -40,6 +45,7 @@ class TestArtistIncludes < Test::Unit::TestCase
     assert result_array.include?('track-rels')
     assert result_array.include?('label-rels')
     assert result_array.include?('url-rels')
+    assert result_array.include?('release-groups')
     assert result_array.include?('sa-Album')
     assert result_array.include?('sa-Official')
     assert result_array.include?('va-Album')
@@ -55,9 +61,13 @@ class TestArtistIncludes < Test::Unit::TestCase
       :track_rels => false,
       :label_rels => false,
       :url_rels => false,
+      :release_groups => false,
       :releases => [],
       :va_releases => [],
-      :tags => false
+      :tags => false,
+      :user_tags => false,
+      :ratings => false,
+      :user_ratings => false
       )
     assert_equal '', includes.to_s
     

data/test/test_collection.rb

@@ -1,4 +1,5 @@
-# $Id: test_collection.rb 172 2007-08-24 11:19:19Z phw $
+# -*- coding: utf-8 -*-
+# $Id: test_collection.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer
@@ -62,4 +63,4 @@ class TestCollection < Test::Unit::TestCase
     assert_equal @artist_three, array[2]
   end
 
-end
+end

data/test/test_default_factory.rb

@@ -1,4 +1,5 @@
-# $Id: test_default_factory.rb 134 2007-07-16 08:46:55Z phw $
+# -*- coding: utf-8 -*-
+# $Id: test_default_factory.rb 273 2009-05-24 22:29:04Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer
@@ -30,6 +31,12 @@ class TestDefaultFactory < Test::Unit::TestCase
     assert factory.new_entity(:label).is_a?(Model::Label)
   end
 
+  def test_new_release_group
+    factory = Model::DefaultFactory.new
+    assert factory.new_release_group.is_a?(Model::ReleaseGroup)
+    assert factory.new_entity(Model::ReleaseGroup.entity_type).is_a?(Model::ReleaseGroup)
+  end
+
   def test_new_release
     factory = Model::DefaultFactory.new
     assert factory.new_release.is_a?(Model::Release)

data/test/test_disc.rb

@@ -1,4 +1,5 @@
-# $Id: test_disc.rb 138 2007-07-17 09:05:01Z phw $
+# -*- coding: utf-8 -*-
+# $Id: test_disc.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer

data/test/test_incomplete_date.rb

@@ -1,4 +1,5 @@
-# $Id: test_incomplete_date.rb 154 2007-07-24 12:39:02Z phw $
+# -*- coding: utf-8 -*-
+# $Id: test_incomplete_date.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer

data/test/test_isrc.rb

@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+# $Id: test_isrc.rb 263 2009-05-24 22:15:12Z phw $
+#
+# Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
+# Copyright:: Copyright (c) 2007, 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/model'
+include MusicBrainz
+
+# Unit test for the Tag model.
+class TestISRC < Test::Unit::TestCase
+
+  def setup
+    @valid_raw_isrc = 'USPR37300012'
+    @valid_printable_isrc = 'US-PR3-73-00012'
+    @invalid_isrcs = ['', 'USPR37300012X', 'USPR3730001', 'ÜSPR37300012',
+                      'USPR_7300012', 'USPR37300012-', '-USPR37300012']
+  end
+
+  def teardown
+  end
+  
+  def test_parse_valid_raw_isrc
+    isrc = nil
+    assert_nothing_raised {isrc = Model::ISRC.parse(@valid_raw_isrc)}
+    assert_equal 'US', isrc.country
+    assert_equal 'PR3', isrc.registrant
+    assert_equal '73', isrc.year
+    assert_equal '00012', isrc.designation
+  end
+
+  def test_parse_lowercase_raw_isrc
+    isrc = nil
+    assert_nothing_raised {isrc = Model::ISRC.parse(@valid_raw_isrc.downcase)}
+    assert_equal 'US', isrc.country
+    assert_equal 'PR3', isrc.registrant
+    assert_equal '73', isrc.year
+    assert_equal '00012', isrc.designation
+  end
+
+  def test_parse_valid_printable_isrc
+    isrc = nil
+    assert_nothing_raised {isrc = Model::ISRC.parse(@valid_printable_isrc)}
+    assert_equal 'US', isrc.country
+    assert_equal 'PR3', isrc.registrant
+    assert_equal '73', isrc.year
+    assert_equal '00012', isrc.designation
+  end
+  
+  def test_parse_invalid_isrc
+    @invalid_isrcs.each do |isrc|
+      assert_raise(Model::InvalidISRCError) { Model::ISRC.parse(isrc) }
+    end
+  end
+  
+  def test_isrc_to_readable_string
+    isrc = Model::ISRC.parse(@valid_raw_isrc)
+    assert_equal @valid_printable_isrc, isrc.to_s
+    isrc = Model::ISRC.parse(@valid_raw_isrc.downcase)
+    assert_equal @valid_printable_isrc, isrc.to_s
+    isrc = Model::ISRC.parse(@valid_printable_isrc.downcase)
+    assert_equal @valid_printable_isrc, isrc.to_s
+  end
+  
+  def test_isrc_to_string
+    isrc = Model::ISRC.parse(@valid_raw_isrc)
+    assert_equal @valid_raw_isrc, isrc.to_str
+    isrc = Model::ISRC.parse(@valid_raw_isrc.downcase)
+    assert_equal @valid_raw_isrc, isrc.to_str
+    isrc = Model::ISRC.parse(@valid_printable_isrc.downcase)
+    assert_equal @valid_raw_isrc, isrc.to_str
+  end
+  
+  def test_isrc_equality
+    isrc1 = Model::ISRC.parse(@valid_raw_isrc)
+    isrc2 = Model::ISRC.parse(@valid_printable_isrc)
+    assert_equal isrc1, isrc2
+    assert_equal isrc1, @valid_raw_isrc
+    assert_equal isrc2, @valid_raw_isrc
+    assert_equal isrc1, @valid_printable_isrc
+    assert_equal isrc2, @valid_printable_isrc
+  end
+  
+end

data/test/test_label.rb

@@ -1,4 +1,5 @@
-# $Id: test_label.rb 138 2007-07-17 09:05:01Z phw $
+# -*- coding: utf-8 -*-
+# $Id: test_label.rb 258 2009-05-17 17:43:58Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer
@@ -6,6 +7,9 @@
 #             See LICENSE[file:../LICENSE.html] for permissions.
 
 require 'test_entity'
+require 'test_rateable'
+require 'test_relateable'
+require 'test_taggable'
 
 # Unit test for the Label model.
 class TestLabel < Test::Unit::TestCase
@@ -22,6 +26,9 @@ class TestLabel < Test::Unit::TestCase
   
   # Include the tests for Entity
   include TestEntity
+  include TestRateable
+  include TestRelateable
+  include TestTaggable
 
   def test_new_label
     label = nil

data/test/test_label_filter.rb

@@ -1,4 +1,5 @@
-# $Id: test_label_filter.rb 121 2007-07-12 08:56:19Z phw $
+# -*- coding: utf-8 -*-
+# $Id: test_label_filter.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer

data/test/test_label_includes.rb

@@ -1,4 +1,5 @@
-# $Id: test_label_includes.rb 203 2008-03-17 11:00:15Z phw $
+# -*- coding: utf-8 -*-
+# $Id: test_label_includes.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer
@@ -26,7 +27,10 @@ class TestLabelIncludes < Test::Unit::TestCase
       :track_rels => true,
       :label_rels => true,
       :url_rels => true,
-      :tags => true
+      :tags => true,
+      :user_tags => true,
+      :ratings => true,
+      :user_ratings => true
       )
     result_string = includes.to_s
     assert_equal 'inc=', result_string[0..3]
@@ -49,7 +53,10 @@ class TestLabelIncludes < Test::Unit::TestCase
       :track_rels => false,
       :label_rels => false,
       :url_rels => false,
-      :tags => false
+      :tags => false,
+      :user_tags => false,
+      :ratings => false,
+      :user_ratings => false
       )
     assert_equal '', includes.to_s
   

data/test/test_mbid.rb

@@ -1,4 +1,5 @@
-# $Id: test_mbid.rb 142 2007-07-17 15:49:57Z phw $
+# -*- coding: utf-8 -*-
+# $Id: test_mbid.rb 254 2009-05-13 20:04:36Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Philipp Wolfer

data/test/test_mbxml.rb

@@ -1,4 +1,5 @@
-# $Id: test_mbxml.rb 189 2007-11-26 00:10:49Z phw $
+# -*- coding: utf-8 -*-
+# $Id: test_mbxml.rb 279 2009-06-14 20:51:02Z phw $
 #
 # Author::    Philipp Wolfer (mailto:phw@rubyforge.org)
 # Copyright:: Copyright (c) 2007, Nigel Graham, Philipp Wolfer
@@ -81,6 +82,8 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal '1840-05-07', artist.begin_date.to_s
     assert_equal '1893-11-06', artist.end_date.to_s
     assert_equal 80, artist.aliases.size
+    assert artist.rating.empty?
+    assert artist.user_rating.empty?
   end
   
   def test_artist_tchaikovsky_2
@@ -99,6 +102,11 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 40, artist.tags[2].count
     assert_equal 'composer', artist.tags[3].text
     assert_equal 120, artist.tags[3].count
+    assert_equal false, artist.rating.empty?
+    assert_equal 4.5, artist.rating.value
+    assert_equal 10, artist.rating.count
+    assert_equal false, artist.user_rating.empty?
+    assert_equal 3, artist.user_rating.value
   end
   
   def test_artist_tori_amos_1
@@ -194,6 +202,31 @@ class TestMBXML < Test::Unit::TestCase
     assert artist.releases[0].types.include?(Model::Release::TYPE_OFFICIAL)
   end
   
+  def test_release_group_the_cure_1
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release-group/The_Cure_1.xml')
+    release_group = mbxml.get_entity(:release_group)
+    
+    assert_equal 'c6a62b78-70f7-44f7-b159-064f6b7ba03a', release_group.id.uuid
+    assert_equal 1, release_group.types.size
+    assert release_group.types.include?(Model::ReleaseGroup::TYPE_ALBUM)
+    assert_equal 'The Cure', release_group.title
+    
+    assert_equal 4, release_group.releases.size
+    assert_equal 'd984e1a3-7281-46bb-ad8b-1478a00f2fbf', release_group.releases[0].id.uuid
+    assert_equal 'The Cure', release_group.releases[0].title
+    assert_equal 'ENG', release_group.releases[0].text_language
+    assert_equal 'Latn', release_group.releases[0].text_script
+    assert release_group.releases[0].types.include?(Model::Release::TYPE_ALBUM)
+    assert release_group.releases[0].types.include?(Model::Release::TYPE_OFFICIAL)
+    assert_equal 'B0002CHGZI', release_group.releases[0].asin
+    assert_equal 'c100a398-3132-48a8-a5fc-c3e908ac17dc', release_group.releases[1].id.uuid
+    assert_equal '24bec892-b21d-47d8-a288-dc6450152574', release_group.releases[2].id.uuid
+    assert_equal '61a4ec51-fa34-4757-85d7-83231776ed14', release_group.releases[3].id.uuid
+    
+    assert_equal '69ee3720-a7cb-4402-b48d-a02c366f2bcf', release_group.artist.id.uuid
+    assert_equal 'The Cure', release_group.artist.name
+  end
+  
   def test_release_search
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/search_result_1.xml')
     assert_equal nil, mbxml.get_entity(:artist)
@@ -247,6 +280,8 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal Model::NS_REL_1 + 'AmazonAsin', url_rels[1].type
     assert_equal Model::Relation::DIR_BOTH, url_rels[1].direction
     assert_equal 'http://www.amazon.com/gp/product/B0000024SI', url_rels[1].target
+    assert release.rating.empty?
+    assert release.user_rating.empty?
   end
   
   def test_release_highway_61_revisited_2
@@ -266,6 +301,11 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 40, release.tags[2].count
     assert_equal 'dylan', release.tags[3].text
     assert_equal 4, release.tags[3].count
+    assert_equal false, release.rating.empty?
+    assert_equal 4.5, release.rating.value
+    assert_equal 10, release.rating.count
+    assert_equal false, release.user_rating.empty?
+    assert_equal 3, release.user_rating.value
   end
   
   def test_release_little_earthquakes_1
@@ -414,6 +454,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 'd6118046-407d-4e06-a1ba-49c399a4c42f', track.id.uuid
     assert_equal 'Silent All These Years', track.title
     assert_equal 253466, track.duration
+    assert track.isrcs.empty?
   end
   
   def test_track_silent_all_these_years_2
@@ -431,6 +472,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal Model::Relation::DIR_BACKWARD, track_rels[0].direction
     assert track_rels[0].target.is_a?(Model::Track)
     assert_equal '5bcd4eaa-fae7-465f-9f03-d005b959ed02', track_rels[0].target.artist.id.uuid
+    assert track.isrcs.empty?
   end
   
   def test_track_silent_all_these_years_3
@@ -443,6 +485,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 7, track.puids.size
     assert_equal 'c2a2cee5-a8ca-4f89-a092-c3e1e65ab7e6', track.puids[0]
     assert_equal '42ab76ea-5d42-4259-85d7-e7f2c69e4485', track.puids[6]
+    assert track.isrcs.empty?
   end
   
   def test_track_silent_all_these_years_4
@@ -458,6 +501,8 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 7, track.puids.size
     assert_equal 'c2a2cee5-a8ca-4f89-a092-c3e1e65ab7e6', track.puids[0]
     assert_equal '42ab76ea-5d42-4259-85d7-e7f2c69e4485', track.puids[6]
+    assert_equal 1, track.isrcs.size
+    assert_equal 'USPR37300012', track.isrcs[0]
   end
   
   # This test is similiar to silent_all_these_years_3, but it includes an
@@ -472,6 +517,9 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 7, track.puids.size
     assert_equal 'c2a2cee5-a8ca-4f89-a092-c3e1e65ab7e6', track.puids[0]
     assert_equal '42ab76ea-5d42-4259-85d7-e7f2c69e4485', track.puids[6]
+    assert track.rating.empty?
+    assert track.user_rating.empty?
+    assert track.isrcs.empty?
   end
   
   def test_track_silent_all_these_years_6
@@ -482,6 +530,14 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 'Silent All These Years', track.title
     assert_equal 253466, track.duration
     assert_equal 0, track.tags.size
+    assert_equal false, track.rating.empty?
+    assert_equal 4.5, track.rating.value
+    assert_equal 10, track.rating.count
+    assert_equal false, track.user_rating.empty?
+    assert_equal 3, track.user_rating.value
+    assert_equal 1, track.isrcs.size
+    assert_equal Model::ISRC.new("USPR37300012"), track.isrcs[0]
+    assert track.isrcs[0].is_a?(Model::ISRC)
   end
   
   def test_label_search
@@ -534,6 +590,8 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal '2047', label.end_date.to_s
     assert_equal 1, label.aliases.size
     assert_equal 'Atlantic Rec.', label.aliases[0].name
+    assert label.rating.empty?
+    assert label.user_rating.empty?
   end
   
   def test_label_atlantic_records_3
@@ -547,6 +605,11 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal 'american', label.tags[0].text
     assert_equal 'jazz', label.tags[1].text
     assert_equal 'blues', label.tags[2].text
+    assert_equal false, label.rating.empty?
+    assert_equal 4.5, label.rating.value
+    assert_equal 10, label.rating.count
+    assert_equal false, label.user_rating.empty?
+    assert_equal 3, label.user_rating.value
   end
   
   def test_user_1
@@ -561,7 +624,7 @@ class TestMBXML < Test::Unit::TestCase
     assert_equal Model::NS_EXT_1 + 'RelationshipEditor', users[0].types[1]
   end
   
-  def test_new_with_factory
+  def test_artist_with_factory
     factory = MyFactory.new
     mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'artist/Tori_Amos_2.xml'), factory
     artist = mbxml.get_entity(:artist)
@@ -571,4 +634,32 @@ class TestMBXML < Test::Unit::TestCase
     end
   end
   
+  def test_release_group_with_factory
+    factory = MyFactory.new
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release-group/The_Cure_1.xml'), factory
+    release_group = mbxml.get_entity(:release_group)
+    assert release_group.is_a?(MyReleaseGroup)
+  end
+
+  def test_release_with_factory
+    factory = MyFactory.new
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'release/Highway_61_Revisited_1.xml'), factory
+    release = mbxml.get_entity(:release)
+    assert release.is_a?(MyRelease)
+  end
+
+  def test_label_with_factory
+    factory = MyFactory.new
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'label/Atlantic_Records_1.xml'), factory
+    label = mbxml.get_entity(:label)
+    assert label.is_a?(MyLabel)
+  end
+
+  def test_track_with_factory
+    factory = MyFactory.new
+    mbxml = Webservice::MBXML.new File.new(DATA_PATH + 'track/Silent_All_These_Years_1.xml'), factory
+    track = mbxml.get_entity(:track)
+    assert track.is_a?(MyTrack)
+  end
+
 end