Clock: Canonical test improvements

Generated from x-common clock data

Now generates tests from data in x-common.

The template file is skinny, the generator a little fatter.

fixes #282
references exercism/problem-specifications#166

Author: kotp

bin/generate-clock

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require_relative '../lib/generator'
+require_relative '../lib/clock_cases'
+
+Generator.new('clock', ClockCases).generate

exercises/clock/.version

@@ -0,0 +1 @@
+1

exercises/clock/clock_test.rb

@@ -3,146 +3,300 @@
 require 'minitest/autorun'
 require_relative 'clock'
 
-module HelperUnits
-  MINUTE = 60
-  HOUR = MINUTE * 60
-  DAY = HOUR * 24
+# Test data version:
+# eb8d142 Merge pull request #220 from IanWhitney/sieve_ordering
 
-  def minutes(minutes)
-    minutes
+class ClockTest < Minitest::Test
+  def test_on_the_hour
+    # skip
+    assert '08:00', Clock.at(8, 0)
   end
 
-  def hours(hours)
-    hours * MINUTE
+  def test_past_the_hour
+    skip
+    assert '11:09', Clock.at(11, 9)
   end
 
-  def days(days)
-    days * DAY
+  def test_midnight_is_zero_hours
+    skip
+    assert '00:00', Clock.at(24, 0)
   end
-end
 
-class ClockTest < Minitest::Test
-  include HelperUnits
+  def test_hour_rolls_over
+    skip
+    assert '01:00', Clock.at(25, 0)
+  end
 
-  def test_on_the_hour
-    assert_equal '08:00', Clock.at(8).to_s
-    assert_equal '09:00', Clock.at(9).to_s
+  def test_hour_rolls_over_continuously
+    skip
+    assert '04:00', Clock.at(100, 0)
   end
 
-  def test_past_the_hour
+  def test_sixty_minutes_is_next_hour
     skip
-    assert_equal '11:09', Clock.at(11, 9).to_s
+    assert '02:00', Clock.at(1, 60)
   end
 
-  def test_add_a_few_minutes
+  def test_minutes_roll_over
     skip
-    clock = Clock.at(10) + 3
-    assert_equal '10:03', clock.to_s
+    assert '02:40', Clock.at(0, 160)
   end
 
-  def test_add_over_an_hour
+  def test_minutes_roll_over_continuously
     skip
-    clock = Clock.at(10) + 61
-    assert_equal '11:01', clock.to_s
+    assert '04:43', Clock.at(0, 1723)
   end
 
-  def test_wrap_around_at_midnight
+  def test_hour_and_minutes_roll_over
     skip
-    clock = Clock.at(23, 30) + 60
-    assert_equal '00:30', clock.to_s
+    assert '03:40', Clock.at(25, 160)
   end
 
-  def test_subtract_minutes
+  def test_hour_and_minutes_roll_over_continuously
     skip
-    clock = Clock.at(10) - 90
-    assert_equal '08:30', clock.to_s
+    assert '11:01', Clock.at(201, 3001)
   end
 
-  def test_hour_rolls_over_continuously
+  def test_hour_and_minutes_roll_over_to_exactly_midnight
     skip
-    clock = Clock.at(0) + hours(100)
-    assert_equal '04:00', clock.to_s
+    assert '00:00', Clock.at(72, 8640)
   end
 
-  def test_minutes_roll_over_continuously
+  def test_negative_hour
     skip
-    clock = Clock.at(0) + minutes(1723)
-    assert_equal '04:43', clock.to_s
+    assert '23:15', Clock.at(-1, 15)
   end
 
-  def test_hour_and_minutes_roll_over_continuously
+  def test_negative_hour_rolls_over
     skip
-    clock = Clock.at(0) + hours(201) + minutes(3001)
-    assert_equal '11:01', clock.to_s
+    assert '23:00', Clock.at(-25, 0)
   end
 
-  def test_negative_hours_roll_over_continuously
+  def test_negative_hour_rolls_over_continuously
     skip
-    clock = Clock.at(0) - hours(91)
-    assert_equal '05:00', clock.to_s
+    assert '05:00', Clock.at(-91, 0)
+  end
+
+  def test_negative_minutes
+    skip
+    assert '00:20', Clock.at(1, -40)
+  end
+
+  def test_negative_minutes_roll_over
+    skip
+    assert '22:20', Clock.at(1, -160)
   end
 
   def test_negative_minutes_roll_over_continuously
     skip
-    clock = Clock.at(0) - minutes(4820)
-    assert_equal '15:40', clock.to_s
+    assert '16:40', Clock.at(1, -4820)
+  end
+
+  def test_negative_hour_and_minutes_both_roll_over
+    skip
+    assert '20:20', Clock.at(-25, -160)
   end
 
-  def test_negative_hours_and_minutes_both_roll_over_continuously
+  def test_negative_hour_and_minutes_both_roll_over_continuously
     skip
-    clock = Clock.at(0) - hours(121) - minutes(5810)
-    assert_equal '22:10', clock.to_s
+    assert '22:10', Clock.at(-121, -5810)
+  end
+
+  def test_add_minutes
+    skip
+    assert '10:03', Clock.at(10, 0) + 3
   end
 
   def test_add_no_minutes
     skip
-    clock = Clock.at(0) + minutes(0)
-    assert_equal '00:00', clock.to_s
+    assert '06:41', Clock.at(6, 41) + 0
+  end
+
+  def test_add_to_next_hour
+    skip
+    assert '01:25', Clock.at(0, 45) + 40
+  end
+
+  def test_add_more_than_one_hour
+    skip
+    assert '11:01', Clock.at(10, 0) + 61
   end
 
   def test_add_more_than_two_hours_with_carry
     skip
-    clock = Clock.at(0, 45) + minutes(160)
-    assert_equal '03:25', clock.to_s
+    assert '03:25', Clock.at(0, 45) + 160
+  end
+
+  def test_add_across_midnight
+    skip
+    assert '00:01', Clock.at(23, 59) + 2
+  end
+
+  def test_add_more_than_one_day__1500_min_is_equal_to_25_hrs_
+    skip
+    assert '06:32', Clock.at(5, 32) + 1500
   end
 
   def test_add_more_than_two_days
     skip
-    clock = Clock.at(1, 1) + days(2) + hours(10) + minutes(20)
-    assert_equal '11:21', clock.to_s
+    assert '11:21', Clock.at(1, 1) + 3500
+  end
+
+  def test_subtract_minutes
+    skip
+    assert '10:00', Clock.at(10, 3) + -3
+  end
+
+  def test_subtract_to_previous_hour
+    skip
+    assert '09:33', Clock.at(10, 3) + -30
+  end
+
+  def test_subtract_more_than_an_hour
+    skip
+    assert '08:53', Clock.at(10, 3) + -70
+  end
+
+  def test_subtract_across_midnight
+    skip
+    assert '23:59', Clock.at(0, 3) + -4
+  end
+
+  def test_subtract_more_than_two_hours
+    skip
+    assert '21:20', Clock.at(0, 0) + -160
   end
 
-  def test_subtrackt_more_than_two_hours_with_borrow
+  def test_subtract_more_than_two_hours_with_borrow
     skip
-    clock = Clock.at(6, 15) - hours(2) - minutes(40)
-    assert_equal '03:35', clock.to_s
+    assert '03:35', Clock.at(6, 15) + -160
+  end
+
+  def test_subtract_more_than_one_day__1500_min_is_equal_to_25_hrs_
+    skip
+    assert '04:32', Clock.at(5, 32) + -1500
   end
 
   def test_subtract_more_than_two_days
     skip
-    clock = Clock.at(2, 20) - days(2) - hours(2)
-    assert_equal '00:20', clock.to_s
+    assert '00:20', Clock.at(2, 20) + -3000
   end
 
-  def test_equivalent_clocks
+  def test_clocks_with_same_time
     skip
     clock1 = Clock.at(15, 37)
     clock2 = Clock.at(15, 37)
-    assert_equal clock1, clock2
+    assert clock1 == clock2
   end
 
-  def test_inequivalent_clocks
+  def test_clocks_a_minute_apart
     skip
-    clock1 = Clock.at(15, 37)
-    clock2 = Clock.at(15, 36)
-    clock3 = Clock.at(14, 37)
-    refute_equal clock1, clock2
-    refute_equal clock1, clock3
+    clock1 = Clock.at(15, 36)
+    clock2 = Clock.at(15, 37)
+    refute clock1 == clock2
+  end
+
+  def test_clocks_an_hour_apart
+    skip
+    clock1 = Clock.at(14, 37)
+    clock2 = Clock.at(15, 37)
+    refute clock1 == clock2
+  end
+
+  def test_clocks_with_hour_overflow
+    skip
+    clock1 = Clock.at(10, 37)
+    clock2 = Clock.at(34, 37)
+    assert clock1 == clock2
+  end
+
+  def test_clocks_with_hour_overflow_by_several_days
+    skip
+    clock1 = Clock.at(3, 11)
+    clock2 = Clock.at(99, 11)
+    assert clock1 == clock2
+  end
+
+  def test_clocks_with_negative_hour
+    skip
+    clock1 = Clock.at(22, 40)
+    clock2 = Clock.at(-2, 40)
+    assert clock1 == clock2
+  end
+
+  def test_clocks_with_negative_hour_that_wraps
+    skip
+    clock1 = Clock.at(17, 3)
+    clock2 = Clock.at(-31, 3)
+    assert clock1 == clock2
+  end
+
+  def test_clocks_with_negative_hour_that_wraps_multiple_times
+    skip
+    clock1 = Clock.at(13, 49)
+    clock2 = Clock.at(-83, 49)
+    assert clock1 == clock2
+  end
+
+  def test_clocks_with_minute_overflow
+    skip
+    clock1 = Clock.at(0, 1)
+    clock2 = Clock.at(0, 1441)
+    assert clock1 == clock2
+  end
+
+  def test_clocks_with_minute_overflow_by_several_days
+    skip
+    clock1 = Clock.at(2, 2)
+    clock2 = Clock.at(2, 4322)
+    assert clock1 == clock2
+  end
+
+  def test_clocks_with_negative_minute
+    skip
+    clock1 = Clock.at(2, 40)
+    clock2 = Clock.at(3, -20)
+    assert clock1 == clock2
+  end
+
+  def test_clocks_with_negative_minute_that_wraps
+    skip
+    clock1 = Clock.at(4, 10)
+    clock2 = Clock.at(5, -1490)
+    assert clock1 == clock2
+  end
+
+  def test_clocks_with_negative_minute_that_wraps_multiple_times
+    skip
+    clock1 = Clock.at(6, 15)
+    clock2 = Clock.at(6, -4305)
+    assert clock1 == clock2
+  end
+
+  def test_clocks_with_negative_hours_and_minutes
+    skip
+    clock1 = Clock.at(7, 32)
+    clock2 = Clock.at(-12, -268)
+    assert clock1 == clock2
+  end
+
+  def test_clocks_with_negative_hours_and_minutes_that_wrap
+    skip
+    clock1 = Clock.at(18, 7)
+    clock2 = Clock.at(-54, -11_513)
+    assert clock1 == clock2
   end
 
-  def test_wrap_around_backwards
+  # Problems in exercism evolve over time,
+  # as we find better ways to ask questions.
+  # The version number refers to the version of the problem you solved,
+  # not your solution.
+  #
+  # Define a constant named VERSION inside of Clock.
+  # If you are curious, read more about constants on RubyDoc:
+  # http://ruby-doc.org/docs/ruby-doc-bundle/UsersGuide/rg/constants.html
+  def test_bookkeeping
     skip
-    clock = Clock.at(0, 30) - 60
-    assert_equal '23:30', clock.to_s
+    assert_equal 1, Clock::VERSION
   end
 end