From 4e9a554837dfb99cad3ec27cf94e4daf1a7a203e Mon Sep 17 00:00:00 2001
From: Mark Chappell <mchappel@redhat.com>
Date: Mon, 10 Oct 2022 15:26:32 +0200
Subject: [PATCH] Expand tagging unit tests

---
 changelogs/fragments/unit-tests-tagging.yml |  2 ++
 tests/unit/module_utils/test_tagging.py     | 25 +++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 changelogs/fragments/unit-tests-tagging.yml

diff --git a/changelogs/fragments/unit-tests-tagging.yml b/changelogs/fragments/unit-tests-tagging.yml
new file mode 100644
index 00000000000..11b2dd9b749
--- /dev/null
+++ b/changelogs/fragments/unit-tests-tagging.yml
@@ -0,0 +1,2 @@
+trivial:
+- module_utils.tagging - expand module_utils.tagging unit tests.
diff --git a/tests/unit/module_utils/test_tagging.py b/tests/unit/module_utils/test_tagging.py
index 04ec96eb0db..7dcf590c37a 100644
--- a/tests/unit/module_utils/test_tagging.py
+++ b/tests/unit/module_utils/test_tagging.py
@@ -6,6 +6,8 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+import pytest
+
 from ansible_collections.amazon.aws.plugins.module_utils.tagging import ansible_dict_to_boto3_tag_list
 from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_list_to_ansible_dict
 from ansible_collections.amazon.aws.plugins.module_utils.tagging import boto3_tag_specifications
@@ -26,6 +28,13 @@ def setup_method(self):
             {'Key': 'lower case', 'Value': 'lower case value'}
         ]
 
+        self.tag_example_boto3_list_custom_key = [
+            {'MyKey': 'lowerCamel', 'MyValue': 'lowerCamelValue'},
+            {'MyKey': 'UpperCamel', 'MyValue': 'upperCamelValue'},
+            {'MyKey': 'Normal case', 'MyValue': 'Normal Value'},
+            {'MyKey': 'lower case', 'MyValue': 'lower case value'}
+        ]
+
         self.tag_example_dict = {
             'lowerCamel': 'lowerCamelValue',
             'UpperCamel': 'upperCamelValue',
@@ -52,6 +61,10 @@ def test_ansible_dict_to_boto3_tag_list(self):
         sorted_list = sorted(self.tag_example_boto3_list, key=lambda i: (i['Key']))
         assert sorted_converted_list == sorted_list
 
+    def test_ansible_dict_to_boto3_tag_list_empty(self):
+        assert ansible_dict_to_boto3_tag_list({}) == []
+        assert ansible_dict_to_boto3_tag_list(None) == []
+
     # ========================================================
     #   tagging.boto3_tag_list_to_ansible_dict
     # ========================================================
@@ -66,6 +79,14 @@ def test_boto3_tag_list_to_ansible_dict_empty(self):
         # Minio returns [{}] when there are no tags
         assert boto3_tag_list_to_ansible_dict([{}]) == {}
 
+    def test_boto3_tag_list_to_ansible_dict_nondefault_keys(self):
+        converted_dict = boto3_tag_list_to_ansible_dict(self.tag_example_boto3_list_custom_key, 'MyKey', 'MyValue')
+        assert converted_dict == self.tag_example_dict
+
+        with pytest.raises(ValueError) as context:
+            boto3_tag_list_to_ansible_dict(self.tag_example_boto3_list, 'MyKey', 'MyValue')
+        assert "Couldn't find tag key" in str(context.value)
+
     # ========================================================
     #   tagging.compare_aws_tags
     # ========================================================
@@ -175,6 +196,10 @@ def test_compare_aws_tags_aws_complex(self):
     #   tagging.boto3_tag_specifications
     # ========================================================
 
+    def test_boto3_tag_specifications_empty(self):
+        assert boto3_tag_specifications(None) is None
+        assert boto3_tag_specifications({}) is None
+
     # Builds upon ansible_dict_to_boto3_tag_list, assume that if a minimal tag
     # dictionary behaves as expected, then all will behave
     def test_boto3_tag_specifications_no_type(self):