--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_configuration.py	Wed Dec 25 22:16:46 2013 -0800
@@ -0,0 +1,106 @@
+import copy
+import pytest
+from piecrust.configuration import Configuration, merge_dicts
+
+
+@pytest.mark.parametrize('values, expected', [
+        (None, {}),
+        ({'foo': 'bar'}, {'foo': 'bar'})
+    ])
+def test_config_init(values, expected):
+    config = Configuration(values)
+    assert config.get() == expected
+
+
+def test_config_set_all():
+    config = Configuration()
+    config.set_all({'foo': 'bar'})
+    assert config.get() == {'foo': 'bar'}
+
+
+def test_config_get_and_set():
+    config = Configuration({'foo': 'bar', 'answer': 42})
+    assert config.get('foo') == 'bar'
+    assert config.get('answer') == 42
+
+    config.set('foo', 'something')
+    assert config.get('foo') == 'something'
+
+
+def test_config_get_and_set_nested():
+    config = Configuration({
+            'foo': [4, 2],
+            'bar': {
+                    'child1': 'one',
+                    'child2': 'two'
+                }
+        })
+    assert config.get('foo') == [4, 2]
+    assert config.get('bar/child1') == 'one'
+    assert config.get('bar/child2') == 'two'
+
+    config.set('bar/child1', 'other one')
+    config.set('bar/child3', 'new one')
+    assert config.get('bar/child1') == 'other one'
+    assert config.get('bar/child3') == 'new one'
+
+
+def test_config_get_missing():
+    config = Configuration({'foo': 'bar'})
+    assert config.get('baz') is None
+
+
+def test_config_has():
+    config = Configuration({'foo': 'bar'})
+    assert config.has('foo') is True
+    assert config.has('baz') is False
+
+
+@pytest.mark.parametrize('local, incoming, expected', [
+        ({}, {}, {}),
+        ({'foo': 'bar'}, {}, {'foo': 'bar'}),
+        ({}, {'foo': 'bar'}, {'foo': 'bar'}),
+        ({'foo': 'bar'}, {'foo': 'other'}, {'foo': 'other'}),
+        ({'foo': [1, 2]}, {'foo': [3]}, {'foo': [3, 1, 2]}),
+        ({'foo': [1, 2]}, {'foo': 'bar'}, {'foo': 'bar'}),
+        ({'foo': {'bar': 1, 'baz': 2}}, {'foo': 'bar'}, {'foo': 'bar'}),
+        ({'foo': {'bar': 1, 'baz': 2}}, {'foo': {'other': 3}}, {'foo': {'bar': 1, 'baz': 2, 'other': 3}}),
+        ({'foo': {'bar': 1, 'baz': 2}}, {'foo': {'baz': 10}}, {'foo': {'bar': 1, 'baz': 10}})
+    ])
+def test_merge_dicts(local, incoming, expected):
+    local2 = copy.deepcopy(local)
+    merge_dicts(local2, incoming)
+    assert local2 == expected
+
+
+def test_config_merge():
+    config = Configuration({
+            'foo': [4, 2],
+            'bar': {
+                    'child1': 'one',
+                    'child2': 'two'
+                }
+        })
+    other = Configuration({
+            'baz': True,
+            'blah': 'blah blah',
+            'bar': {
+                    'child1': 'other one',
+                    'child10': 'ten'
+                }
+        })
+    config.merge(other)
+
+    expected = {
+            'foo': [4, 2],
+            'baz': True,
+            'blah': 'blah blah',
+            'bar': {
+                'child1': 'other one',
+                'child2': 'two',
+                'child10': 'ten'
+                }
+            }
+    assert config.get() == expected
+
+