adapt tests for ObjectIdAutoField

django/contrib/contenttypes/views.py

@@ -1,7 +1,7 @@
 from django.apps import apps
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.shortcuts import get_current_site
-from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.http import Http404, HttpResponseRedirect
 from django.utils.translation import gettext as _
 
@@ -19,7 +19,7 @@ def shortcut(request, content_type_id, object_id):
                 % {"ct_id": content_type_id}
             )
         obj = content_type.get_object_for_this_type(pk=object_id)
-    except (ObjectDoesNotExist, ValueError):
+    except (ObjectDoesNotExist, ValidationError, ValueError):
         raise Http404(
             _("Content type %(ct_id)s object %(obj_id)s doesn’t exist")
             % {"ct_id": content_type_id, "obj_id": object_id}

django/forms/models.py

@@ -1562,7 +1562,12 @@ def to_python(self, value):
             if isinstance(value, self.queryset.model):
                 value = getattr(value, key)
             value = self.queryset.get(**{key: value})
-        except (ValueError, TypeError, self.queryset.model.DoesNotExist):
+        except (
+            ValueError,
+            TypeError,
+            ValidationError,
+            self.queryset.model.DoesNotExist,
+        ):
             raise ValidationError(
                 self.error_messages["invalid_choice"],
                 code="invalid_choice",
@@ -1640,7 +1645,7 @@ def _check_values(self, value):
             self.validate_no_null_characters(pk)
             try:
                 self.queryset.filter(**{key: pk})
-            except (ValueError, TypeError):
+            except (ValueError, TypeError, ValidationError):
                 raise ValidationError(
                     self.error_messages["invalid_pk_value"],
                     code="invalid_pk_value",

tests/admin_changelist/tests.py

@@ -875,7 +875,7 @@ def test_no_distinct_for_m2m_in_list_filter_without_params(self):
             self.assertIs(cl.queryset.query.distinct, False)
 
         # A ManyToManyField in params does have distinct applied.
-        request = self.factory.get("/band/", {"genres": "0"})
+        request = self.factory.get("/band/", {"genres": "000000000000000000000000"})
         request.user = self.superuser
         cl = m.get_changelist_instance(request)
         self.assertIs(cl.queryset.query.distinct, True)
@@ -993,14 +993,19 @@ def test_dynamic_list_display_links(self):
         """
         parent = Parent.objects.create(name="parent")
         for i in range(1, 10):
-            Child.objects.create(id=i, name="child %s" % i, parent=parent, age=i)
+            Child.objects.create(
+                id=f"{i:024}",
+                name="child %s" % i,
+                parent=parent,
+                age=i,
+            )
 
         m = DynamicListDisplayLinksChildAdmin(Child, custom_site)
         superuser = self._create_superuser("superuser")
         request = self._mocked_authenticated_request("/child/", superuser)
         response = m.changelist_view(request)
         for i in range(1, 10):
-            link = reverse("admin:admin_changelist_child_change", args=(i,))
+            link = reverse("admin:admin_changelist_child_change", args=(f"{i:024}",))
             self.assertContains(response, '<a href="%s">%s</a>' % (link, i))
 
         list_display = m.get_list_display(request)
@@ -1277,7 +1282,7 @@ def test_deterministic_order_for_unordered_model(self):
         superuser = self._create_superuser("superuser")
 
         for counter in range(1, 51):
-            UnorderedObject.objects.create(id=counter, bool=True)
+            UnorderedObject.objects.create(id=f"{counter:024}", bool=True)
 
         class UnorderedObjectAdmin(admin.ModelAdmin):
             list_per_page = 10
@@ -1293,7 +1298,7 @@ def check_results_order(ascending=False):
                 response = model_admin.changelist_view(request)
                 for result in response.context_data["cl"].result_list:
                     counter += 1 if ascending else -1
-                    self.assertEqual(result.id, counter)
+                    self.assertEqual(str(result.id), f"{counter:024}")
             custom_site.unregister(UnorderedObject)
 
         # When no order is defined at all, everything is ordered by '-pk'.
@@ -1323,7 +1328,7 @@ def test_deterministic_order_for_model_ordered_by_its_manager(self):
         superuser = self._create_superuser("superuser")
 
         for counter in range(1, 51):
-            OrderedObject.objects.create(id=counter, bool=True, number=counter)
+            OrderedObject.objects.create(id=f"{counter:024}", bool=True, number=counter)
 
         class OrderedObjectAdmin(admin.ModelAdmin):
             list_per_page = 10
@@ -1339,7 +1344,7 @@ def check_results_order(ascending=False):
                 response = model_admin.changelist_view(request)
                 for result in response.context_data["cl"].result_list:
                     counter += 1 if ascending else -1
-                    self.assertEqual(result.id, counter)
+                    self.assertEqual(str(result.id), f"{counter:024}")
             custom_site.unregister(OrderedObject)
 
         # When no order is defined at all, use the model's default ordering

tests/admin_checks/tests.py

@@ -77,7 +77,7 @@ def test_checks_are_performed(self):
         try:
             errors = checks.run_checks()
             expected = ["error!"]
-            self.assertEqual(errors, expected)
+            self.assertEqual(errors[1:], expected)
         finally:
             admin.site.unregister(Song)
 
@@ -268,7 +268,7 @@ class CustomAdminSite(admin.AdminSite):
         try:
             errors = checks.run_checks()
             expected = ["error!"]
-            self.assertEqual(errors, expected)
+            self.assertEqual(errors[1:], expected)
         finally:
             custom_site.unregister(Song)
 

tests/admin_inlines/tests.py

@@ -501,8 +501,10 @@ def test_localize_pk_shortcut(self):
         The "View on Site" link is correct for locales that use thousand
         separators.
         """
-        holder = Holder.objects.create(pk=123456789, dummy=42)
-        inner = Inner.objects.create(pk=987654321, holder=holder, dummy=42, readonly="")
+        holder = Holder.objects.create(pk="000000000000000123456789", dummy=42)
+        inner = Inner.objects.create(
+            pk="000000000000000987654321", holder=holder, dummy=42, readonly=""
+        )
         response = self.client.get(
             reverse("admin:admin_inlines_holder_change", args=(holder.id,))
         )
@@ -936,7 +938,7 @@ def setUpTestData(cls):
         )
         cls.user.user_permissions.add(permission)
 
-        author = Author.objects.create(pk=1, name="The Author")
+        author = Author.objects.create(pk="000000000000000000000001", name="The Author")
         cls.book = author.books.create(name="The inline Book")
         cls.author_change_url = reverse(
             "admin:admin_inlines_author_change", args=(author.id,)

tests/admin_views/admin.py

@@ -288,11 +288,13 @@ def has_module_permission(self, request):
 class RowLevelChangePermissionModelAdmin(admin.ModelAdmin):
     def has_change_permission(self, request, obj=None):
         """Only allow changing objects with even id number"""
-        return request.user.is_staff and (obj is not None) and (obj.id % 2 == 0)
+        return (
+            request.user.is_staff and (obj is not None) and (int(str(obj.id)) % 2 == 0)
+        )
 
     def has_view_permission(self, request, obj=None):
         """Only allow viewing objects if id is a multiple of 3."""
-        return request.user.is_staff and obj is not None and obj.id % 3 == 0
+        return request.user.is_staff and obj is not None and int(str(obj.id)) % 3 == 0
 
 
 class CustomArticleAdmin(admin.ModelAdmin):
@@ -467,7 +469,7 @@ def save_related(self, request, form, formsets, change):
 
 class EmptyModelAdmin(admin.ModelAdmin):
     def get_queryset(self, request):
-        return super().get_queryset(request).filter(pk__gt=1)
+        return super().get_queryset(request).filter(pk__gt="000000000000000000000001")
 
 
 class OldSubscriberAdmin(admin.ModelAdmin):
@@ -644,7 +646,9 @@ class FieldOverridePostAdmin(PostAdmin):
 
 class CustomChangeList(ChangeList):
     def get_queryset(self, request):
-        return self.root_queryset.order_by("pk").filter(pk=9999)  # Doesn't exist
+        return self.root_queryset.order_by("pk").filter(
+            pk="000000000000000000000000"
+        )  # Doesn't exist
 
 
 class GadgetAdmin(admin.ModelAdmin):

tests/admin_views/models.py

@@ -940,7 +940,7 @@ def get_queryset(self):
 
 class FilteredManager(models.Model):
     def __str__(self):
-        return "PK=%d" % self.pk
+        return "PK=%s" % self.pk
 
     pk_gt_1 = _Manager()
     objects = models.Manager()

tests/admin_views/test_actions.py

@@ -89,9 +89,11 @@ def test_model_admin_default_delete_action(self):
         self.assertEqual(Subscriber.objects.count(), 0)
 
     def test_default_delete_action_nonexistent_pk(self):
-        self.assertFalse(Subscriber.objects.filter(id=9998).exists())
+        self.assertFalse(
+            Subscriber.objects.filter(id="000000000000000000009998").exists()
+        )
         action_data = {
-            ACTION_CHECKBOX_NAME: ["9998"],
+            ACTION_CHECKBOX_NAME: ["000000000000000000009998"],
             "action": "delete_selected",
             "index": 0,
         }
@@ -109,7 +111,7 @@ def test_non_localized_pk(self):
         If USE_THOUSAND_SEPARATOR is set, the ids for the objects selected for
         deletion are rendered without separators.
         """
-        s = ExternalSubscriber.objects.create(id=9999)
+        s = ExternalSubscriber.objects.create(id="000000000000000000009999")
         action_data = {
             ACTION_CHECKBOX_NAME: [s.pk, self.s2.pk],
             "action": "delete_selected",
@@ -119,7 +121,7 @@ def test_non_localized_pk(self):
             reverse("admin:admin_views_subscriber_changelist"), action_data
         )
         self.assertTemplateUsed(response, "admin/delete_selected_confirmation.html")
-        self.assertContains(response, 'value="9999"')  # Instead of 9,999
+        self.assertContains(response, 'value="000000000000000000009999"')
         self.assertContains(response, 'value="%s"' % self.s2.pk)
 
     def test_model_admin_default_delete_action_protected(self):