From b24d883db9ec72e6500217ddb7a5340de0c81598 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Tue, 27 Apr 2010 23:15:33 +0200 Subject: [PATCH] Test comparing with None --- mopidy/models.py | 6 ++++++ tests/models_test.py | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/mopidy/models.py b/mopidy/models.py index d6b42b08..58077a31 100644 --- a/mopidy/models.py +++ b/mopidy/models.py @@ -33,6 +33,9 @@ class Artist(ImmutableObject): name = None def __eq__(self, other): + if other is None: + return False + return self.__dict__ == other.__dict__ def __ne__(self, other): @@ -65,6 +68,9 @@ class Album(ImmutableObject): super(Album, self).__init__(*args, **kwargs) def __eq__(self, other): + if other is None: + return False + return self.__dict__ == other.__dict__ def __ne__(self, other): diff --git a/tests/models_test.py b/tests/models_test.py index 6dfde964..eb7fa187 100644 --- a/tests/models_test.py +++ b/tests/models_test.py @@ -31,6 +31,9 @@ class ArtistTest(unittest.TestCase): artist2 = Artist(uri=u'uri', name=u'name') self.assertEqual(artist1, artist2) + def test_eq_none(self): + self.assertNotEqual(Artist(), None) + def test_ne_name(self): artist1 = Artist(name=u'name1') artist2 = Artist(name=u'name2') @@ -99,6 +102,9 @@ class AlbumTest(unittest.TestCase): album2 = Album(name=u'name', uri=u'uri', artists=artists, num_tracks=2) self.assertEqual(album1, album2) + def test_eq_none(self): + self.assertNotEqual(Album(), None) + def test_ne_name(self): album1 = Album(name=u'name1') album2 = Album(name=u'name2') @@ -277,6 +283,9 @@ class TrackTest(unittest.TestCase): track_no=1, date=date, length=100, bitrate=100, id=2) self.assertEqual(track1, track2) + def test_eq_none(self): + self.assertNotEqual(Track(), None) + def test_ne_uri(self): track1 = Track(uri=u'uri1') track2 = Track(uri=u'uri2')