diff --git a/SConstruct b/SConstruct index af674b4..00d3741 100644 --- a/SConstruct +++ b/SConstruct @@ -262,8 +262,9 @@ def runJSONTests_action( target, source = None, env = None ): # Add test scripts to python path jsontest_path = Dir( '#test' ).abspath sys.path.insert( 0, jsontest_path ) + data_path = os.path.join( jsontest_path, 'data' ) import runjsontests - return runjsontests.runAllTests( os.path.abspath(source[0].path), jsontest_path ) + return runjsontests.runAllTests( os.path.abspath(source[0].path), data_path ) def runJSONTests_string( target, source = None, env = None ): return 'RunJSONTests("%s")' % source[0] diff --git a/test/cleantests.py b/test/cleantests.py index e5f99e6..c38fd8f 100644 --- a/test/cleantests.py +++ b/test/cleantests.py @@ -4,7 +4,7 @@ import os paths = [] for pattern in [ '*.actual', '*.actual-rewrite', '*.rewrite', '*.process-output' ]: - paths += glob.glob( pattern ) + paths += glob.glob( 'data/' + pattern ) for path in paths: os.unlink( path ) diff --git a/test/test_array_01.expected b/test/data/test_array_01.expected similarity index 100% rename from test/test_array_01.expected rename to test/data/test_array_01.expected diff --git a/test/test_array_01.json b/test/data/test_array_01.json similarity index 100% rename from test/test_array_01.json rename to test/data/test_array_01.json diff --git a/test/test_array_02.expected b/test/data/test_array_02.expected similarity index 100% rename from test/test_array_02.expected rename to test/data/test_array_02.expected diff --git a/test/test_array_02.json b/test/data/test_array_02.json similarity index 100% rename from test/test_array_02.json rename to test/data/test_array_02.json diff --git a/test/test_array_03.expected b/test/data/test_array_03.expected similarity index 100% rename from test/test_array_03.expected rename to test/data/test_array_03.expected diff --git a/test/test_array_03.json b/test/data/test_array_03.json similarity index 100% rename from test/test_array_03.json rename to test/data/test_array_03.json diff --git a/test/test_array_04.expected b/test/data/test_array_04.expected similarity index 100% rename from test/test_array_04.expected rename to test/data/test_array_04.expected diff --git a/test/test_array_04.json b/test/data/test_array_04.json similarity index 100% rename from test/test_array_04.json rename to test/data/test_array_04.json diff --git a/test/test_array_05.expected b/test/data/test_array_05.expected similarity index 100% rename from test/test_array_05.expected rename to test/data/test_array_05.expected diff --git a/test/test_array_05.json b/test/data/test_array_05.json similarity index 100% rename from test/test_array_05.json rename to test/data/test_array_05.json diff --git a/test/test_array_06.expected b/test/data/test_array_06.expected similarity index 100% rename from test/test_array_06.expected rename to test/data/test_array_06.expected diff --git a/test/test_array_06.json b/test/data/test_array_06.json similarity index 100% rename from test/test_array_06.json rename to test/data/test_array_06.json diff --git a/test/test_basic_01.expected b/test/data/test_basic_01.expected similarity index 100% rename from test/test_basic_01.expected rename to test/data/test_basic_01.expected diff --git a/test/test_basic_01.json b/test/data/test_basic_01.json similarity index 100% rename from test/test_basic_01.json rename to test/data/test_basic_01.json diff --git a/test/test_basic_02.expected b/test/data/test_basic_02.expected similarity index 100% rename from test/test_basic_02.expected rename to test/data/test_basic_02.expected diff --git a/test/test_basic_02.json b/test/data/test_basic_02.json similarity index 100% rename from test/test_basic_02.json rename to test/data/test_basic_02.json diff --git a/test/test_basic_03.expected b/test/data/test_basic_03.expected similarity index 100% rename from test/test_basic_03.expected rename to test/data/test_basic_03.expected diff --git a/test/test_basic_03.json b/test/data/test_basic_03.json similarity index 100% rename from test/test_basic_03.json rename to test/data/test_basic_03.json diff --git a/test/test_basic_04.expected b/test/data/test_basic_04.expected similarity index 100% rename from test/test_basic_04.expected rename to test/data/test_basic_04.expected diff --git a/test/test_basic_04.json b/test/data/test_basic_04.json similarity index 100% rename from test/test_basic_04.json rename to test/data/test_basic_04.json diff --git a/test/test_basic_05.expected b/test/data/test_basic_05.expected similarity index 100% rename from test/test_basic_05.expected rename to test/data/test_basic_05.expected diff --git a/test/test_basic_05.json b/test/data/test_basic_05.json similarity index 100% rename from test/test_basic_05.json rename to test/data/test_basic_05.json diff --git a/test/test_basic_06.expected b/test/data/test_basic_06.expected similarity index 100% rename from test/test_basic_06.expected rename to test/data/test_basic_06.expected diff --git a/test/test_basic_06.json b/test/data/test_basic_06.json similarity index 100% rename from test/test_basic_06.json rename to test/data/test_basic_06.json diff --git a/test/test_basic_07.expected b/test/data/test_basic_07.expected similarity index 100% rename from test/test_basic_07.expected rename to test/data/test_basic_07.expected diff --git a/test/test_basic_07.json b/test/data/test_basic_07.json similarity index 100% rename from test/test_basic_07.json rename to test/data/test_basic_07.json diff --git a/test/test_basic_08.expected b/test/data/test_basic_08.expected similarity index 100% rename from test/test_basic_08.expected rename to test/data/test_basic_08.expected diff --git a/test/test_basic_08.json b/test/data/test_basic_08.json similarity index 100% rename from test/test_basic_08.json rename to test/data/test_basic_08.json diff --git a/test/test_basic_09.expected b/test/data/test_basic_09.expected similarity index 100% rename from test/test_basic_09.expected rename to test/data/test_basic_09.expected diff --git a/test/test_basic_09.json b/test/data/test_basic_09.json similarity index 100% rename from test/test_basic_09.json rename to test/data/test_basic_09.json diff --git a/test/test_comment_01.expected b/test/data/test_comment_01.expected similarity index 100% rename from test/test_comment_01.expected rename to test/data/test_comment_01.expected diff --git a/test/test_comment_01.json b/test/data/test_comment_01.json similarity index 100% rename from test/test_comment_01.json rename to test/data/test_comment_01.json diff --git a/test/test_complex_01.expected b/test/data/test_complex_01.expected similarity index 100% rename from test/test_complex_01.expected rename to test/data/test_complex_01.expected diff --git a/test/test_complex_01.json b/test/data/test_complex_01.json similarity index 100% rename from test/test_complex_01.json rename to test/data/test_complex_01.json diff --git a/test/test_integer_01.expected b/test/data/test_integer_01.expected similarity index 100% rename from test/test_integer_01.expected rename to test/data/test_integer_01.expected diff --git a/test/test_integer_01.json b/test/data/test_integer_01.json similarity index 100% rename from test/test_integer_01.json rename to test/data/test_integer_01.json diff --git a/test/test_integer_02.expected b/test/data/test_integer_02.expected similarity index 100% rename from test/test_integer_02.expected rename to test/data/test_integer_02.expected diff --git a/test/test_integer_02.json b/test/data/test_integer_02.json similarity index 100% rename from test/test_integer_02.json rename to test/data/test_integer_02.json diff --git a/test/test_integer_03.expected b/test/data/test_integer_03.expected similarity index 100% rename from test/test_integer_03.expected rename to test/data/test_integer_03.expected diff --git a/test/test_integer_03.json b/test/data/test_integer_03.json similarity index 100% rename from test/test_integer_03.json rename to test/data/test_integer_03.json diff --git a/test/test_integer_04.expected b/test/data/test_integer_04.expected similarity index 100% rename from test/test_integer_04.expected rename to test/data/test_integer_04.expected diff --git a/test/test_integer_04.json b/test/data/test_integer_04.json similarity index 100% rename from test/test_integer_04.json rename to test/data/test_integer_04.json diff --git a/test/test_integer_05.expected b/test/data/test_integer_05.expected similarity index 100% rename from test/test_integer_05.expected rename to test/data/test_integer_05.expected diff --git a/test/test_integer_05.json b/test/data/test_integer_05.json similarity index 100% rename from test/test_integer_05.json rename to test/data/test_integer_05.json diff --git a/test/test_object_01.expected b/test/data/test_object_01.expected similarity index 100% rename from test/test_object_01.expected rename to test/data/test_object_01.expected diff --git a/test/test_object_01.json b/test/data/test_object_01.json similarity index 100% rename from test/test_object_01.json rename to test/data/test_object_01.json diff --git a/test/test_object_02.expected b/test/data/test_object_02.expected similarity index 100% rename from test/test_object_02.expected rename to test/data/test_object_02.expected diff --git a/test/test_object_02.json b/test/data/test_object_02.json similarity index 100% rename from test/test_object_02.json rename to test/data/test_object_02.json diff --git a/test/test_object_03.expected b/test/data/test_object_03.expected similarity index 100% rename from test/test_object_03.expected rename to test/data/test_object_03.expected diff --git a/test/test_object_03.json b/test/data/test_object_03.json similarity index 100% rename from test/test_object_03.json rename to test/data/test_object_03.json diff --git a/test/test_object_04.expected b/test/data/test_object_04.expected similarity index 100% rename from test/test_object_04.expected rename to test/data/test_object_04.expected diff --git a/test/test_object_04.json b/test/data/test_object_04.json similarity index 100% rename from test/test_object_04.json rename to test/data/test_object_04.json diff --git a/test/test_preserve_comment_01.expected b/test/data/test_preserve_comment_01.expected similarity index 100% rename from test/test_preserve_comment_01.expected rename to test/data/test_preserve_comment_01.expected diff --git a/test/test_preserve_comment_01.json b/test/data/test_preserve_comment_01.json similarity index 100% rename from test/test_preserve_comment_01.json rename to test/data/test_preserve_comment_01.json diff --git a/test/test_real_01.expected b/test/data/test_real_01.expected similarity index 100% rename from test/test_real_01.expected rename to test/data/test_real_01.expected diff --git a/test/test_real_01.json b/test/data/test_real_01.json similarity index 100% rename from test/test_real_01.json rename to test/data/test_real_01.json diff --git a/test/test_real_02.expected b/test/data/test_real_02.expected similarity index 100% rename from test/test_real_02.expected rename to test/data/test_real_02.expected diff --git a/test/test_real_02.json b/test/data/test_real_02.json similarity index 100% rename from test/test_real_02.json rename to test/data/test_real_02.json diff --git a/test/test_real_03.expected b/test/data/test_real_03.expected similarity index 100% rename from test/test_real_03.expected rename to test/data/test_real_03.expected diff --git a/test/test_real_03.json b/test/data/test_real_03.json similarity index 100% rename from test/test_real_03.json rename to test/data/test_real_03.json diff --git a/test/test_real_04.expected b/test/data/test_real_04.expected similarity index 100% rename from test/test_real_04.expected rename to test/data/test_real_04.expected diff --git a/test/test_real_04.json b/test/data/test_real_04.json similarity index 100% rename from test/test_real_04.json rename to test/data/test_real_04.json diff --git a/test/test_real_05.expected b/test/data/test_real_05.expected similarity index 100% rename from test/test_real_05.expected rename to test/data/test_real_05.expected diff --git a/test/test_real_05.json b/test/data/test_real_05.json similarity index 100% rename from test/test_real_05.json rename to test/data/test_real_05.json diff --git a/test/test_real_06.expected b/test/data/test_real_06.expected similarity index 100% rename from test/test_real_06.expected rename to test/data/test_real_06.expected diff --git a/test/test_real_06.json b/test/data/test_real_06.json similarity index 100% rename from test/test_real_06.json rename to test/data/test_real_06.json diff --git a/test/test_real_07.expected b/test/data/test_real_07.expected similarity index 100% rename from test/test_real_07.expected rename to test/data/test_real_07.expected diff --git a/test/test_real_07.json b/test/data/test_real_07.json similarity index 100% rename from test/test_real_07.json rename to test/data/test_real_07.json diff --git a/test/test_string_01.expected b/test/data/test_string_01.expected similarity index 100% rename from test/test_string_01.expected rename to test/data/test_string_01.expected diff --git a/test/test_string_01.json b/test/data/test_string_01.json similarity index 100% rename from test/test_string_01.json rename to test/data/test_string_01.json diff --git a/test/test_string_02.expected b/test/data/test_string_02.expected similarity index 100% rename from test/test_string_02.expected rename to test/data/test_string_02.expected diff --git a/test/test_string_02.json b/test/data/test_string_02.json similarity index 100% rename from test/test_string_02.json rename to test/data/test_string_02.json diff --git a/test/test_string_unicode_01.expected b/test/data/test_string_unicode_01.expected similarity index 100% rename from test/test_string_unicode_01.expected rename to test/data/test_string_unicode_01.expected diff --git a/test/test_string_unicode_01.json b/test/data/test_string_unicode_01.json similarity index 100% rename from test/test_string_unicode_01.json rename to test/data/test_string_unicode_01.json diff --git a/test/test_string_unicode_02.expected b/test/data/test_string_unicode_02.expected similarity index 100% rename from test/test_string_unicode_02.expected rename to test/data/test_string_unicode_02.expected diff --git a/test/test_string_unicode_02.json b/test/data/test_string_unicode_02.json similarity index 100% rename from test/test_string_unicode_02.json rename to test/data/test_string_unicode_02.json diff --git a/test/test_string_unicode_03.expected b/test/data/test_string_unicode_03.expected similarity index 100% rename from test/test_string_unicode_03.expected rename to test/data/test_string_unicode_03.expected diff --git a/test/test_string_unicode_03.json b/test/data/test_string_unicode_03.json similarity index 100% rename from test/test_string_unicode_03.json rename to test/data/test_string_unicode_03.json diff --git a/test/test_string_unicode_04.expected b/test/data/test_string_unicode_04.expected similarity index 100% rename from test/test_string_unicode_04.expected rename to test/data/test_string_unicode_04.expected diff --git a/test/test_string_unicode_04.json b/test/data/test_string_unicode_04.json similarity index 100% rename from test/test_string_unicode_04.json rename to test/data/test_string_unicode_04.json diff --git a/test/runjsontests.py b/test/runjsontests.py index 0dd87e6..e05bd52 100644 --- a/test/runjsontests.py +++ b/test/runjsontests.py @@ -41,7 +41,7 @@ def safeReadFile( path ): def runAllTests( jsontest_executable_path, input_dir = None, use_valgrind=False ): if not input_dir: - input_dir = os.getcwd() + input_dir = os.path.join( os.getcwd(), 'data' ) tests = glob( os.path.join( input_dir, '*.json' ) ) if RUN_JSONCHECKER: test_jsonchecker = glob( os.path.join( input_dir, 'jsonchecker', '*.json' ) )