From f60fb8530c17d35bb4666562af6fe64b200f2191 Mon Sep 17 00:00:00 2001 From: Asif Saif Uddin Date: Tue, 23 Oct 2018 14:42:16 +0600 Subject: [PATCH] fixed deprecation warning in utils tests --- djadmin2/tests/test_utils.py | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/djadmin2/tests/test_utils.py b/djadmin2/tests/test_utils.py index 39767ec..d54f43b 100644 --- a/djadmin2/tests/test_utils.py +++ b/djadmin2/tests/test_utils.py @@ -12,14 +12,14 @@ class UtilsTest(TestCase): self.instance = UtilsTestModel() def test_as_model_class(self): - self.assertEquals( + self.assertEqual( UtilsTestModel._meta, utils.model_options(UtilsTestModel) ) UtilsTestModel._meta.verbose_name = "Utils Test Model is singular" UtilsTestModel._meta.verbose_name_plural = "Utils Test Model are " +\ " plural" - self.assertEquals( + self.assertEqual( UtilsTestModel._meta, utils.model_options(UtilsTestModel) ) @@ -27,14 +27,14 @@ class UtilsTest(TestCase): UtilsTestModel._meta.verbose_name_plural = "Utils Test Models" def test_as_model_instance(self): - self.assertEquals( + self.assertEqual( self.instance._meta, utils.model_options(self.instance) ) self.instance._meta.verbose_name = "Utils Test Model is singular" self.instance._meta.verbose_name_plural = "Utils Test Model are " +\ " plural" - self.assertEquals( + self.assertEqual( self.instance._meta, utils.model_options(self.instance) ) @@ -42,79 +42,79 @@ class UtilsTest(TestCase): self.instance._meta.verbose_name_plural = "Utils Test Models" def test_admin2_urlname(self): - self.assertEquals( + self.assertEqual( "admin2:None_None_index", utils.admin2_urlname(IndexView, "index") ) def test_model_app_label_as_model_class(self): - self.assertEquals( + self.assertEqual( UtilsTestModel._meta.app_label, utils.model_app_label(UtilsTestModel) ) def test_model_app_label_as_model_instance(self): - self.assertEquals( + self.assertEqual( self.instance._meta.app_label, utils.model_app_label(UtilsTestModel) ) def test_model_verbose_name_as_model_class(self): - self.assertEquals( + self.assertEqual( UtilsTestModel._meta.verbose_name, utils.model_verbose_name(UtilsTestModel) ) def test_model_verbose_name_as_model_instance(self): - self.assertEquals( + self.assertEqual( self.instance._meta.verbose_name, utils.model_verbose_name(self.instance) ) def test_model_verbose_name_plural_as_model_class(self): - self.assertEquals( + self.assertEqual( UtilsTestModel._meta.verbose_name_plural, utils.model_verbose_name_plural(UtilsTestModel) ) def test_model_verbose_name_plural_as_model_instance(self): - self.assertEquals( + self.assertEqual( self.instance._meta.verbose_name_plural, utils.model_verbose_name_plural(self.instance) ) def test_model_field_verbose_name_autogenerated(self): - self.assertEquals( + self.assertEqual( 'field1', utils.model_field_verbose_name(self.instance, 'field1') ) def test_model_field_verbose_name_overridden(self): - self.assertEquals( + self.assertEqual( 'second field', utils.model_field_verbose_name(self.instance, 'field2') ) def test_model_method_verbose_name(self): - self.assertEquals( + self.assertEqual( 'Published recently?', utils.model_method_verbose_name(self.instance, 'was_published_recently') ) def test_model_method_verbose_name_fallback(self): - self.assertEquals( + self.assertEqual( 'simple_method', utils.model_method_verbose_name(self.instance, 'simple_method') ) def test_app_label_as_model_class(self): - self.assertEquals( + self.assertEqual( UtilsTestModel._meta.app_label, utils.model_app_label(UtilsTestModel) ) def test_app_label_as_model_instance(self): - self.assertEquals( + self.assertEqual( self.instance._meta.app_label, utils.model_app_label(self.instance) ) @@ -124,7 +124,7 @@ class UtilsTest(TestCase): def hello(self): return "hello" - self.assertEquals( + self.assertEqual( utils.get_attr(Klass(), "hello"), "hello" ) @@ -138,12 +138,12 @@ class UtilsTest(TestCase): return "unicode" if six.PY2: - self.assertEquals( + self.assertEqual( utils.get_attr(Klass(), "__str__"), "unicode" ) else: - self.assertEquals( + self.assertEqual( utils.get_attr(Klass(), "__str__"), "str" ) @@ -152,7 +152,7 @@ class UtilsTest(TestCase): class Klass(object): attr = "value" - self.assertEquals( + self.assertEqual( utils.get_attr(Klass(), "attr"), "value" )