Ensuring all templates call test_name, fixes

bmulvihill · bmulvihill · commit 3fd2c2799d35 · 2016-10-20T20:11:36.000-04:00
diff --git a/.ruby-version b/.ruby-version
diff --git a/exercises/acronym/example.tt b/exercises/acronym/example.tt
@@ -6,9 +6,9 @@ require_relative 'acronym'
 # Test data version:
 # <%= sha1 %>
 class AcronymTest < Minitest::Test<% test_cases.each do |test_case| %>
-  def <%= test_case.name %>
+  def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/alphametics/example.tt b/exercises/alphametics/example.tt
@@ -8,7 +8,7 @@ require_relative 'alphametics'
 class AlphameticsTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/anagram/example.tt b/exercises/anagram/example.tt
@@ -8,7 +8,7 @@ require_relative 'anagram'
 class AnagramTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/binary/example.tt b/exercises/binary/example.tt
@@ -7,9 +7,9 @@ require_relative 'binary'
 # Test data version:
 # <%= sha1 %>
 class BinaryTest < Minitest::Test<% test_cases.each do |test_case| %>
-  def <%= test_case.name %>
+  def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/bracket-push/example.tt b/exercises/bracket-push/example.tt
@@ -6,9 +6,9 @@ require_relative 'bracket_push'
 # Test data version:
 # <%= sha1 %>
 class BracketsTest < Minitest::Test<% test_cases.each do |test_case| %>
-  def <%= test_case.name %>
+  def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/clock/example.tt b/exercises/clock/example.tt
@@ -6,9 +6,9 @@ require_relative 'clock'
 # Test data version:
 # <%= sha1 %>
 class ClockTest < Minitest::Test<% test_cases.each do |test_case| %>
-  def <%= test_case.name %>
+  def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/connect/example.tt b/exercises/connect/example.tt
@@ -6,14 +6,14 @@ require_relative 'connect'
 # Test data version commit id: <%= sha1 %>
 class ConnectTest < Minitest::Test
 <% test_cases.each do |test_case| %>
-  <%= test_case.ignore_method_length%>def <%= test_case.name %>
+  <%= test_case.ignore_method_length%>def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load.strip %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version %>, BookKeeping::VERSION
+    assert_equal <%= version.next %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/custom-set/example.tt b/exercises/custom-set/example.tt
@@ -8,7 +8,7 @@ require_relative 'custom_set'
 class CustomSetTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/difference-of-squares/example.tt b/exercises/difference-of-squares/example.tt
@@ -6,9 +6,9 @@ require_relative 'difference_of_squares'
 # Test data version:
 # <%= sha1 %>
 class DifferenceOfSquaresTest < Minitest::Test<% test_cases.each do |test_case| %>
-  def <%= test_case.test_name %><% if test_case.skipped? %>
-    skip<% end %>
-    assert_equal <%= test_case.expected_formatted %>, <%= test_case.do %>
+  def <%= test_case.test_name %>
+    <%= test_case.skipped %>
+    <%= test_case.workload %>
   end
 <% end %>
   def test_consistent_difference
diff --git a/exercises/gigasecond/example.tt b/exercises/gigasecond/example.tt
@@ -6,14 +6,14 @@ require_relative 'gigasecond'
 # Test data version commit id: <%= sha1 %>
 class GigasecondTest < Minitest::Test
 <% test_cases.each do |test_case| %>
-  def <%= test_case.name %>
+  def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
   def test_bookkeeping
     skip
-    assert_equal <%= version %>, BookKeeping::VERSION
+    assert_equal <%= version.next %>, BookKeeping::VERSION
   end
 end
diff --git a/exercises/hamming/example.tt b/exercises/hamming/example.tt
@@ -6,10 +6,9 @@ require_relative 'hamming'
 # Test data version:
 # <%= sha1 %>
 class HammingTest < Minitest::Test<% test_cases.each do |test_case| %>
-  def <%= test_case.name %>
-    <%= test_case.skipped %><% if test_case.raises_error? %>
-    assert_raises(ArgumentError) { <%= test_case.work_load %> }<% else %>
-    assert_equal <%= test_case.expected %>, <%= test_case.work_load %><% end %>
+  def <%= test_case.test_name %>
+    <%= test_case.skipped %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/hello-world/example.tt b/exercises/hello-world/example.tt
@@ -17,7 +17,7 @@ end
 class HelloWorldTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load %>
+    <%= test_case.workload %>
   end
 <% end %>end
 
diff --git a/exercises/largest-series-product/example.tt b/exercises/largest-series-product/example.tt
@@ -11,9 +11,8 @@ require_relative 'largest_series_product'
 #
 class Seriestest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
-    <%= test_case.skipped %><% if test_case.raises_error? %>
-    assert_raises(ArgumentError) { <%= test_case.work_load %> }<% else %>
-    assert_equal <%= test_case.expected %>, <%= test_case.work_load %><% end %>
+    <%= test_case.skipped %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/leap/example.tt b/exercises/leap/example.tt
@@ -16,9 +16,8 @@ end
 
 class YearTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
-    <%= test_case.skipped %><% if test_case.expected%>
-    assert <%= test_case.work_load %>, "<%= test_case.failure_message%>"<% else %>
-    refute <%= test_case.work_load %>, "<%= test_case.failure_message%>"<% end%>
+    <%= test_case.skipped %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/nth-prime/example.tt b/exercises/nth-prime/example.tt
@@ -11,7 +11,7 @@ require_relative 'nth_prime'
 class NthPrimeTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/pangram/example.tt b/exercises/pangram/example.tt
@@ -9,7 +9,7 @@ require_relative 'pangram'
 class PangramTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/raindrops/example.tt b/exercises/raindrops/example.tt
@@ -8,7 +8,7 @@ require_relative 'raindrops'
 class RaindropsTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/rna-transcription/example.tt b/exercises/rna-transcription/example.tt
@@ -8,7 +8,7 @@ require_relative 'rna_transcription'
 class ComplementTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/roman-numerals/example.tt b/exercises/roman-numerals/example.tt
@@ -8,7 +8,7 @@ require_relative 'roman_numerals'
 class RomanNumeralsTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/run-length-encoding/example.tt b/exercises/run-length-encoding/example.tt
@@ -9,7 +9,7 @@ require_relative 'run_length_encoding'
 class RunLengthEncodingTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/sieve/example.tt b/exercises/sieve/example.tt
@@ -7,10 +7,9 @@ require_relative 'sieve'
 # <%= sha1 %>
 
 class SieveTest < Minitest::Test<% test_cases.each do |test_case| %>
-  def <%= test_case.name %>
+  def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    expected = <%= test_case.expected_string %>
-    assert_equal expected, Sieve.new(<%= test_case.limit %>).primes
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/two-bucket/example.tt b/exercises/two-bucket/example.tt
@@ -8,7 +8,7 @@ require_relative 'two_bucket'
 class TwoBucketTest < Minitest::Test<% test_cases.each do |test_case| %>
   def <%= test_case.test_name %>
     <%= test_case.skipped %>
-    <%= test_case.work_load %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
diff --git a/exercises/word-count/.version b/exercises/word-count/.version
@@ -1 +1 @@
-1
+4
diff --git a/exercises/word-count/example.tt b/exercises/word-count/example.tt
@@ -6,11 +6,9 @@ require_relative 'word_count'
 # Test data version:
 # <%= sha1 %>
 class PhraseTest < Minitest::Test<% test_cases.each do |test_case| %>
-  def <%= test_case.name %><% if test_case.skipped? %>
-    skip<% end %>
-    phrase = <%= test_case.object_under_test %>
-    counts = <%= test_case.expected %>
-    assert_equal counts, phrase.word_count
+  def <%= test_case.test_name %>
+    <%= test_case.skipped %>
+    <%= test_case.workload %>
   end
 <% end %>
 <%= IO.read(XRUBY_LIB + '/bookkeeping.md') %>
@@ -19,4 +17,3 @@ class PhraseTest < Minitest::Test<% test_cases.each do |test_case| %>
     assert_equal <%= version.next %>, BookKeeping::VERSION
   end
 end
-
diff --git a/lib/acronym_cases.rb b/lib/acronym_cases.rb
@@ -3,8 +3,8 @@ def test_name
     'test_%s' % description.tr(' ', '_')
   end
 
-  def work_load
-    "assert_equal #{expected}, Acronym.abbreviate('#{phrase}')"
+  def workload
+    "assert_equal '#{expected}', Acronym.abbreviate('#{phrase}')"
   end
 
   def skipped
diff --git a/lib/alphametics_cases.rb b/lib/alphametics_cases.rb
@@ -6,8 +6,12 @@ def test_name
     "test_#{description.tr(' ', '_')}"
   end
 
-  def work_load
-    "assert_equal(#{expect}, Alphametics.new.solve('#{puzzle}'))"
+  def workload
+    <<-WL.chomp
+expect = #{expect}
+    actual = Alphametics.new.solve('#{puzzle}')
+    assert_equal(expect, actual)
+    WL
   end
 
   def expect
diff --git a/lib/anagram_cases.rb b/lib/anagram_cases.rb
@@ -3,7 +3,7 @@ def test_name
     'test_%s' % description.gsub(/[ -]/, '_')
   end
 
-  def work_load
+  def workload
     indent_lines([show_comment, detector, anagram, assert].compact)
   end
 
diff --git a/lib/binary_cases.rb b/lib/binary_cases.rb
@@ -3,7 +3,7 @@ def test_name
     'test_%s' % description.gsub(/[ -]/, '_')
   end
 
-  def work_load
+  def workload
     return error_assertion if raises_error?
     equality_assertion
   end
diff --git a/lib/bracket_push_cases.rb b/lib/bracket_push_cases.rb
@@ -3,7 +3,7 @@ def test_name
     'test_%s' % description.gsub(/[ -]/, '_')
   end
 
-  def work_load
+  def workload
     long_input? ? split_test : simple_test
   end
 
diff --git a/lib/clock_cases.rb b/lib/clock_cases.rb
@@ -6,7 +6,7 @@ def test_name
                 .chomp('_')
   end
 
-  def work_load
+  def workload
     section == 'equal' ? compare_clocks : simple_test
   end
 
diff --git a/lib/connect_cases.rb b/lib/connect_cases.rb
@@ -6,8 +6,8 @@ def test_name
                 .downcase
   end
 
-  def work_load
-    <<-WL
+  def workload
+    <<-WL.chomp
 board = [
       #{board.map(&method(:single_quote)).join(",\n      ")}
     ]
diff --git a/lib/custom_set_cases.rb b/lib/custom_set_cases.rb
@@ -3,7 +3,7 @@ def test_name
     'test_%s' % description.gsub(/ |-/, '_')
   end
 
-  def work_load
+  def workload
     send section
   end
 
diff --git a/lib/difference_of_squares_cases.rb b/lib/difference_of_squares_cases.rb
@@ -1,21 +1,21 @@
 class DifferenceOfSquaresCase < OpenStruct
-  def name
+  def test_name
     'test_%s' % description.gsub(/[ -]/, '_')
   end
 
-  def work_load
-    "Squares.new(#{number}).#{action}"
+  def workload
+    "assert_equal #{expected_formatted}, Squares.new(#{number}).#{action}"
+  end
+
+  def skipped
+    index.zero? ? '# skip' : 'skip'
   end
 
   def action
     return 'difference' if section == 'difference_of_squares'
     section
   end
 
-  def skipped
-    index.zero? ? '# skip' : 'skip'
-  end
-
   def expected_formatted
     expected.to_s.reverse.scan(/\d{1,3}/).join('_').reverse
   end
diff --git a/lib/gigasecond_cases.rb b/lib/gigasecond_cases.rb
@@ -5,8 +5,11 @@ def test_name
     'test_%s' % description.gsub(/[ :-]/, '_')
   end
 
-  def work_load
-    "assert_equal #{want}, Gigasecond.from(#{got})"
+  def workload
+    <<-WL.chomp
+result = Gigasecond.from(#{got})
+    assert_equal #{want}, result
+    WL
   end
 
   def skipped
diff --git a/lib/hamming_cases.rb b/lib/hamming_cases.rb
diff --git a/lib/hello_world_cases.rb b/lib/hello_world_cases.rb
diff --git a/lib/largest_series_product_cases.rb b/lib/largest_series_product_cases.rb
diff --git a/lib/leap_cases.rb b/lib/leap_cases.rb
diff --git a/lib/nth_prime_cases.rb b/lib/nth_prime_cases.rb
diff --git a/lib/pangram_cases.rb b/lib/pangram_cases.rb
diff --git a/lib/raindrops_cases.rb b/lib/raindrops_cases.rb
diff --git a/lib/rna_transcription_cases.rb b/lib/rna_transcription_cases.rb
diff --git a/lib/roman_numerals_cases.rb b/lib/roman_numerals_cases.rb
diff --git a/lib/run_length_encoding_cases.rb b/lib/run_length_encoding_cases.rb
diff --git a/lib/sieve_cases.rb b/lib/sieve_cases.rb
diff --git a/lib/two_bucket_cases.rb b/lib/two_bucket_cases.rb
diff --git a/lib/word_count_cases.rb b/lib/word_count_cases.rb
