diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/units/README.md | 2 | ||||
| -rwxr-xr-x | test/units/multi_inventory_test.py | 114 | ||||
| -rwxr-xr-x | test/units/mutli_ec2_test.py | 95 | 
3 files changed, 115 insertions, 96 deletions
| diff --git a/test/units/README.md b/test/units/README.md index 3bed227eb..78a02c3ea 100644 --- a/test/units/README.md +++ b/test/units/README.md @@ -4,4 +4,4 @@ These should be run by sourcing the env-setup:  $ source test/env-setup  Then navigate to the test/units/ directory. -$ python -m unittest multi_ec2_test +$ python -m unittest multi_inventory_test diff --git a/test/units/multi_inventory_test.py b/test/units/multi_inventory_test.py new file mode 100755 index 000000000..168cd82b7 --- /dev/null +++ b/test/units/multi_inventory_test.py @@ -0,0 +1,114 @@ +#!/usr/bin/env python2 +''' + Unit tests for MultiInventory +''' + +import unittest +import multi_inventory + +# Removing invalid variable names for tests so that I can +# keep them brief +# pylint: disable=invalid-name +class MultiInventoryTest(unittest.TestCase): +    ''' +     Test class for multiInventory +    ''' + +#    def setUp(self): +#        '''setup method''' +#        pass + +    def test_merge_simple_1(self): +        '''Testing a simple merge of 2 dictionaries''' +        a = {"key1" : 1} +        b = {"key1" : 2} +        result = {} +        _ = [multi_inventory.MultiInventory.merge_destructively(result, x) for x in [a, b]] +        self.assertEqual(result, {"key1": [1, 2]}) + +    def test_merge_b_empty(self): +        '''Testing a merge of an emtpy dictionary''' +        a = {"key1" : 1} +        b = {} +        result = {} +        _ = [multi_inventory.MultiInventory.merge_destructively(result, x) for x in [a, b]] +        self.assertEqual(result, {"key1": 1}) + +    def test_merge_a_empty(self): +        '''Testing a merge of an emtpy dictionary''' +        b = {"key1" : 1} +        a = {} +        result = {} +        _ = [multi_inventory.MultiInventory.merge_destructively(result, x) for x in [a, b]] +        self.assertEqual(result, {"key1": 1}) + +    def test_merge_hash_array(self): +        '''Testing a merge of a dictionary and a dictionary with an array''' +        a = {"key1" : {"hasha": 1}} +        b = {"key1" : [1, 2]} +        result = {} +        _ = [multi_inventory.MultiInventory.merge_destructively(result, x) for x in [a, b]] +        self.assertEqual(result, {"key1": [{"hasha": 1}, 1, 2]}) + +    def test_merge_array_hash(self): +        '''Testing a merge of a dictionary with an array and a dictionary with a hash''' +        a = {"key1" : [1, 2]} +        b = {"key1" : {"hasha": 1}} +        result = {} +        _ = [multi_inventory.MultiInventory.merge_destructively(result, x) for x in [a, b]] +        self.assertEqual(result, {"key1": [1, 2, {"hasha": 1}]}) + +    def test_merge_keys_1(self): +        '''Testing a merge on a dictionary for keys''' +        a = {"key1" : [1, 2], "key2" : {"hasha": 2}} +        b = {"key2" : {"hashb": 1}} +        result = {} +        _ = [multi_inventory.MultiInventory.merge_destructively(result, x) for x in [a, b]] +        self.assertEqual(result, {"key1": [1, 2], "key2": {"hasha": 2, "hashb": 1}}) + +    def test_merge_recursive_1(self): +        '''Testing a recursive merge''' +        a = {"a" : {"b": {"c": 1}}} +        b = {"a" : {"b": {"c": 2}}} +        result = {} +        _ = [multi_inventory.MultiInventory.merge_destructively(result, x) for x in [a, b]] +        self.assertEqual(result, {"a": {"b": {"c": [1, 2]}}}) + +    def test_merge_recursive_array_item(self): +        '''Testing a recursive merge for an array''' +        a = {"a" : {"b": {"c": [1]}}} +        b = {"a" : {"b": {"c": 2}}} +        result = {} +        _ = [multi_inventory.MultiInventory.merge_destructively(result, x) for x in [a, b]] +        self.assertEqual(result, {"a": {"b": {"c": [1, 2]}}}) + +    def test_merge_recursive_hash_item(self): +        '''Testing a recursive merge for a hash''' +        a = {"a" : {"b": {"c": {"d": 1}}}} +        b = {"a" : {"b": {"c": 2}}} +        result = {} +        _ = [multi_inventory.MultiInventory.merge_destructively(result, x) for x in [a, b]] +        self.assertEqual(result, {"a": {"b": {"c": [{"d": 1}, 2]}}}) + +    def test_merge_recursive_array_hash(self): +        '''Testing a recursive merge for an array and a hash''' +        a = {"a" : [{"b": {"c":  1}}]} +        b = {"a" : {"b": {"c": 1}}} +        result = {} +        _ = [multi_inventory.MultiInventory.merge_destructively(result, x) for x in [a, b]] +        self.assertEqual(result, {"a": [{"b": {"c": 1}}]}) + +    def test_merge_recursive_hash_array(self): +        '''Testing a recursive merge for an array and a hash''' +        a = {"a" : {"b": {"c": 1}}} +        b = {"a" : [{"b": {"c":  1}}]} +        result = {} +        _ = [multi_inventory.MultiInventory.merge_destructively(result, x) for x in [a, b]] +        self.assertEqual(result, {"a": [{"b": {"c": 1}}]}) + +#    def tearDown(self): +#        '''TearDown method''' +#        pass + +if __name__ == "__main__": +    unittest.main() diff --git a/test/units/mutli_ec2_test.py b/test/units/mutli_ec2_test.py deleted file mode 100755 index 95df93cd2..000000000 --- a/test/units/mutli_ec2_test.py +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env python2 - -import unittest -import sys -import os -import sys -import multi_ec2 - -class MultiEc2Test(unittest.TestCase): - -    def setUp(self): -        pass - -    def test_merge_simple_1(self): -        a = {"key1" : 1} -        b = {"key1" : 2} -        result = {} -        [multi_ec2.MultiEc2.merge_destructively(result, x) for x in [a,b]] -        self.assertEqual(result, {"key1": [1,2]}) - -    def test_merge_b_empty(self): -        a = {"key1" : 1} -        b = {} -        result = {} -        [multi_ec2.MultiEc2.merge_destructively(result, x) for x in [a,b]] -        self.assertEqual(result, {"key1": 1}) - -    def test_merge_a_empty(self): -        b = {"key1" : 1} -        a = {} -        result = {} -        [multi_ec2.MultiEc2.merge_destructively(result, x) for x in [a,b]] -        self.assertEqual(result, {"key1": 1}) - -    def test_merge_hash_array(self): -        a = {"key1" : {"hasha": 1}} -        b = {"key1" : [1,2]} -        result = {} -        [multi_ec2.MultiEc2.merge_destructively(result, x) for x in [a,b]] -        self.assertEqual(result, {"key1": [{"hasha": 1}, 1,2]}) - -    def test_merge_array_hash(self): -        a = {"key1" : [1,2]} -        b = {"key1" : {"hasha": 1}} -        result = {} -        [multi_ec2.MultiEc2.merge_destructively(result, x) for x in [a,b]] -        self.assertEqual(result, {"key1": [1,2, {"hasha": 1}]}) - -    def test_merge_keys_1(self): -        a = {"key1" : [1,2], "key2" : {"hasha": 2}} -        b = {"key2" : {"hashb": 1}} -        result = {} -        [multi_ec2.MultiEc2.merge_destructively(result, x) for x in [a,b]] -        self.assertEqual(result, {"key1": [1,2], "key2": {"hasha": 2, "hashb": 1}}) - -    def test_merge_recursive_1(self): -        a = {"a" : {"b": {"c": 1}}} -        b = {"a" : {"b": {"c": 2}}} -        result = {} -        [multi_ec2.MultiEc2.merge_destructively(result, x) for x in [a,b]] -        self.assertEqual(result, {"a": {"b": {"c": [1,2]}}}) - -    def test_merge_recursive_array_item(self): -        a = {"a" : {"b": {"c": [1]}}} -        b = {"a" : {"b": {"c": 2}}} -        result = {} -        [multi_ec2.MultiEc2.merge_destructively(result, x) for x in [a,b]] -        self.assertEqual(result, {"a": {"b": {"c": [1,2]}}}) - -    def test_merge_recursive_hash_item(self): -        a = {"a" : {"b": {"c": {"d": 1}}}} -        b = {"a" : {"b": {"c": 2}}} -        result = {} -        [multi_ec2.MultiEc2.merge_destructively(result, x) for x in [a,b]] -        self.assertEqual(result, {"a": {"b": {"c": [{"d": 1}, 2]}}}) - -    def test_merge_recursive_array_hash(self): -        a = {"a" : [{"b": {"c":  1}}]} -        b = {"a" : {"b": {"c": 1}}} -        result = {} -        [multi_ec2.MultiEc2.merge_destructively(result, x) for x in [a,b]] -        self.assertEqual(result, {"a": [{"b": {"c": 1}}]}) - -    def test_merge_recursive_hash_array(self): -        a = {"a" : {"b": {"c": 1}}} -        b = {"a" : [{"b": {"c":  1}}]} -        result = {} -        [multi_ec2.MultiEc2.merge_destructively(result, x) for x in [a,b]] -        self.assertEqual(result, {"a": [{"b": {"c": 1}}]}) - -    def tearDown(self): -        pass - -if __name__ == "__main__": -  unittest.main() | 
