From cfe6c69e27146977c1bd00d260bf071fbb868a46 Mon Sep 17 00:00:00 2001
From: Kevin DeJong <kddejong@amazon.com>
Date: Wed, 24 Apr 2024 11:05:26 -0700
Subject: [PATCH] V1 cleanup tests (#3165)

* Fix resource type error message syntax
* Update tests for alphabetic ordering
---
 src/cfnlint/rules/resources/Type.py                          | 2 +-
 .../rules/resources/rds/test_db_cluster_engine_version.py    | 5 ++---
 .../rules/resources/rds/test_db_instance_engine_version.py   | 5 ++---
 test/unit/rules/resources/test_type.py                       | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/cfnlint/rules/resources/Type.py b/src/cfnlint/rules/resources/Type.py
index 3c4d7f00fd..c0b804f2db 100644
--- a/src/cfnlint/rules/resources/Type.py
+++ b/src/cfnlint/rules/resources/Type.py
@@ -50,7 +50,7 @@ def cfnresourcetype(
                 ("Custom::", "AWS::Serverless::")
             ) and not resource_type.endswith("::MODULE"):
                 yield ValidationError(
-                    f"Resource type `{resource_type}` does not exist in '{region}'",
+                    f"Resource type {resource_type!r} does not exist in {region!r}",
                     path=deque(["Type"]),
                     rule=self,
                 )
diff --git a/test/unit/rules/resources/rds/test_db_cluster_engine_version.py b/test/unit/rules/resources/rds/test_db_cluster_engine_version.py
index 2d95098231..6d15e763a8 100644
--- a/test/unit/rules/resources/rds/test_db_cluster_engine_version.py
+++ b/test/unit/rules/resources/rds/test_db_cluster_engine_version.py
@@ -34,7 +34,7 @@ def validator():
         (
             {
                 "Engine": "mysql",
-                "EngineVersion": "5.7.37",
+                "EngineVersion": "5.7.44",
             },
             [],
         ),
@@ -74,8 +74,7 @@ def validator():
             [
                 ValidationError(
                     (
-                        "'foo' is not one of ['5.7.37', '5.7.38', '5.7.39', '5.7.40', "
-                        "'5.7.41', '5.7.42', '5.7.43', '5.7.44', '8.0.28', '8.0.31', "
+                        "'foo' is not one of ['5.7.44', '8.0.28', '8.0.31', "
                         "'8.0.32', '8.0.33', '8.0.34', '8.0.35', '8.0.36']"
                     ),
                     rule=DbClusterEngineVersion(),
diff --git a/test/unit/rules/resources/rds/test_db_instance_engine_version.py b/test/unit/rules/resources/rds/test_db_instance_engine_version.py
index c871c8ab8e..f97c8d902c 100644
--- a/test/unit/rules/resources/rds/test_db_instance_engine_version.py
+++ b/test/unit/rules/resources/rds/test_db_instance_engine_version.py
@@ -63,7 +63,7 @@ def validator():
                         "'custom-sqlserver-web', 'db2-ae', 'db2-se', 'mariadb', "
                         "'mysql', 'oracle-ee', 'oracle-ee-cdb', 'oracle-se2', "
                         "'oracle-se2-cdb', 'postgres', 'sqlserver-ee', "
-                        "'sqlserver-se', 'sqlserver-ex', 'sqlserver-web']"
+                        "'sqlserver-ex', 'sqlserver-se', 'sqlserver-web']"
                     ),
                     rule=DbInstanceEngineVersion(),
                     path=deque(["Engine"]),
@@ -79,8 +79,7 @@ def validator():
             [
                 ValidationError(
                     (
-                        "'foo' is not one of ['5.7.37', '5.7.38', '5.7.39', '5.7.40', "
-                        "'5.7.41', '5.7.42', '5.7.43', '5.7.44', '8.0.28', '8.0.31', "
+                        "'foo' is not one of ['5.7.44', '8.0.28', '8.0.31', "
                         "'8.0.32', '8.0.33', '8.0.34', '8.0.35', '8.0.36']"
                     ),
                     rule=DbInstanceEngineVersion(),
diff --git a/test/unit/rules/resources/test_type.py b/test/unit/rules/resources/test_type.py
index b489c2aa61..e16b4cf279 100644
--- a/test/unit/rules/resources/test_type.py
+++ b/test/unit/rules/resources/test_type.py
@@ -51,7 +51,7 @@ def test_types_with_conditions(self, cfn):
             errors,
             [
                 ValidationError(
-                    "Resource type `Foo::Bar::Type` does not exist in 'us-east-1'",
+                    "Resource type 'Foo::Bar::Type' does not exist in 'us-east-1'",
                     path=deque(["Type"]),
                     schema_path=deque([]),
                     rule=Type(),