Commit 2791fbf5 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Used more specific test assertions.

parent 11e7254c

django/contrib/auth/tests/test_views.py

+1 −2
Original line number Diff line number Diff line
@@ -475,8 +475,7 @@ class LoginTest(AuthViewsTestCase): 
            self.assertEqual(response.context['site_name'], site.name)

        else:

            self.assertIsInstance(response.context['site'], RequestSite)

        self.assertTrue(isinstance(response.context['form'], AuthenticationForm),

                     'Login form is not an AuthenticationForm')

        self.assertIsInstance(response.context['form'], AuthenticationForm)



    def test_security_check(self, password='password'):

        login_url = reverse('login')

django/contrib/formtools/tests/wizard/test_forms.py

+2 −2
Original line number Diff line number Diff line
@@ -246,11 +246,11 @@ class SessionFormTests(TestCase): 
    def test_init(self):

        request = get_request()

        testform = SessionWizardView.as_view([('start', Step1)])

        self.assertTrue(isinstance(testform(request), TemplateResponse))

        self.assertIsInstance(testform(request), TemplateResponse)





class CookieFormTests(TestCase):

    def test_init(self):

        request = get_request()

        testform = CookieWizardView.as_view([('start', Step1)])

        self.assertTrue(isinstance(testform(request), TemplateResponse))
 
        self.assertIsInstance(testform(request), TemplateResponse)

django/contrib/gis/geoip/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ class GeoIPTest(unittest.TestCase): 
            self.assertEqual('TX', d['region'])

            self.assertEqual(713, d['area_code'])

            geom = g.geos(query)

            self.assertTrue(isinstance(geom, GEOSGeometry))

            self.assertIsInstance(geom, GEOSGeometry)

            lon, lat = (-95.4010, 29.7079)

            lat_lon = g.lat_lon(query)

            lat_lon = (lat_lon[1], lat_lon[0])

django/contrib/gis/tests/geoapp/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ class GeoModelTest(TestCase): 
        as_text = 'ST_AsText' if postgis else 'asText'

        cities2 = City.objects.raw('select id, name, %s(point) from geoapp_city' % as_text)

        self.assertEqual(len(cities1), len(list(cities2)))

        self.assertTrue(isinstance(cities2[0].point, Point))

        self.assertIsInstance(cities2[0].point, Point)





@skipUnless(HAS_GEOS and HAS_SPATIAL_DB, "Geos and spatial db are required.")

django/contrib/gis/tests/relatedapp/tests.py

+3 −3
Original line number Diff line number Diff line
@@ -179,8 +179,8 @@ class RelatedGeoModelTest(TestCase): 
        for m, d, t in zip(gqs, gvqs, gvlqs):

            # The values should be Geometry objects and not raw strings returned

            # by the spatial database.

            self.assertTrue(isinstance(d['point'], Geometry))

            self.assertTrue(isinstance(t[1], Geometry))

            self.assertIsInstance(d['point'], Geometry)

            self.assertIsInstance(t[1], Geometry)

            self.assertEqual(m.point, d['point'])

            self.assertEqual(m.point, t[1])
@@ -255,7 +255,7 @@ class RelatedGeoModelTest(TestCase): 
        qs = Location.objects.filter(id=5).annotate(num_cities=Count('city')).values('id', 'point', 'num_cities')

        self.assertEqual(1, len(qs))

        self.assertEqual(2, qs[0]['num_cities'])

        self.assertTrue(isinstance(qs[0]['point'], GEOSGeometry))

        self.assertIsInstance(qs[0]['point'], GEOSGeometry)



    # TODO: The phantom model does appear on Oracle.

    @no_oracle