1 files changed, 16 insertions, 32 deletions

diff --git a/tests/jq_old_tests.py b/tests/jq_old_tests.py
index ea3cabf..f7e1f0d 100644
--- a/tests/jq_old_tests.py
+++ b/tests/jq_old_tests.py
@@ -2,85 +2,74 @@
 
 from __future__ import unicode_literals
 
-from nose.tools import istest, assert_equal, assert_raises
-
 from jq import jq
+from .tools import assert_equal
 
 
-@istest
-def output_of_dot_operator_is_input():
+def test_output_of_dot_operator_is_input():
     assert_equal(
         "42",
         jq(".").transform("42")
     )
 
 
-@istest
-def can_add_one_to_each_element_of_an_array():
+def test_can_add_one_to_each_element_of_an_array():
     assert_equal(
         [2, 3, 4],
         jq("[.[]+1]").transform([1, 2, 3])
     )
 
 
-@istest
-def can_use_regexes():
+def test_can_use_regexes():
     assert_equal(
         True,
         jq('test(".*")').transform("42")
     )
 
 
-@istest
-def input_string_is_parsed_to_json_if_raw_input_is_true():
+def test_input_string_is_parsed_to_json_if_raw_input_is_true():
     assert_equal(
         42,
         jq(".").transform(text="42")
     )
 
 
-@istest
-def output_is_serialised_to_json_string_if_text_output_is_true():
+def test_output_is_serialised_to_json_string_if_text_output_is_true():
     assert_equal(
         '"42"',
         jq(".").transform("42", text_output=True)
     )
 
 
-@istest
-def elements_in_text_output_are_separated_by_newlines():
+def test_elements_in_text_output_are_separated_by_newlines():
     assert_equal(
         "1\n2\n3",
         jq(".[]").transform([1, 2, 3], text_output=True)
     )
 
 
-@istest
-def first_output_element_is_returned_if_multiple_output_is_false_but_there_are_multiple_output_elements():
+def test_first_output_element_is_returned_if_multiple_output_is_false_but_there_are_multiple_output_elements():
     assert_equal(
         2,
         jq(".[]+1").transform([1, 2, 3])
     )
 
 
-@istest
-def multiple_output_elements_are_returned_if_multiple_output_is_true():
+def test_multiple_output_elements_are_returned_if_multiple_output_is_true():
     assert_equal(
         [2, 3, 4],
         jq(".[]+1").transform([1, 2, 3], multiple_output=True)
     )
 
 
-@istest
-def multiple_inputs_in_raw_input_are_separated_by_newlines():
+def test_multiple_inputs_in_raw_input_are_separated_by_newlines():
     assert_equal(
         [2, 3, 4],
         jq(".+1").transform(text="1\n2\n3", multiple_output=True)
     )
 
 
-@istest
-def value_error_is_raised_if_program_is_invalid():
+def test_value_error_is_raised_if_program_is_invalid():
     try:
         jq("!")
         assert False, "Expected error"
@@ -89,8 +78,7 @@ def value_error_is_raised_if_program_is_invalid():
         assert_equal(str(error), expected_error_str)
 
 
-@istest
-def value_error_is_raised_if_input_cannot_be_processed_by_program():
+def test_value_error_is_raised_if_input_cannot_be_processed_by_program():
     program = jq(".x")
     try:
         program.transform(1)
@@ -100,8 +88,7 @@ def value_error_is_raised_if_input_cannot_be_processed_by_program():
         assert_equal(str(error), expected_error_str)
 
 
-@istest
-def errors_do_not_leak_between_transformations():
+def test_errors_do_not_leak_between_transformations():
     program = jq(".x")
     try:
         program.transform(1)
@@ -112,8 +99,7 @@ def errors_do_not_leak_between_transformations():
     assert_equal(1, program.transform({"x": 1}))
 
 
-@istest
-def value_error_is_raised_if_input_is_not_valid_json():
+def test_value_error_is_raised_if_input_is_not_valid_json():
     program = jq(".x")
     try:
         program.transform(text="!!")
@@ -123,16 +109,14 @@ def value_error_is_raised_if_input_is_not_valid_json():
         assert_equal(str(error), expected_error_str)
 
 
-@istest
-def unicode_strings_can_be_used_as_input():
+def test_unicode_strings_can_be_used_as_input():
     assert_equal(
         "‽",
         jq(".").transform(text='"‽"')
     )
 
 
-@istest
-def unicode_strings_can_be_used_as_programs():
+def test_unicode_strings_can_be_used_as_programs():
     assert_equal(
         "Dragon‽",
         jq('.+"‽"').transform(text='"Dragon"')