Update sublist tests (#583)

* Update sublist tests

* Update template to make sure it matches the new signature

Author: ryanplusplus

exercises/practice/sublist/.meta/example.lua

@@ -1,18 +1,33 @@
-return function(sublist, list)
-  if #sublist == 0 then
+local function is_sublist(l1, l2)
+  if #l1 == 0 then
     return true
   end
 
-  for i = 1, #list - #sublist + 1 do
-    for j = 1, #sublist do
-      if list[i + j - 1] ~= sublist[j] then
+  for i = 1, #l2 - #l1 + 1 do
+    for j = 1, #l1 do
+      if l2[i + j - 1] ~= l1[j] then
         break
       end
-      if j == #sublist then
+      if j == #l1 then
         return true
       end
     end
   end
 
   return false
 end
+
+return function(l1, l2)
+  local l1_sublist = is_sublist(l1, l2)
+  local l2_sublist = is_sublist(l2, l1)
+
+  if l1_sublist and l2_sublist then
+    return 'equal'
+  elseif l1_sublist then
+    return 'sublist'
+  elseif l2_sublist then
+    return 'superlist'
+  else
+    return 'unequal'
+  end
+end

exercises/practice/sublist/.meta/spec_generator.lua

@@ -0,0 +1,10 @@
+return {
+  module_name = 'sublist',
+
+  generate_test = function(case)
+    local template = [[
+      assert.equal('%s', %s({ %s }, { %s }))]]
+    return template:format(case.expected, case.property, table.concat(case.input.listOne, ', '),
+                           table.concat(case.input.listTwo, ', '))
+  end
+}

exercises/practice/sublist/.meta/tests.toml

@@ -1,6 +1,13 @@
-# This is an auto-generated file. Regular comments will be removed when this
-# file is regenerated. Regenerating will not touch any manually added keys,
-# so comments can be added in a "comment" key.
+# This is an auto-generated file.
+#
+# Regenerating this file via `configlet sync` will:
+# - Recreate every `description` key/value pair
+# - Recreate every `reimplements` key/value pair, where they exist in problem-specifications
+# - Remove any `include = true` key/value pair (an omitted `include` key implies inclusion)
+# - Preserve any other key/value pair
+#
+# As user-added comments (using the # character) will be removed when this file
+# is regenerated, comments can be added via a `comment` key.
 
 [97319c93-ebc5-47ab-a022-02a1980e1d29]
 description = "empty lists"
@@ -47,6 +54,9 @@ description = "first list missing element from second list"
 [83ffe6d8-a445-4a3c-8795-1e51a95e65c3]
 description = "second list missing element from first list"
 
+[7bc76cb8-5003-49ca-bc47-cdfbe6c2bb89]
+description = "first list missing additional digits from second list"
+
 [0d7ee7c1-0347-45c8-9ef5-b88db152b30b]
 description = "order matters to a list"
 

exercises/practice/sublist/sublist.lua

@@ -1,2 +1,2 @@
-return function(sublist, list)
+return function(l1, l2)
 end

exercises/practice/sublist/sublist_spec.lua

@@ -1,44 +1,75 @@
-local is_sublist = require('sublist')
+local sublist = require('sublist')
 
 describe('sublist', function()
-  it('should consider an empty list to be a sublist of an empty list', function()
-    assert.equal(true, is_sublist({}, {}))
+  it('empty lists', function()
+    assert.equal('equal', sublist({}, {}))
   end)
 
-  it('should consider an empty list to be a sublist of a non-empty list', function()
-    assert.equal(true, is_sublist({}, { 1, 2, 3 }))
+  it('empty list within non empty list', function()
+    assert.equal('sublist', sublist({}, { 1, 2, 3 }))
   end)
 
-  it('should consider a list to be a sublist of itself', function()
-    assert.equal(true, is_sublist({ 1, 2, 3 }, { 1, 2, 3 }))
+  it('non empty list contains empty list', function()
+    assert.equal('superlist', sublist({ 1, 2, 3 }, {}))
   end)
 
-  it('should not consider a subset to be a sublist', function()
-    assert.equal(false, is_sublist({ 1, 2, 3 }, { 2, 1, 3 }))
+  it('list equals itself', function()
+    assert.equal('equal', sublist({ 1, 2, 3 }, { 1, 2, 3 }))
   end)
 
-  it('should find a sublist at the beginning of a list', function()
-    assert.equal(true, is_sublist({ 11, 22, 33 }, { 11, 22, 33, 44, 55 }))
+  it('different lists', function()
+    assert.equal('unequal', sublist({ 1, 2, 3 }, { 2, 3, 4 }))
   end)
 
-  it('should find a sublist in the middle of a list', function()
-    assert.equal(true, is_sublist({ 12, 13, 14 }, { 11, 12, 13, 14, 15 }))
+  it('false start', function()
+    assert.equal('sublist', sublist({ 1, 2, 5 }, { 0, 1, 2, 3, 1, 2, 5, 6 }))
   end)
 
-  it('should find a sublist at the end of a list', function()
-    assert.equal(true, is_sublist({ 30, 40, 50 }, { 10, 20, 30, 40, 50 }))
+  it('consecutive', function()
+    assert.equal('sublist', sublist({ 1, 1, 2 }, { 0, 1, 1, 1, 2, 1, 2 }))
   end)
 
-  it('should be able to determine when a list is not a sublist', function()
-    assert.equal(false, is_sublist({ 1, 2, 3 }, { 5, 6, 7, 8, 9 }))
+  it('sublist at start', function()
+    assert.equal('sublist', sublist({ 0, 1, 2 }, { 0, 1, 2, 3, 4, 5 }))
   end)
 
-  it('should not consider almost sublists to be sublists', function()
-    assert.equal(false, is_sublist({ 3, 4, 5 }, { 1, 2, 4, 5, 6 }))
-    assert.equal(false, is_sublist({ 3, 4, 5 }, { 1, 2, 3, 4, 6 }))
+  it('sublist in middle', function()
+    assert.equal('sublist', sublist({ 2, 3, 4 }, { 0, 1, 2, 3, 4, 5 }))
   end)
 
-  it('should find a sublist when there are multiple instances of the sublist', function()
-    assert.equal(true, is_sublist({ 1, 2, 3 }, { 0, 1, 2, 3, 4, 1, 2, 3, 6 }))
+  it('sublist at end', function()
+    assert.equal('sublist', sublist({ 3, 4, 5 }, { 0, 1, 2, 3, 4, 5 }))
+  end)
+
+  it('at start of superlist', function()
+    assert.equal('superlist', sublist({ 0, 1, 2, 3, 4, 5 }, { 0, 1, 2 }))
+  end)
+
+  it('in middle of superlist', function()
+    assert.equal('superlist', sublist({ 0, 1, 2, 3, 4, 5 }, { 2, 3 }))
+  end)
+
+  it('at end of superlist', function()
+    assert.equal('superlist', sublist({ 0, 1, 2, 3, 4, 5 }, { 3, 4, 5 }))
+  end)
+
+  it('first list missing element from second list', function()
+    assert.equal('unequal', sublist({ 1, 3 }, { 1, 2, 3 }))
+  end)
+
+  it('second list missing element from first list', function()
+    assert.equal('unequal', sublist({ 1, 2, 3 }, { 1, 3 }))
+  end)
+
+  it('first list missing additional digits from second list', function()
+    assert.equal('unequal', sublist({ 1, 2 }, { 1, 22 }))
+  end)
+
+  it('order matters to a list', function()
+    assert.equal('unequal', sublist({ 1, 2, 3 }, { 3, 2, 1 }))
+  end)
+
+  it('same digits but different numbers', function()
+    assert.equal('unequal', sublist({ 1, 0, 1 }, { 10, 1 }))
   end)
 end)