Support avro-schema-3* (updated tests)

Changed only tests where a data layout is different between
avro-schema-2* and avro-schema-3*.

The avro_refs test triggers a flatten bug in avro-schema-2.3.2, so the
data flattened manually in the case. The bug is not reported, because it
is recomended to move to avro-schema-3* to use record*.

Fixes #150.

Author: Totktonada

.travis.yml

@@ -7,6 +7,8 @@ dist: trusty
 env:
     - SHARD_VERSION=1.2 AVRO_SCHEMA=2.3.2
     - SHARD_VERSION=2.1 AVRO_SCHEMA=2.3.2
+    - SHARD_VERSION=1.2 AVRO_SCHEMA=3.0.0
+    - SHARD_VERSION=2.1 AVRO_SCHEMA=3.0.0
 
 branches:
   only:

README.md

@@ -215,7 +215,7 @@ make test
 * For use:
   * tarantool,
   * lulpeg,
-  * >=tarantool/avro-schema-2.0-71-gfea0ead (but < 3.0.0),
+  * >=tarantool/avro-schema-2.0-71-gfea0ead,
   * >=tarantool/shard-1.1-91-gfa88bf8 (but < 2.0) or
     >=tarantool/shard-2.1-0-g0a7d98f (optional),
   * lrexlib-pcre2 or lrexlib-pcre (optional),
@@ -224,7 +224,7 @@ make test
   * python 2.7,
   * virtualenv,
   * luacheck,
-  * >=tarantool/avro-schema-2.2.2-4-g1145e3e (but < 3.0.0),
+  * >=tarantool/avro-schema-2.2.2-4-g1145e3e,
   * >=tarantool/shard-1.1-92-gec1a27e (but < 2.0) or
     >=tarantool/shard-2.1-0-g0a7d98f,
   * tarantool/http.

test/common/multirunner.lua

@@ -110,13 +110,17 @@ local function run_conf(conf_name, opts)
 
     local test_run = opts.test_run
     local init_function = opts.init_function
+    local init_function_params = opts.init_function_params or {}
     local cleanup_function = opts.cleanup_function
+    local cleanup_function_params = opts.cleanup_function_params or {}
     local workload = opts.workload
     local servers = opts.servers or servers -- prefer opts.servers
     local use_tcp = opts.use_tcp or false
 
     assert(init_function ~= nil)
+    assert(type(init_function_params) == 'table')
     assert(cleanup_function ~= nil)
+    assert(type(cleanup_function_params) == 'table')
     assert(workload ~= nil)
     assert(use_tcp ~= nil)
     if conf_type == 'shard' then
@@ -127,9 +131,9 @@ local function run_conf(conf_name, opts)
     local result
 
     if conf_type == 'space' then
-        init_function()
+        init_function(unpack(init_function_params))
         result = workload(conf_name, nil)
-        cleanup_function()
+        cleanup_function(unpack(cleanup_function_params))
     elseif conf_type == 'shard' then
         -- convert functions to string, so, that it can be executed on shards
         local init_script = string.dump(init_function)
@@ -139,14 +143,14 @@ local function run_conf(conf_name, opts)
 
         for_each_server(shard, function(uri)
             local c = net_box.connect(uri)
-            c:eval(init_script)
+            c:eval(init_script, init_function_params)
         end)
 
         result = workload(conf_name, shard)
 
         for_each_server(shard, function(uri)
             local c = net_box.connect(uri)
-            c:eval(cleanup_script)
+            c:eval(cleanup_script, cleanup_function_params)
         end)
 
         shard_cleanup(test_run, servers)

test/common/mutation.test.lua

@@ -41,9 +41,10 @@ local function check_insert(test, gql_wrapper, virtbox, mutation_insert,
         exp_result_insert, opts)
     local opts = opts or {}
     local dont_pass_variables = opts.dont_pass_variables or false
+    local meta = opts.meta
+
     utils.show_trace(function()
         test:plan(7)
-        local NULL_T = 0 -- value in tuple to tag NULL value
         local user_id = 'user_id_new_1'
         local order_id = 'order_id_new_1'
         local variables_insert = {
@@ -70,26 +71,14 @@ local function check_insert(test, gql_wrapper, virtbox, mutation_insert,
         -- check inserted user
         local tuple = get_tuple(virtbox, 'user_collection', {user_id})
         test:ok(tuple ~= nil, 'tuple was inserted')
-        local exp_tuple = {
-            0,
-            variables_insert.user.user_id,
-            variables_insert.user.first_name,
-            NULL_T,
-            variables_insert.user.middle_name,
-            variables_insert.user.last_name,
-        }
+        local exp_tuple = test_utils.flatten_object(virtbox, meta,
+            'user_collection', variables_insert.user, {0})
         test:is_deeply(tuple:totable(), exp_tuple, 'inserted tuple is correct')
         -- check inserted order
         local tuple = get_tuple(virtbox, 'order_collection', {order_id})
         test:ok(tuple ~= nil, 'tuple was inserted')
-        local exp_tuple = {
-            variables_insert.order.order_id,
-            variables_insert.order.user_id,
-            variables_insert.order.description,
-            variables_insert.order.price,
-            variables_insert.order.discount,
-            variables_insert.order.in_stock or true,
-        }
+        local exp_tuple = test_utils.flatten_object(virtbox, meta,
+            'order_collection', variables_insert.order)
         test:is_deeply(tuple:totable(), exp_tuple, 'inserted tuple is correct')
         -- clean up inserted tuples & check
         delete_tuple(virtbox, 'user_collection', {user_id})
@@ -102,10 +91,12 @@ local function check_insert(test, gql_wrapper, virtbox, mutation_insert,
     end)
 end
 
-local function run_queries(gql_wrapper, virtbox)
+local function run_queries(gql_wrapper, virtbox, meta)
     local test = tap.test('mutation')
     test:plan(6)
 
+    -- {{{ insert
+
     local mutation_insert_1 = [[
         mutation insert_user_and_order($user: user_collection_insert,
                 $order: order_collection_insert) {
@@ -135,7 +126,7 @@ local function run_queries(gql_wrapper, virtbox)
     ]]):strip())
 
     check_insert(test:test('insert_1'), gql_wrapper, virtbox, mutation_insert_1,
-        exp_result_insert_1)
+        exp_result_insert_1, {meta = meta})
 
     -- the same with immediate argument
     local mutation_insert_1i = [[
@@ -165,7 +156,8 @@ local function run_queries(gql_wrapper, virtbox)
     ]]
 
     check_insert(test:test('insert_1i'), gql_wrapper, virtbox,
-        mutation_insert_1i, exp_result_insert_1, {dont_pass_variables = true})
+        mutation_insert_1i, exp_result_insert_1, {meta = meta,
+        dont_pass_variables = true})
 
     -- test "insert" argument is forbidden in a non-top level field
     local mutation_insert_2 = [[
@@ -244,6 +236,8 @@ local function run_queries(gql_wrapper, virtbox)
 
     -- XXX: test inserting an object into a collection with subrecords
 
+    -- }}}
+
     -- {{{ inner level inserts: disabled
     --[=[
 

test/extra/to_avro_nested.test.lua

@@ -17,7 +17,7 @@ box.cfg{wal_mode="none"}
 test:plan(4)
 
 data.init_spaces()
-data.fill_test_data(box.space)
+data.fill_test_data(box.space, data.meta)
 
 local accessor = graphql.accessor_space.new({
     schemas = data.meta.schemas,

test/extra/to_avro_nullable.test.lua

@@ -16,8 +16,8 @@ box.cfg{wal_mode="none"}
 test:plan(4)
 
 testdata.init_spaces()
-testdata.fill_test_data()
 local meta = testdata.get_test_metadata()
+testdata.fill_test_data(box.space, meta)
 
 local accessor = graphql.accessor_space.new({
     schemas = meta.schemas,

test/space/nested_args.test.lua

@@ -11,6 +11,7 @@ local tap = require('tap')
 local yaml = require('yaml')
 local graphql = require('graphql')
 local utils = require('graphql.utils')
+local test_utils = require('test.utils')
 local common_testdata = require('test.testdata.common_testdata')
 local emails_testdata = require('test.testdata.nullable_1_1_conn_testdata')
 
@@ -23,12 +24,16 @@ common_testdata.init_spaces()
 emails_testdata.init_spaces()
 
 -- upload test data
-common_testdata.fill_test_data()
-emails_testdata.fill_test_data()
+local common_meta = common_testdata.meta or common_testdata.get_test_metadata()
+local emails_meta = emails_testdata.meta or emails_testdata.get_test_metadata()
+common_testdata.fill_test_data(box.space, common_meta)
+emails_testdata.fill_test_data(box.space, emails_meta)
+
+local avro_version = test_utils.major_avro_schema_version()
 
 local LOCALPART_FN = 1
 local DOMAIN_FN = 2
-local BODY_FN = 7
+local BODY_FN = avro_version == 3 and 5 or 7
 
 for _, tuple in box.space.email:pairs() do
     local body = tuple[BODY_FN]

test/space/server.test.lua

@@ -18,7 +18,8 @@ box.cfg{background = false}
 testdata.init_spaces()
 
 -- upload test data
-testdata.fill_test_data()
+local meta = testdata.meta or testdata.get_test_metadata()
+testdata.fill_test_data(box.space, meta)
 
 -- acquire metadata
 local metadata = testdata.get_test_metadata()

test/space/unflatten_tuple.test.lua

@@ -21,16 +21,16 @@ local testdata = require('test.testdata.common_testdata')
 box.cfg{background = false}
 testdata.init_spaces()
 
--- upload test data
-testdata.fill_test_data()
-
 -- acquire metadata
 local metadata = testdata.get_test_metadata()
 local schemas = metadata.schemas
 local collections = metadata.collections
 local service_fields = metadata.service_fields
 local indexes = metadata.indexes
 
+-- upload test data
+testdata.fill_test_data(box.space, metadata)
+
 -- build accessor and graphql schemas
 -- ----------------------------------
 

test/testdata/avro_refs_testdata.lua

@@ -8,6 +8,7 @@ local tap = require('tap')
 local json = require('json')
 local yaml = require('yaml')
 local utils = require('graphql.utils')
+local test_utils = require('test.utils')
 
 local testdata = {}
 
@@ -94,25 +95,51 @@ function testdata.drop_spaces()
     box.space.foo:drop()
 end
 
-function testdata.fill_test_data(virtbox)
-    local NULL_T = 0
-    local VALUE_T = 1
-
+function testdata.fill_test_data(virtbox, meta)
     local x = 1000
     local y = 2000
     local a = 3000
     local b = 4000
 
-    -- non-null bar, baz and its refs
-    virtbox.foo:replace({1,                       -- id
-        x, y, x, y, VALUE_T, {x, y},              -- bar & refs
-        VALUE_T, {a, b}, a, b, VALUE_T, {a, b},   -- baz & refs
-    })
-    -- null in nullable bar, baz refs
-    virtbox.foo:replace({2,                       -- id
-        x, y, x, y, NULL_T, box.NULL,             -- bar & refs
-        NULL_T, box.NULL, a, b, NULL_T, box.NULL, -- baz & refs
-    })
+    local avro_version = test_utils.major_avro_schema_version()
+
+    if avro_version == 3 then
+        -- non-null bar, baz and its refs
+        test_utils.replace_object(virtbox, meta, 'foo', {
+            id = 1,
+            bar = {x = x, y = y},
+            bar_ref = {x = x, y = y},
+            bar_nref = {x = x, y = y},
+            baz = {x = a, y = b},
+            baz_ref = {x = a, y = b},
+            baz_nref = {x = a, y = b},
+        })
+        -- null in nullable bar, baz refs
+        test_utils.replace_object(virtbox, meta, 'foo', {
+            id = 2,
+            bar = {x = x, y = y},
+            bar_ref = {x = x, y = y},
+            bar_nref = box.NULL,
+            baz = box.NULL,
+            baz_ref = {x = a, y = b},
+            baz_nref = box.NULL,
+        })
+    else
+        -- flatten does not work properly in the case of avro-schema-2.3.2
+        local NULL_T = 0
+        local VALUE_T = 1
+
+        -- non-null bar, baz and its refs
+        virtbox.foo:replace({1,                       -- id
+            x, y, x, y, VALUE_T, {x, y},              -- bar & refs
+            VALUE_T, {a, b}, a, b, VALUE_T, {a, b},   -- baz & refs
+        })
+        -- null in nullable bar, baz refs
+        virtbox.foo:replace({2,                       -- id
+            x, y, x, y, NULL_T, box.NULL,             -- bar & refs
+            NULL_T, box.NULL, a, b, NULL_T, box.NULL, -- baz & refs
+        })
+    end
 end
 
 function testdata.run_queries(gql_wrapper)