Refs #31180 -- Removed default_app_config application configuration variable per deprecation timeline.

9 files changed, 2 insertions, 145 deletions

diff --git a/tests/apps/explicit_default_config_app/__init__.py b/tests/apps/explicit_default_config_app/__init__.py
deleted file mode 100644
index d97f1b3f21..0000000000
--- a/tests/apps/explicit_default_config_app/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-default_app_config = 'apps.explicit_default_config_app.apps.ExplicitDefaultConfig'
diff --git a/tests/apps/explicit_default_config_app/apps.py b/tests/apps/explicit_default_config_app/apps.py
deleted file mode 100644
index e41ad5dcbb..0000000000
--- a/tests/apps/explicit_default_config_app/apps.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class ExplicitDefaultConfig(AppConfig):
-    name = 'apps.explicit_default_config_app'
diff --git a/tests/apps/explicit_default_config_empty_apps/__init__.py b/tests/apps/explicit_default_config_empty_apps/__init__.py
deleted file mode 100644
index a7a4f548d7..0000000000
--- a/tests/apps/explicit_default_config_empty_apps/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from django.apps import AppConfig
-
-default_app_config = 'apps.explicit_default_config_empty_apps.ExplicitDefaultConfigEmptyApps'
-
-
-class ExplicitDefaultConfigEmptyApps(AppConfig):
-    name = 'apps.explicit_default_config_empty_apps'
diff --git a/tests/apps/explicit_default_config_empty_apps/apps.py b/tests/apps/explicit_default_config_empty_apps/apps.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/apps/explicit_default_config_empty_apps/apps.py
+++ /dev/null
diff --git a/tests/apps/explicit_default_config_mismatch_app/__init__.py b/tests/apps/explicit_default_config_mismatch_app/__init__.py
deleted file mode 100644
index 8889145538..0000000000
--- a/tests/apps/explicit_default_config_mismatch_app/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-default_app_config = 'apps.explicit_default_config_mismatch_app.not_apps.ExplicitDefaultConfigMismatch'
diff --git a/tests/apps/explicit_default_config_mismatch_app/apps.py b/tests/apps/explicit_default_config_mismatch_app/apps.py
deleted file mode 100644
index ddbead408d..0000000000
--- a/tests/apps/explicit_default_config_mismatch_app/apps.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class ImplicitDefaultConfigMismatch(AppConfig):
-    name = 'apps.explicit_default_config_mismatch_app'
diff --git a/tests/apps/explicit_default_config_mismatch_app/not_apps.py b/tests/apps/explicit_default_config_mismatch_app/not_apps.py
deleted file mode 100644
index 941d35c3d2..0000000000
--- a/tests/apps/explicit_default_config_mismatch_app/not_apps.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class ExplicitDefaultConfigMismatch(AppConfig):
-    name = 'apps.explicit_default_config_mismatch_app'
diff --git a/tests/apps/explicit_default_config_without_apps/__init__.py b/tests/apps/explicit_default_config_without_apps/__init__.py
deleted file mode 100644
index c42323376f..0000000000
--- a/tests/apps/explicit_default_config_without_apps/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from django.apps import AppConfig
-
-default_app_config = 'apps.explicit_default_config_without_apps.ExplicitDefaultConfigWithoutApps'
-
-
-class ExplicitDefaultConfigWithoutApps(AppConfig):
-    name = 'apps.explicit_default_config_without_apps'
diff --git a/tests/apps/tests.py b/tests/apps/tests.py
index a8a93ce683..46f118ab04 100644
--- a/tests/apps/tests.py
+++ b/tests/apps/tests.py
@@ -5,18 +5,9 @@ from django.apps.registry import Apps
 from django.contrib.admin.models import LogEntry
 from django.core.exceptions import AppRegistryNotReady, ImproperlyConfigured
 from django.db import models
-from django.test import SimpleTestCase, ignore_warnings, override_settings
+from django.test import SimpleTestCase, override_settings
 from django.test.utils import extend_sys_path, isolate_apps
-from django.utils.deprecation import RemovedInDjango41Warning
-
-from .explicit_default_config_app.apps import ExplicitDefaultConfig
-from .explicit_default_config_empty_apps import ExplicitDefaultConfigEmptyApps
-from .explicit_default_config_mismatch_app.not_apps import (
-    ExplicitDefaultConfigMismatch,
-)
-from .explicit_default_config_without_apps import (
-    ExplicitDefaultConfigWithoutApps,
-)
+
 from .models import SoAlternative, TotallyNormal, new_apps
 from .one_config_app.apps import OneConfig
 from .two_configs_one_default_app.apps import TwoConfig
@@ -511,106 +502,3 @@ class NamespacePackageAppTests(SimpleTestCase):
             with self.settings(INSTALLED_APPS=['nsapp.apps.NSAppConfig']):
                 app_config = apps.get_app_config('nsapp')
                 self.assertEqual(app_config.path, self.app_path)
-
-
-class DeprecationTests(SimpleTestCase):
-    @ignore_warnings(category=RemovedInDjango41Warning)
-    def test_explicit_default_app_config(self):
-        with self.settings(INSTALLED_APPS=['apps.explicit_default_config_app']):
-            config = apps.get_app_config('explicit_default_config_app')
-        self.assertIsInstance(config, ExplicitDefaultConfig)
-
-    def test_explicit_default_app_config_warning(self):
-        """
-        Load an app that specifies a default AppConfig class matching the
-        autodetected one.
-        """
-        msg = (
-            "'apps.explicit_default_config_app' defines default_app_config = "
-            "'apps.explicit_default_config_app.apps.ExplicitDefaultConfig'. "
-            "Django now detects this configuration automatically. You can "
-            "remove default_app_config."
-        )
-        with self.assertRaisesMessage(RemovedInDjango41Warning, msg):
-            with self.settings(INSTALLED_APPS=['apps.explicit_default_config_app']):
-                pass
-        with ignore_warnings(category=RemovedInDjango41Warning):
-            with self.settings(INSTALLED_APPS=['apps.explicit_default_config_app']):
-                self.assertIsInstance(
-                    apps.get_app_config('explicit_default_config_app'),
-                    ExplicitDefaultConfig,
-                )
-
-    def test_explicit_default_app_config_mismatch(self):
-        """
-        Load an app that specifies a default AppConfig class not matching the
-        autodetected one.
-        """
-        msg = (
-            "'apps.explicit_default_config_mismatch_app' defines "
-            "default_app_config = 'apps.explicit_default_config_mismatch_app."
-            "not_apps.ExplicitDefaultConfigMismatch'. However, Django's "
-            "automatic detection picked another configuration, 'apps."
-            "explicit_default_config_mismatch_app.apps."
-            "ImplicitDefaultConfigMismatch'. You should move the default "
-            "config class to the apps submodule of your application and, if "
-            "this module defines several config classes, mark the default one "
-            "with default = True."
-        )
-        with self.assertRaisesMessage(RemovedInDjango41Warning, msg):
-            with self.settings(INSTALLED_APPS=['apps.explicit_default_config_mismatch_app']):
-                pass
-        with ignore_warnings(category=RemovedInDjango41Warning):
-            with self.settings(INSTALLED_APPS=['apps.explicit_default_config_mismatch_app']):
-                self.assertIsInstance(
-                    apps.get_app_config('explicit_default_config_mismatch_app'),
-                    ExplicitDefaultConfigMismatch,
-                )
-
-    def test_explicit_default_app_config_empty_apps(self):
-        """
-        Load an app that specifies a default AppConfig class in __init__ and
-        have an empty apps module.
-        """
-        msg = (
-            "'apps.explicit_default_config_empty_apps' defines "
-            "default_app_config = 'apps.explicit_default_config_empty_apps."
-            "ExplicitDefaultConfigEmptyApps'. However, Django's automatic "
-            "detection did not find this configuration. You should move the "
-            "default config class to the apps submodule of your application "
-            "and, if this module defines several config classes, mark the "
-            "default one with default = True."
-        )
-        with self.assertRaisesMessage(RemovedInDjango41Warning, msg):
-            with self.settings(INSTALLED_APPS=['apps.explicit_default_config_empty_apps']):
-                pass
-        with ignore_warnings(category=RemovedInDjango41Warning):
-            with self.settings(INSTALLED_APPS=['apps.explicit_default_config_empty_apps']):
-                self.assertIsInstance(
-                    apps.get_app_config('explicit_default_config_empty_apps'),
-                    ExplicitDefaultConfigEmptyApps,
-                )
-
-    def test_explicit_default_app_config_without_apps(self):
-        """
-        Load an app that specifies a default AppConfig class in __init__ and do
-        not have an apps module.
-        """
-        msg = (
-            "'apps.explicit_default_config_without_apps' defines "
-            "default_app_config = 'apps.explicit_default_config_without_apps."
-            "ExplicitDefaultConfigWithoutApps'. However, Django's automatic "
-            "detection did not find this configuration. You should move the "
-            "default config class to the apps submodule of your application "
-            "and, if this module defines several config classes, mark the "
-            "default one with default = True."
-        )
-        with self.assertRaisesMessage(RemovedInDjango41Warning, msg):
-            with self.settings(INSTALLED_APPS=['apps.explicit_default_config_without_apps']):
-                pass
-        with ignore_warnings(category=RemovedInDjango41Warning):
-            with self.settings(INSTALLED_APPS=['apps.explicit_default_config_without_apps']):
-                self.assertIsInstance(
-                    apps.get_app_config('explicit_default_config_without_apps'),
-                    ExplicitDefaultConfigWithoutApps,
-                )