Refactor tests

Add helpers.insert_objects and helpers.get_by_idxs functions

Author: dokshina

test/entrypoint/srv_select.lua

@@ -24,7 +24,7 @@ package.preload['customers-storage'] = function()
                 if_not_exists = true,
                 engine = engine,
             })
-            --primary index
+            -- primary index
             customers_space:create_index('id_index', {
                 parts = { {field = 'id'} },
                 if_not_exists = true,
@@ -39,7 +39,7 @@ package.preload['customers-storage'] = function()
                 unique = false,
                 if_not_exists = true,
             })
-            --indexes with same names as fields
+            -- indexes with same names as fields
             customers_space:create_index('age', {
                 parts = { {field = 'age'} },
                 unique = false,

test/helper.lua

@@ -1,10 +1,14 @@
 require('strict').on()
 
+local t = require('luatest')
+
 local log = require('log')
 local checks = require('checks')
 local digest = require('digest')
 local fio = require('fio')
 
+local crud = require('crud')
+
 if os.getenv('DEV') == nil then
     os.setenv('DEV', 'ON')
 end
@@ -76,4 +80,29 @@ function helpers.box_cfg()
     fio.rmtree(tempdir)
 end
 
+function helpers.insert_objects(g, space_name, objects)
+    local inserted_objects = {}
+
+    for _, obj in ipairs(objects) do
+        local result, err = g.cluster.main_server.net_box:call('crud.insert_object', {space_name, obj})
+
+        t.assert_equals(err, nil)
+
+        local objects, err = crud.unflatten_rows(result.rows, result.metadata)
+        t.assert_equals(err, nil)
+        t.assert_equals(#objects, 1)
+        table.insert(inserted_objects, objects[1])
+    end
+
+    return inserted_objects
+end
+
+function helpers.get_objects_by_idxs(objects, idxs)
+    local results = {}
+    for _, idx in ipairs(idxs) do
+        table.insert(results, objects[idx])
+    end
+    return results
+end
+
 return helpers

test/integration/pairs_test.lua

@@ -4,7 +4,6 @@ local t = require('luatest')
 local g_memtx = t.group('pairs_memtx')
 local g_vinyl = t.group('pairs_vinyl')
 
-local crud = require('crud')
 local crud_utils = require('crud.common.utils')
 
 local helpers = require('test.helper')
@@ -84,32 +83,8 @@ local function add(name, fn)
     g_vinyl[name] = fn
 end
 
-local function insert_customers(g, customers)
-    local inserted_objects = {}
-
-    for _, customer in ipairs(customers) do
-        local result, err = g.cluster.main_server.net_box:call('crud.insert_object', {'customers', customer})
-        t.assert_equals(err, nil)
-
-        local objects, err = crud.unflatten_rows(result.rows, result.metadata)
-        t.assert_equals(err, nil)
-        t.assert_equals(#objects, 1)
-        table.insert(inserted_objects, objects[1])
-    end
-
-    return inserted_objects
-end
-
-local function get_by_ids(customers, ids)
-    local results = {}
-    for _, id in ipairs(ids) do
-        table.insert(results, customers[id])
-    end
-    return results
-end
-
 add('test_pairs_no_conditions', function(g)
-    local customers = insert_customers(g, {
+    local customers = helpers.insert_objects(g, 'customers', {
         {
             id = 1, name = "Elizabeth", last_name = "Jackson",
             age = 12, city = "New York",
@@ -190,7 +165,7 @@ add('test_pairs_no_conditions', function(g)
     ]], {after})
 
     t.assert_equals(err, nil)
-    t.assert_equals(objects, get_by_ids(customers, {3, 4}))
+    t.assert_equals(objects, helpers.get_objects_by_idxs(customers, {3, 4}))
 
     -- after obj 4 (last)
     local after = crud_utils.flatten(customers[4], g.space_format)
@@ -212,7 +187,7 @@ add('test_pairs_no_conditions', function(g)
 end)
 
 add('test_ge_condition_with_index', function(g)
-    local customers = insert_customers(g, {
+    local customers = helpers.insert_objects(g, 'customers', {
         {
             id = 1, name = "Elizabeth", last_name = "Jackson",
             age = 12, city = "New York",
@@ -249,7 +224,7 @@ add('test_ge_condition_with_index', function(g)
     ]], {conditions})
 
     t.assert_equals(err, nil)
-    t.assert_equals(objects, get_by_ids(customers, {3, 2, 4})) -- in age order
+    t.assert_equals(objects, helpers.get_objects_by_idxs(customers, {3, 2, 4})) -- in age order
 
     -- after obj 3
     local after = crud_utils.flatten(customers[3], g.space_format)
@@ -267,11 +242,11 @@ add('test_ge_condition_with_index', function(g)
     ]], {conditions, after})
 
     t.assert_equals(err, nil)
-    t.assert_equals(objects, get_by_ids(customers, {2, 4})) -- in age order
+    t.assert_equals(objects, helpers.get_objects_by_idxs(customers, {2, 4})) -- in age order
 end)
 
 add('test_le_condition_with_index', function(g)
-    local customers = insert_customers(g, {
+    local customers = helpers.insert_objects(g, 'customers', {
         {
             id = 1, name = "Elizabeth", last_name = "Jackson",
             age = 12, city = "New York",
@@ -308,7 +283,7 @@ add('test_le_condition_with_index', function(g)
     ]], {conditions})
 
     t.assert_equals(err, nil)
-    t.assert_equals(objects, get_by_ids(customers, {3, 1})) -- in age order
+    t.assert_equals(objects, helpers.get_objects_by_idxs(customers, {3, 1})) -- in age order
 
     -- after obj 3
     local after = crud_utils.flatten(customers[3], g.space_format)
@@ -326,11 +301,11 @@ add('test_le_condition_with_index', function(g)
     ]], {conditions, after})
 
     t.assert_equals(err, nil)
-    t.assert_equals(objects, get_by_ids(customers, {1})) -- in age order
+    t.assert_equals(objects, helpers.get_objects_by_idxs(customers, {1})) -- in age order
 end)
 
 add('test_negative_first', function(g)
-    local customers = insert_customers(g,{
+    local customers = helpers.insert_objects(g, 'customers',{
         {
             id = 1, name = "Elizabeth", last_name = "Jackson",
             age = 12, city = "New York",