Move all test data to test/testdata

Author: Totktonada

.luacheckrc

@@ -3,7 +3,7 @@ std = {
         'tonumber', 'type', 'assert', 'ipairs', 'math', 'error', 'string',
         'table', 'pairs', 'os', 'select', 'unpack', 'dofile', 'next',
         'getmetatable', 'setmetatable', 'rawget', 'print', 'shard_status',
-        'loadstring',
+        'loadstring', 'arg',
     },
     globals = {'package'}
 }

Makefile

@@ -12,8 +12,8 @@ lint:
 		test/bench/*.lua \
 		test/local/*.lua \
 		test/testdata/*.lua \
-		test/common/*.test.lua test/common/lua/*.lua \
-		test/extra/*.test.lua \
+		test/common/*.lua \
+		test/extra/*.lua \
 		test/*.lua \
 		--no-redefined --no-unused-args
 

test/bench/bench.lua

@@ -12,7 +12,7 @@ local yaml = require('yaml')
 local clock = require('clock')
 local fiber = require('fiber')
 local digest = require('digest')
-local multirunner = require('test.common.lua.multirunner')
+local multirunner = require('test.common.multirunner')
 local graphql = require('graphql')
 local utils = require('graphql.utils')
 local test_utils = require('test.utils')

test/common/avro_refs.test.lua

@@ -7,7 +7,7 @@ package.path = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
     :gsub('/./', '/'):gsub('/+$', '')) .. '/../../?.lua' .. ';' .. package.path
 
 local utils = require('test.utils')
-local testdata = require('test.common.lua.test_data_avro_refs')
+local testdata = require('test.testdata.avro_refs_testdata')
 
 box.cfg({})
 

test/common/limit_result.test.lua

@@ -8,7 +8,7 @@ package.path = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
 
 local tap = require('tap')
 local utils = require('test.utils')
-local testdata = require('test.common.lua.test_data_user_order')
+local testdata = require('test.testdata.user_order_item_testdata')
 
 local function run_queries(gql_wrapper)
     local test = tap.test('result cnt')

test/common/lua/multirunner.lua renamed to test/common/multirunner.lua

@@ -7,7 +7,7 @@ package.path = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
     :gsub('/./', '/'):gsub('/+$', '')) .. '/../../?.lua' .. ';' .. package.path
 
 local utils = require('test.utils')
-local testdata = require('test.common.lua.test_data_nested_record')
+local testdata = require('test.testdata.nested_record_testdata')
 
 box.cfg({})
 

test/common/nested_record.test.lua

@@ -8,7 +8,7 @@ package.path = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
 
 local tap = require('tap')
 local utils = require('test.utils')
-local testdata = require('test.common.lua.test_data_user_order')
+local testdata = require('test.testdata.user_order_item_testdata')
 
 local function run_queries(gql_wrapper)
     local test = tap.test('result cnt')

test/common/query_timeout.test.lua

@@ -1,9 +1,4 @@
 [default]
 core = app
 description = tests on features which are not related to specific executor
-lua_libs =
-    ../common/lua/test_data_user_order.lua \
-    ../common/lua/test_data_nested_record.lua \
-    ../testdata/array_and_map_testdata.lua \
-	../testdata/nullable_index_testdata.lua
 is_parallel = True

test/extra/suite.ini

@@ -2,13 +2,15 @@
 local fio = require('fio')
 local yaml = require('yaml')
 local avro = require('avro_schema')
-local testdata = require('array_and_map_testdata')
 local test = require('tap').test('to avro schema')
+
 -- require in-repo version of graphql/ sources despite current working directory
 package.path = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
     :gsub('/./', '/'):gsub('/+$', '')) .. '/../../?.lua' .. ';' ..
     package.path
 
+local testdata = require('test.testdata.array_and_map_testdata')
+
 local graphql = require('graphql')
 
 box.cfg{wal_mode="none"}

test/extra/to_avro_arrays.test.lua

@@ -2,13 +2,15 @@
 local fio = require('fio')
 local yaml = require('yaml')
 local avro = require('avro_schema')
-local data = require('test_data_user_order')
 local test = require('tap').test('to avro schema')
+
 -- require in-repo version of graphql/ sources despite current working directory
 package.path = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
     :gsub('/./', '/'):gsub('/+$', '')) .. '/../../?.lua' .. ';' ..
     package.path
 
+local data = require('test.testdata.user_order_item_testdata')
+
 local graphql = require('graphql')
 
 box.cfg{wal_mode="none"}

test/extra/to_avro_huge.test.lua

@@ -2,13 +2,15 @@
 local fio = require('fio')
 local yaml = require('yaml')
 local avro = require('avro_schema')
-local data = require('test_data_nested_record')
 local test = require('tap').test('to avro schema')
+
 -- require in-repo version of graphql/ sources despite current working directory
 package.path = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
     :gsub('/./', '/'):gsub('/+$', '')) .. '/../../?.lua' .. ';' ..
     package.path
 
+local data = require('test.testdata.nested_record_testdata')
+
 local graphql = require('graphql')
 
 box.cfg{wal_mode="none"}

test/extra/to_avro_nested.test.lua

@@ -2,13 +2,14 @@
 local fio = require('fio')
 local yaml = require('yaml')
 local avro = require('avro_schema')
-local testdata = require('nullable_index_testdata')
 local test = require('tap').test('to avro schema')
 -- require in-repo version of graphql/ sources despite current working directory
 package.path = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
     :gsub('/./', '/'):gsub('/+$', '')) .. '/../../?.lua' .. ';' ..
     package.path
 
+local testdata = require('test.testdata.nullable_index_testdata')
+
 local graphql = require('graphql')
 
 box.cfg{wal_mode="none"}

test/extra/to_avro_nullable.test.lua

@@ -8,7 +8,7 @@ package.path = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
 
 local yaml = require('yaml')
 local graphql = require('graphql')
-local multirunner = require('test.common.lua.multirunner')
+local multirunner = require('test.common.multirunner')
 local graphql_utils = require('graphql.utils')
 local test_run = graphql_utils.optional_require('test_run')
 test_run = test_run and test_run.new()