Fixed failing tests due to change in key validations.

@yolinas

tests/core/test_validation.py

@@ -21,16 +21,17 @@ def test_keys_can_contain_numbers_and_restricted_punctuation(self):
         assert_that(key_is_valid("name54"), is_(True))
         assert_that(key_is_valid("name_of_thing"), is_(True))
         assert_that(key_is_valid("son.of.thing"), is_(False))
-        assert_that(key_is_valid("name-of-thing"), is_(False))
+        assert_that(key_is_valid("name-of-thing"), is_(True))
         assert_that(key_is_valid("son;of;thing"), is_(False))
         assert_that(key_is_valid("son:of:thing"), is_(False))
+        assert_that(key_is_valid("son-of(thing)"), is_(True))
 
-    def test_keys_must_start_with_letter_or_underscore(self):
+    def test_keys_must_start_with_letter_number_or_underscore(self):
         assert_that(key_is_valid("field"), is_(True))
         assert_that(key_is_valid("_field"), is_(True))
         assert_that(key_is_valid("field1"), is_(True))
         assert_that(key_is_valid("Field1"), is_(True))
-        assert_that(key_is_valid("1field"), is_(False))
+        assert_that(key_is_valid("1field"), is_(True))
 
     def test_key_cannot_be_empty(self):
         assert_that(key_is_valid(""), is_(False))
@@ -126,7 +127,7 @@ def test_id_should_be_a_utf8_string(self):
 class TestValidateRecordData(unittest.TestCase):
     def test_objects_with_invalid_keys_are_disallowed(self):
         validation_result = validate_record_data({
-            'foo-bar': 'bar'
+            'foo:bar': 'bar'
         })
         assert_that(validation_result,
                     is_invalid_with_message("foo-bar is not a valid key"))

tests/read/test_validation.py

@@ -72,7 +72,7 @@ def test_subsequent_filter_by_parameters_are_validated(self):
 
     def test_queries_filtering_by_invalid_field_names_are_disallowed(self):
         validation_result = validate_request_args({
-            'filter_by': 'with-hyphen:bar'
+            'filter_by': 'with:nohyphen:bar'
         })
         assert_that(validation_result, is_invalid_with_message(
             'Cannot filter by an invalid field name'
@@ -95,7 +95,7 @@ def test_queries_with_grouping_on_internal_fields_are_disallowed(self):
             "start with an underscore"))
 
     def test_queries_grouping_on_invalid_field_names_are_disallowed(self):
-        validation_result = validate_request_args({"group_by": "with-hyphen"})
+        validation_result = validate_request_args({"group_by": "with:nohyphen"})
         assert_that(validation_result, is_invalid_with_message(
             "Cannot group by an invalid field name"
         ))
@@ -122,7 +122,7 @@ def test_queries_with_unrecognized_sort_by_values_are_disallowed(self):
 
     def test_queries_sorting_by_invalid_field_names_are_disallowed(self):
         validation_result = validate_request_args({
-            'sort_by': 'with-hyphen:ascending'
+            'sort_by': 'with:nohyphen:ascending'
         })
         assert_that(validation_result, is_invalid_with_message(
             'Cannot sort by an invalid field name'
@@ -206,7 +206,7 @@ def test_queries_with_code_injection_collect_values_are_disallowed(self):
     def test_queries_collecting_invalid_field_names_are_disallowed(self):
         validation_result = validate_request_args(MultiDict([
             ("group_by", "bar"),
-            ("collect", "with-hyphen")
+            ("collect", "with:column")
         ]))
         assert_that(validation_result, is_invalid_with_message(
             "Cannot collect an invalid field name"