facets 2.9.1 → 2.9.2

data/test/core/symbol/test_succ.rb

@@ -1,11 +1,15 @@
 covers 'facets/symbol/succ'
 
-testcase Symbol do
+test_case Symbol do
+
+  method :succ do
+
+    test do
+      :a.succ.assert == :b
+      :aaa.succ.assert == :aab
+      :"1".succ.assert == :"2"
+    end
 
-  unit :succ do
-    :a.succ.assert == :b
-    :aaa.succ.assert == :aab
-    :"1".succ.assert == :"2"
   end
 
 end

data/test/core/symbol/test_to_proc.rb

@@ -1,32 +1,35 @@
 covers 'facets/symbol/to_proc'
 
-testcase Symbol do
+test_case Symbol do
 
-  unit :to_proc do
-    x = (1..10).inject(&:*)
-    x.assert == 3628800
+  method :to_proc do
 
-    x = %w{foo bar qux}.map(&:reverse)
-    x.assert == %w{oof rab xuq}
+    test do
+      x = (1..10).inject(&:*)
+      x.assert == 3628800
 
-    x = [1, 2, nil, 3, nil].reject(&:nil?)
-    x.assert == [1, 2, 3]
+      x = %w{foo bar qux}.map(&:reverse)
+      x.assert == %w{oof rab xuq}
 
-    x = %w{ruby and world}.sort_by(&:reverse)
-    x.assert == %w{world and ruby}
-  end
+      x = [1, 2, nil, 3, nil].reject(&:nil?)
+      x.assert == [1, 2, 3]
 
-  unit :to_proc => "call" do
-    up = :upcase.to_proc
-    up.assert.is_a?(Proc)
-    up.call("hello").assert == "HELLO"
-  end
+      x = %w{ruby and world}.sort_by(&:reverse)
+      x.assert == %w{world and ruby}
+    end
+
+    test "call" do
+      up = :upcase.to_proc
+      up.assert.is_a?(Proc)
+      up.call("hello").assert == "HELLO"
+    end
+
+    test "map" do
+      q = [[1,2,3], [4,5,6], [7,8,9]].map(&:reverse)
+      a = [[3, 2, 1], [6, 5, 4], [9, 8, 7]]
+      q.assert == a
+    end
 
-  unit :to_proc => "map" do
-    q = [[1,2,3], [4,5,6], [7,8,9]].map(&:reverse)
-    a = [[3, 2, 1], [6, 5, 4], [9, 8, 7]]
-    q.assert == a
   end
 
 end
-

data/test/core/symbol/test_variablize.rb

@@ -1,9 +1,13 @@
 covers 'facets/symbol/variablize'
 
-testcase Symbol do
+test_case Symbol do
+
+  method :variablize do
+
+    test do
+      :a.variablize.assert == "@a".to_sym
+    end
 
-  unit :variablize do
-    :a.variablize.assert == "@a".to_sym
   end
 
 end

data/test/core/time/test_ago.rb

@@ -1,14 +1,17 @@
 covers 'facets/time/ago'
 
-tests Time do
+test_case Time do
 
   # We do not need to test #ago b/c it is an alias for #less.
   # One test is provided to add to coverage report.
+  method :ago do
+
+    test "is an alias of #less" do
+      t = Time.utc(2010,01,20,12,00,00)
+      t.ago(1, :year).year.assert = 2009
+      t.ago(2, :years).year.assert = 2008
+    end
 
-  unit :ago => "is an alias of #less" do
-    t = Time.utc(2010,01,20,12,00,00)
-    t.ago(1, :year).year.assert = 2009
-    t.ago(2, :years).year.assert = 2008
   end
 
 end

data/test/core/time/test_change.rb

@@ -1,12 +1,16 @@
 covers 'facets/time/change'
 
-testcase Time do
+test_case Time do
+
+  method :change do
+
+    test do
+      t = Time.local(2006,04,20,15,37)
+      n = Time.now
+      n = n.change(:month=>4, :day=>20, :hour=>15, :min=>37, :year=>2006)
+      n.assert == t
+    end
 
-  unit :change do
-    t = Time.local(2006,04,20,15,37)
-    n = Time.now
-    n = n.change(:month=>4, :day=>20, :hour=>15, :min=>37, :year=>2006)
-    n.assert == t
   end
 
 end

data/test/core/time/test_dst_adjustment.rb

@@ -1,10 +1,11 @@
 covers 'facets/time/dst_adjustment'
 
-tests Time do
+test_case Time do
 
   # TODO: test dst_adjustment
-
-  omit unit :dst_adjustment do
+  method :dst_adjustment do
+    test do
+    end
   end
 
 end

data/test/core/time/test_elapse.rb

@@ -1,10 +1,14 @@
 covers 'facets/time/elapse'
 
-testcase Time do
+test_case Time do
+
+  class_method :elapse do
+
+    test do
+      t = Time.elapse { sleep 1 }
+      assert( (t > 0.9) && (t < 2.1 ))
+    end
 
-  metaunit :elapse do
-    t = Time.elapse { sleep 1 }
-    assert( (t > 0.9) && (t < 2.1 ))
   end
 
 end

data/test/core/time/test_future.rb

@@ -1,20 +1,31 @@
 covers 'facets/time/future'
 
-testcase Time do
+test_case Time do
 
-  #
-  unit :future? do
-    t = Time.now + 1000
-    t.assert.future?
+  method :future? do
 
-    n = Time.now - 1000
-    n.refute.future?
+    test do
+      t = Time.now + 1000
+      t.assert.future?
+    end
 
-    n = Time.now + 1001
-    n.assert.future?(t)
+    test do
+      n = Time.now - 1000
+      n.refute.future?
+    end
+
+    test do
+      n = Time.now + 1001
+      t = Time.now + 1000
+      n.assert.future?(t)
+    end
+
+    test do
+      n = Time.now + 999
+      t = Time.now + 1000
+      n.refute.future?(t)
+    end
 
-    n = Time.now + 999
-    n.refute.future?(t)
   end
 
 end

data/test/core/time/test_hence.rb

@@ -1,14 +1,17 @@
 covers 'facets/time/hence'
 
-tests Time do
+test_case Time do
 
   # We do not need to test #hence b/c it is an alias for #shift.
   # One test is provided to add to coverage report.
+  method :hence do
+
+    test do
+      e = Time.utc(2008,11, 1, 18,30,57)
+      r = Time.utc(2007,11, 1, 18,30,57).hence(1, :years)
+      r.assert == e                 
+    end
 
-  unit :hence do
-    e = Time.utc(2008,11, 1, 18,30,57)
-    r = Time.utc(2007,11, 1, 18,30,57).hence(1, :years)
-    r.assert == e                 
   end
 
 end

data/test/core/time/test_in.rb

@@ -1,14 +1,17 @@
 covers 'facets/time/ago'
 
-tests Time do
+test_case Time do
 
   # We do not need to test #in b/c it is an alias for #shift.
   # One test is provided to add to coverage report.
+  method :in do
+
+    test do
+      e = Time.utc(2008,11, 1, 18,30,57)
+      r = Time.utc(2007,11, 1, 18,30,57).in(1, :years)
+      r.assert == e                 
+    end
 
-  unit :in do
-    e = Time.utc(2008,11, 1, 18,30,57)
-    r = Time.utc(2007,11, 1, 18,30,57).in(1, :years)
-    r.assert == e                 
   end
 
 end

data/test/core/time/test_less.rb

@@ -1,50 +1,51 @@
-=begin
 covers 'facets/time/less'
 
-Time.test do
+test_case Time do
 
-  unit :less do
+  method :less do
 
     setup "January 20th 2010 at Noon" do
-      Time.utc(2010,01,20,12,00,00)
+      @t = Time.utc(2010,01,20,12,00,00)
     end
 
-    test 'years' do |t|
-      t.less(1, :year).year.assert = 2009
-      t.less(2, :years).year.assert = 2008
+    test 'years' do
+      @t.less(1, :year).year.assert = 2009
+      @t.less(2, :years).year.assert = 2008
     end
 
-    test 'weeks' do |t|
-      t.less(1, :week).day.assert == 13
-      t.less(2, :weeks).day.assert == 6
+    test 'weeks' do
+      @t.less(1, :week).day.assert == 13
+      @t.less(2, :weeks).day.assert == 6
     end
 
-    test 'days' do |t|
-      t.less(1, :day).day.assert == 19
-      t.less(2, :days).day.assert == 18
+    test 'days' do
+      @t.less(1, :day).day.assert == 19
+      @t.less(2, :days).day.assert == 18
     end
 
-    test 'hours' do |t|
-      t.less(1, :hour).hour.assert == 11
-      t.less(2, :hours).hour.assert == 10
-      t.less(12, :hours).hour.assert == 0
+    test 'hours' do
+      @t.less(1, :hour).hour.assert == 11
+      @t.less(2, :hours).hour.assert == 10
+      @t.less(12, :hours).hour.assert == 0
     end
 
-    test 'minutes' do |t|
-      t.less(1, :minute).min.assert == 59
-      t.less(2, :minutes).min.assert == 58
-      t.less(60, :minutes).min.assert == 0
+    test 'minutes' do
+      @t.less(1, :minute).min.assert == 59
+      @t.less(2, :minutes).min.assert == 58
+      @t.less(60, :minutes).min.assert == 0
     end
 
-    test 'seconds' do |t|
-      t.less(1, :second).sec.assert == 59
-      t.less(2, :seconds).sec.assert == 58
-      t.less(60, :seconds).sec.assert == 0
+    test 'seconds' do
+      @t.less(1, :second).sec.assert == 59
+      @t.less(2, :seconds).sec.assert == 58
+      @t.less(60, :seconds).sec.assert == 0
     end
 
   end
 
-  unit :less, "verify via dates" do
+  method :less do
+
+    concern "verify via dates"
 
     test "change years" do
       e = Time.utc(2007,11, 1, 18,30,57)
@@ -84,7 +85,9 @@ Time.test do
 
   end
 
-  unit :less, "months do not have a fixed duration" do
+  method :less do
+
+    concern "months do not have a fixed duration"
 
     test "change month no year wrap" do
       e = Time.utc(2008,11, 1)
@@ -134,4 +137,3 @@ Time.test do
   end
 
 end
-=end

data/test/core/time/test_past.rb

@@ -1,20 +1,31 @@
 covers 'facets/time/past'
 
-testcase Time do
+test_case Time do
 
-  #
-  unit :past? do
-    t = Time.now - 1000
-    t.assert.past?
+  method :past? do
 
-    n = Time.now + 1000
-    n.refute.past?
+    test do
+      t = Time.now - 1000
+      t.assert.past?
+    end
 
-    n = Time.now - 1001
-    n.assert.past?(t)
+    test do
+      n = Time.now + 1000
+      n.refute.past?
+    end
+
+    test do
+      n = Time.now - 1001
+      t = Time.now - 1000
+      n.assert.past?(t)
+    end
+
+    test do
+      n = Time.now - 999
+      t = Time.now - 1000
+      n.refute.past?(t)
+    end
 
-    n = Time.now - 999
-    n.refute.past?(t)
   end
 
 end

data/test/core/time/test_round_to.rb

@@ -1,27 +1,33 @@
 covers 'facets/time/round_to'
 
-testcase Time do
+test_case Time do
 
-  t = Time.local(2000,03,03,3,37,23)
+  method :round_to do
 
-  unit :round_to => "hour" do
-    t.round_to(60 * 60).assert == Time.local(2000,03,03,4, 0)
-  end
+    setup do
+      @t = Time.local(2000,03,03,3,37,23)
+    end
 
-  #unit :round_to => "month" do
-  #  t.round_to(1.month).assert == Time.local(2000,03,03,3, 0)
-  #end
+    test "hour" do
+      @t.round_to(60 * 60).assert == Time.local(2000,03,03,4, 0)
+    end
 
-  unit :round_to => "15 minutes" do
-    t.round_to(15 * 60).assert == Time.local(2000,03,03,3,30)
-  end
+    #test "month" do
+    #  @t.round_to(1.month).assert == Time.local(2000,03,03,3, 0)
+    #end
 
-  unit :round_to => "10 minutes" do
-    t.round_to(10 * 60).assert == Time.local(2000,03,03,3,40)
-  end
+    test "15 minutes" do
+      @t.round_to(15 * 60).assert == Time.local(2000,03,03,3,30)
+    end
+
+    test "10 minutes" do
+      @t.round_to(10 * 60).assert == Time.local(2000,03,03,3,40)
+    end
+
+    test "5 minutes" do
+      @t.round_to(5 * 60).assert == Time.local(2000,03,03,3,35)
+    end
 
-  unit :round_to => "5 minutes" do
-    t.round_to(5 * 60).assert == Time.local(2000,03,03,3,35)
   end
   
 end