remove test helper functions from spec-generators, batch 3

Author: glennj

bin/generate-spec

@@ -51,7 +51,7 @@ included_tests_from_toml = (path) ->
 export indent, quote, is_json_null, is_empty, contains
 
 indent = (text, level) ->
-  assert level, 'Provide the level to `indent`'
+  error 'Provide a level for `indent`', 2 if not level
   string.rep('  ', level) .. text
 
 quote = (str) ->

exercises/practice/palindrome-products/.meta/spec_generator.moon

@@ -1,7 +1,4 @@
-int_list = (list) -> "{#{table.concat list, ', '}}"
-
-int_lists = (lists) ->
-  "{#{table.concat [int_list list for list in *lists], ', '}}"
+import int_list, int_lists from require 'test_helpers'
 
 value = (val) -> 
   if is_json_null val
@@ -23,7 +20,7 @@ value = (val) ->
       lines = {
         "palindrome, factors = PalindromeProducts.#{case.property} #{case.input.min}, #{case.input.max}",
         "expected_palindrome = #{value case.expected.value}",
-        "expected_factors    = #{int_lists case.expected.factors}",
+        "expected_factors    = #{int_lists case.expected.factors, level}",
         "assert.are.equal expected_palindrome, palindrome",
         "assert.are.same  expected_factors, factors",
       }

exercises/practice/palindrome-products/palindrome_products_spec.moon

@@ -11,7 +11,10 @@ describe 'palindrome-products', ->
   pending 'find the largest palindrome from single digit factors', ->
     palindrome, factors = PalindromeProducts.largest 1, 9
     expected_palindrome = 9
-    expected_factors    = {{1, 9}, {3, 3}}
+    expected_factors    = {
+      {1, 9},
+      {3, 3},
+    }
     assert.are.equal expected_palindrome, palindrome
     assert.are.same  expected_factors, factors
 

exercises/practice/rational-numbers/.meta/spec_generator.moon

@@ -1,4 +1,4 @@
-int_list = (list) -> "{#{table.concat list, ', '}}"
+import int_list from require 'test_helpers'
 
 {
   module_name: 'rational',

exercises/practice/resistor-color-duo/.meta/spec_generator.moon

@@ -4,7 +4,7 @@
     input = ["'#{color}'" for color in *case.input.colors]
     lines = {
       "result = ResistorColorDuo.value #{table.concat input, ', '}",
-      "assert.are.same #{case.expected}, result"
+      "assert.are.equal #{case.expected}, result"
     }
     table.concat [indent line, level for line in *lines], '\n'
 }

exercises/practice/resistor-color-duo/resistor_color_duo_spec.moon

@@ -3,28 +3,28 @@ ResistorColorDuo = require 'resistor_color_duo'
 describe 'resistor-color-duo', ->
   it 'Brown and black', ->
     result = ResistorColorDuo.value 'brown', 'black'
-    assert.are.same 10, result
+    assert.are.equal 10, result
 
   pending 'Blue and grey', ->
     result = ResistorColorDuo.value 'blue', 'grey'
-    assert.are.same 68, result
+    assert.are.equal 68, result
 
   pending 'Yellow and violet', ->
     result = ResistorColorDuo.value 'yellow', 'violet'
-    assert.are.same 47, result
+    assert.are.equal 47, result
 
   pending 'White and red', ->
     result = ResistorColorDuo.value 'white', 'red'
-    assert.are.same 92, result
+    assert.are.equal 92, result
 
   pending 'Orange and orange', ->
     result = ResistorColorDuo.value 'orange', 'orange'
-    assert.are.same 33, result
+    assert.are.equal 33, result
 
   pending 'Ignore additional colors', ->
     result = ResistorColorDuo.value 'green', 'brown', 'orange'
-    assert.are.same 51, result
+    assert.are.equal 51, result
 
   pending 'Black and brown, one-digit', ->
     result = ResistorColorDuo.value 'black', 'brown'
-    assert.are.same 1, result
+    assert.are.equal 1, result

exercises/practice/rest-api/.meta/spec_generator.moon

@@ -1,5 +1,4 @@
-test_helpers = require 'test_helpers'
-import table_dump from test_helpers
+import table_dump from require 'test_helpers'
 
 {
   module_name: 'RestApi',

exercises/practice/reverse-string/.meta/spec_generator.moon

@@ -2,8 +2,8 @@
   module_name: 'reverse',
   generate_test: (case, level) ->
     lines = {
-      "result = reverse \"#{case.input.value}\"",
-      "assert.are.same \"#{case.expected}\", result",
+      "result = reverse #{quote case.input.value}",
+      "assert.are.equal #{quote case.expected}, result",
     }
     table.concat [indent line, level for line in *lines], "\n"
 }

exercises/practice/reverse-string/reverse_string_spec.moon

@@ -2,29 +2,29 @@ reverse = require 'reverse_string'
 
 describe 'reverse-string', ->
   it 'an empty string', ->
-    result = reverse ""
-    assert.are.same "", result
+    result = reverse ''
+    assert.are.equal '', result
 
   pending 'a word', ->
-    result = reverse "robot"
-    assert.are.same "tobor", result
+    result = reverse 'robot'
+    assert.are.equal 'tobor', result
 
   pending 'a capitalized word', ->
-    result = reverse "Ramen"
-    assert.are.same "nemaR", result
+    result = reverse 'Ramen'
+    assert.are.equal 'nemaR', result
 
   pending 'a sentence with punctuation', ->
     result = reverse "I'm hungry!"
-    assert.are.same "!yrgnuh m'I", result
+    assert.are.equal "!yrgnuh m'I", result
 
   pending 'a palindrome', ->
-    result = reverse "racecar"
-    assert.are.same "racecar", result
+    result = reverse 'racecar'
+    assert.are.equal 'racecar', result
 
   pending 'an even-sized word', ->
-    result = reverse "drawer"
-    assert.are.same "reward", result
+    result = reverse 'drawer'
+    assert.are.equal 'reward', result
 
   pending 'wide characters', ->
-    result = reverse "子猫"
-    assert.are.same "猫子", result
+    result = reverse '子猫'
+    assert.are.equal '猫子', result

exercises/practice/saddle-points/.meta/spec_generator.moon

@@ -1,13 +1,4 @@
-int_list = (list) -> "{#{table.concat list, ', '}}"
-
-int_lists = (lists, level) ->
-  if #lists == 1
-    "{#{int_list lists[1]}}"
-  else
-    rows = [indent int_list(row) .. ',', level + 1 for row in *lists]
-    table.insert rows, 1, '{'
-    table.insert rows, indent '}', level
-    table.concat rows, '\n'
+import int_lists, table_tostring_ordered from require 'test_helpers'
 
 result_obj = (obj) -> "{row: #{obj.row}, column: #{obj.column}}"
 result_list = (list) -> "{#{table.concat [result_obj obj for obj in *list], ', '}}"