2 files changed, 62 insertions, 67 deletions
diff --git a/tests/test_jsonpath.py b/tests/test_jsonpath.py
index bf3d5c6..2c01992 100644
--- a/tests/test_jsonpath.py
+++ b/tests/test_jsonpath.py
@@ -290,3 +290,65 @@ class TestJsonPath(unittest.TestCase):
                              } },
                              ['foo.baz', 
                               'foo.bing.baz'] )])
+
+    def check_update_cases(self, test_cases):
+        for original, expr_str, value, expected in test_cases:
+            print('parse(%r).update(%r, %r) =?= %r'
+                  % (expr_str, original, value, expected))
+            expr = parse(expr_str)
+            actual = expr.update(original, value)
+            assert actual == expected
+
+    def test_update_root(self):
+        self.check_update_cases([
+            ('foo', '$', 'bar', 'bar')
+        ])
+
+    def test_update_this(self):
+        self.check_update_cases([
+            ('foo', '`this`', 'bar', 'bar')
+        ])
+
+    def test_update_fields(self):
+        self.check_update_cases([
+            ({'foo': 1}, 'foo', 5, {'foo': 5}),
+            ({'foo': 1, 'bar': 2}, '$.*', 3, {'foo': 3, 'bar': 3})
+        ])
+
+    def test_update_child(self):
+        self.check_update_cases([
+            ({'foo': 'bar'}, '$.foo', 'baz', {'foo': 'baz'}),
+            ({'foo': {'bar': 1}}, 'foo.bar', 'baz', {'foo': {'bar': 'baz'}})
+        ])
+
+    def test_update_where(self):
+        self.check_update_cases([
+            ({'foo': {'bar': {'baz': 1}}, 'bar': {'baz': 2}},
+             '*.bar where baz', 5, {'foo': {'bar': 5}, 'bar': {'baz': 2}})
+        ])
+
+    def test_update_descendants_where(self):
+        self.check_update_cases([
+            ({'foo': {'bar': 1, 'flag': 1}, 'baz': {'bar': 2}},
+             '(* where flag) .. bar', 3,
+             {'foo': {'bar': 3, 'flag': 1}, 'baz': {'bar': 2}})
+        ])
+
+    def test_update_descendants(self):
+        self.check_update_cases([
+            ({'somefield': 1}, '$..somefield', 42, {'somefield': 42}),
+            ({'outer': {'nestedfield': 1}}, '$..nestedfield', 42, {'outer': {'nestedfield': 42}}),
+            ({'outs': {'bar': 1, 'ins': {'bar': 9}}, 'outs2': {'bar': 2}},
+             '$..bar', 42,
+             {'outs': {'bar': 42, 'ins': {'bar': 42}}, 'outs2': {'bar': 42}})
+        ])
+
+    def test_update_index(self):
+        self.check_update_cases([
+            (['foo', 'bar', 'baz'], '[0]', 'test', ['test', 'bar', 'baz'])
+        ])
+
+    def test_update_slice(self):
+        self.check_update_cases([
+            (['foo', 'bar', 'baz'], '[0:2]', 'test', ['test', 'test', 'baz'])
+        ])
diff --git a/tests/test_update.py b/tests/test_update.py
deleted file mode 100644
index f556c66..0000000
--- a/tests/test_update.py
+++ /dev/null
@@ -1,67 +0,0 @@
-from __future__ import unicode_literals, print_function, absolute_import, division, generators, nested_scopes
-
-import unittest
-import logging
-
-from jsonpath_rw.parser import parse
-
-
-class TestUpdate(unittest.TestCase):
-
-    @classmethod
-    def setup_class(cls):
-        logging.basicConfig()
-
-    def check_update_cases(self, test_cases):
-        for original, expr_str, value, expected in test_cases:
-            print('parse(%r).update(%r, %r) =?= %r'
-                  % (expr_str, original, value, expected))
-            expr = parse(expr_str)
-            actual = expr.update(original, value)
-            assert actual == expected
-
-    def test_update_root(self):
-        self.check_update_cases([
-            ('foo', '$', 'bar', 'bar')
-        ])
-
-    def test_update_this(self):
-        self.check_update_cases([
-            ('foo', '`this`', 'bar', 'bar')
-        ])
-
-    def test_update_fields(self):
-        self.check_update_cases([
-            ({'foo': 1}, 'foo', 5, {'foo': 5}),
-            ({}, 'foo', 1, {'foo': 1}),
-            ({'foo': 1, 'bar': 2}, '$.*', 3, {'foo': 3, 'bar': 3})
-        ])
-
-    def test_update_child(self):
-        self.check_update_cases([
-            ({'foo': 'bar'}, '$.foo', 'baz', {'foo': 'baz'}),
-            ({'foo': {'bar': 1}}, 'foo.bar', 'baz', {'foo': {'bar': 'baz'}})
-        ])
-
-    def test_update_where(self):
-        self.check_update_cases([
-            ({'foo': {'bar': {'baz': 1}}, 'bar': {'baz': 2}},
-             '*.bar where baz', 5, {'foo': {'bar': 5}, 'bar': {'baz': 2}})
-        ])
-
-    def test_update_descendants(self):
-        self.check_update_cases([
-            ({'foo': {'bar': 1, 'flag': 1}, 'baz': {'bar': 2}},
-             '* where flag .. bar', 3,
-             {'foo': {'bar': 3, 'flag': 1}, 'baz': {'bar': 2}})
-        ])
-
-    def test_update_index(self):
-        self.check_update_cases([
-            (['foo', 'bar', 'baz'], '[0]', 'test', ['test', 'bar', 'baz'])
-        ])
-
-    def test_update_slice(self):
-        self.check_update_cases([
-            (['foo', 'bar', 'baz'], '[0:2]', 'test', ['test', 'test', 'baz'])
-        ])