diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/model_fields/test_jsonfield.py | 25 | ||||
| -rw-r--r-- | tests/postgres_tests/test_aggregates.py | 56 |
2 files changed, 1 insertions, 80 deletions
diff --git a/tests/model_fields/test_jsonfield.py b/tests/model_fields/test_jsonfield.py index 4a1cc075b4..40836aece7 100644 --- a/tests/model_fields/test_jsonfield.py +++ b/tests/model_fields/test_jsonfield.py @@ -37,7 +37,6 @@ from django.db.models.fields.json import ( from django.db.models.functions import Cast from django.test import SimpleTestCase, TestCase, skipIfDBFeature, skipUnlessDBFeature from django.test.utils import CaptureQueriesContext -from django.utils.deprecation import RemovedInDjango51Warning from .models import CustomJSONDecoder, JSONModel, NullableJSONModel, RelatedJSONModel @@ -216,30 +215,6 @@ class TestSaveLoad(TestCase): obj.refresh_from_db() self.assertIsNone(obj.value) - def test_ambiguous_str_value_deprecation(self): - msg = ( - "Providing an encoded JSON string via Value() is deprecated. Use Value([], " - "output_field=JSONField()) instead." - ) - with self.assertWarnsMessage(RemovedInDjango51Warning, msg): - obj = NullableJSONModel.objects.create(value=Value("[]")) - obj.refresh_from_db() - self.assertEqual(obj.value, []) - - @skipUnlessDBFeature("supports_primitives_in_json_field") - def test_value_str_primitives_deprecation(self): - msg = ( - "Providing an encoded JSON string via Value() is deprecated. Use " - "Value(None, output_field=JSONField()) instead." - ) - with self.assertWarnsMessage(RemovedInDjango51Warning, msg): - obj = NullableJSONModel.objects.create(value=Value("null")) - obj.refresh_from_db() - self.assertIsNone(obj.value) - obj = NullableJSONModel.objects.create(value=Value("invalid-json")) - obj.refresh_from_db() - self.assertEqual(obj.value, "invalid-json") - @skipUnlessDBFeature("supports_primitives_in_json_field") def test_json_null_different_from_sql_null(self): json_null = NullableJSONModel.objects.create(value=Value(None, JSONField())) diff --git a/tests/postgres_tests/test_aggregates.py b/tests/postgres_tests/test_aggregates.py index bb694dae63..386c55da25 100644 --- a/tests/postgres_tests/test_aggregates.py +++ b/tests/postgres_tests/test_aggregates.py @@ -14,9 +14,8 @@ from django.db.models import ( from django.db.models.fields.json import KeyTextTransform, KeyTransform from django.db.models.functions import Cast, Concat, Substr from django.test import skipUnlessDBFeature -from django.test.utils import Approximate, ignore_warnings +from django.test.utils import Approximate from django.utils import timezone -from django.utils.deprecation import RemovedInDjango51Warning from . import PostgreSQLTestCase from .models import AggregateTestModel, HotelReservation, Room, StatTestModel @@ -152,59 +151,6 @@ class TestGeneralAggregate(PostgreSQLTestCase): ) self.assertEqual(values, {"aggregation": expected_result}) - @ignore_warnings(category=RemovedInDjango51Warning) - def test_jsonb_agg_default_str_value(self): - AggregateTestModel.objects.all().delete() - queryset = AggregateTestModel.objects.all() - self.assertEqual( - queryset.aggregate( - aggregation=JSONBAgg("integer_field", default=Value("<empty>")) - ), - {"aggregation": "<empty>"}, - ) - - def test_jsonb_agg_default_str_value_deprecation(self): - queryset = AggregateTestModel.objects.all() - msg = ( - "Passing a Value() with an output_field that isn't a JSONField as " - "JSONBAgg(default) is deprecated. Pass default=Value('<empty>', " - "output_field=JSONField()) instead." - ) - with self.assertWarnsMessage(RemovedInDjango51Warning, msg): - queryset.aggregate( - aggregation=JSONBAgg("integer_field", default=Value("<empty>")) - ) - with self.assertWarnsMessage(RemovedInDjango51Warning, msg): - queryset.none().aggregate( - aggregation=JSONBAgg("integer_field", default=Value("<empty>")) - ), - - @ignore_warnings(category=RemovedInDjango51Warning) - def test_jsonb_agg_default_encoded_json_string(self): - AggregateTestModel.objects.all().delete() - queryset = AggregateTestModel.objects.all() - self.assertEqual( - queryset.aggregate( - aggregation=JSONBAgg("integer_field", default=Value("[]")) - ), - {"aggregation": []}, - ) - - def test_jsonb_agg_default_encoded_json_string_deprecation(self): - queryset = AggregateTestModel.objects.all() - msg = ( - "Passing an encoded JSON string as JSONBAgg(default) is deprecated. Pass " - "default=[] instead." - ) - with self.assertWarnsMessage(RemovedInDjango51Warning, msg): - queryset.aggregate( - aggregation=JSONBAgg("integer_field", default=Value("[]")) - ) - with self.assertWarnsMessage(RemovedInDjango51Warning, msg): - queryset.none().aggregate( - aggregation=JSONBAgg("integer_field", default=Value("[]")) - ) - def test_array_agg_charfield(self): values = AggregateTestModel.objects.aggregate(arrayagg=ArrayAgg("char_field")) self.assertEqual(values, {"arrayagg": ["Foo1", "Foo2", "Foo4", "Foo3"]}) |