ruport 1.6.3 → 1.7.1

data/test/csv_formatter_test.rb

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby -w   
 require File.join(File.expand_path(File.dirname(__FILE__)), "helpers")
 
-class TestRenderCSVRow < Test::Unit::TestCase
+class TestRenderCSVRow < Minitest::Test
   def test_render_csv_row
     actual = Ruport::Controller::Row.render_csv(:data => [1,2,3])
     assert_equal("1,2,3\n", actual)
   end
 end
 
-class TestRenderCSVTable < Test::Unit::TestCase
+class TestRenderCSVTable < Minitest::Test
   
   def setup
     Ruport::Formatter::Template.create(:simple) do |format|
@@ -25,18 +25,18 @@ class TestRenderCSVTable < Test::Unit::TestCase
 
   def test_render_csv_table
     actual = Ruport::Controller::Table.render_csv do |r| 
-      r.data = Table([], :data => [[1,2,3],[4,5,6]])
+      r.data = Ruport.Table([], :data => [[1,2,3],[4,5,6]])
     end
     assert_equal("1,2,3\n4,5,6\n",actual)
 
     actual = Ruport::Controller::Table.render_csv do |r|
-      r.data = Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
+      r.data = Ruport.Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
     end
     assert_equal("a,b,c\n1,2,3\n4,5,6\n",actual)
   end   
   
   def test_format_options
-    a = Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
+    a = Ruport.Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
     assert_equal "a\tb\tc\n1\t2\t3\n4\t5\t6\n", 
       a.as(:csv,:format_options => { :col_sep => "\t" })
   end
@@ -44,7 +44,7 @@ class TestRenderCSVTable < Test::Unit::TestCase
   def test_table_headers
     actual = Ruport::Controller::Table.
              render_csv(:show_table_headers => false, 
-                        :data => Table(%w[a b c], :data => [[1,2,3],[4,5,6]]))
+                        :data => Ruport.Table(%w[a b c], :data => [[1,2,3],[4,5,6]]))
     assert_equal("1,2,3\n4,5,6\n",actual)
   end
      
@@ -64,7 +64,7 @@ class TestRenderCSVTable < Test::Unit::TestCase
 
   def test_options_hashes_override_template
     opts = nil
-    table = Table(%w[a b c])
+    table = Ruport.Table(%w[a b c])
     table.to_csv(
       :template => :simple,
       :table_format => {
@@ -86,7 +86,7 @@ class TestRenderCSVTable < Test::Unit::TestCase
 
   def test_individual_options_override_template
     opts = nil
-    table = Table(%w[a b c])
+    table = Ruport.Table(%w[a b c])
     table.to_csv(
       :template => :simple,
       :show_table_headers => true,
@@ -106,7 +106,7 @@ class TestRenderCSVTable < Test::Unit::TestCase
   end
 end     
 
-class TestRenderCSVGroup < Test::Unit::TestCase
+class TestRenderCSVGroup < Minitest::Test
 
   def test_render_csv_group
     group = Ruport::Data::Group.new(:name => 'test',
@@ -119,9 +119,9 @@ class TestRenderCSVGroup < Test::Unit::TestCase
   
 end
 
-class RenderCSVGrouping < Test::Unit::TestCase
+class RenderCSVGrouping < Minitest::Test
   def test_render_csv_grouping
-    table = Table(%w[hi red snapper]) << %w[is this annoying] <<
+    table = Ruport.Table(%w[hi red snapper]) << %w[is this annoying] <<
                                           %w[is it funny]
     grouping = Grouping(table,:by => "hi")
 
@@ -131,7 +131,7 @@ class RenderCSVGrouping < Test::Unit::TestCase
   end
 
   def test_render_csv_grouping_without_header
-    table = Table(%w[hi red snapper]) << %w[is this annoying] <<
+    table = Ruport.Table(%w[hi red snapper]) << %w[is this annoying] <<
                                           %w[is it funny]
     grouping = Grouping(table,:by => "hi")
 
@@ -141,10 +141,10 @@ class RenderCSVGrouping < Test::Unit::TestCase
   end  
 
   def test_alternative_styles
-    g = Grouping((Table(%w[a b c]) << [1,2,3] << [1,1,4] <<
+    g = Grouping((Ruport.Table(%w[a b c]) << [1,2,3] << [1,1,4] <<
                                       [2,1,2] << [1,9,1] ), :by => "a")
     
-    assert_raise(NotImplementedError) { g.to_csv :style => :not_real }
+    assert_raises(NotImplementedError) { g.to_csv :style => :not_real }
 
     assert_equal "a,b,c\n1,2,3\n,1,4\n,9,1\n\n2,1,2\n\n", 
                  g.to_csv(:style => :justified)
@@ -158,7 +158,7 @@ class RenderCSVGrouping < Test::Unit::TestCase
   # ------------------------------------------------------------------------
   
   def test_ensure_group_names_are_converted_to_string
-    g = Grouping((Table(%w[a b c])<<[1,2,3]<<[1,1,4]), :by => "a")
+    g = Grouping((Ruport.Table(%w[a b c])<<[1,2,3]<<[1,1,4]), :by => "a")
     assert_equal "1\n\nb,c\n2,3\n1,4\n\n", g.to_csv
   end
 end

data/test/data_feeder_test.rb

@@ -1,20 +1,20 @@
 #!/usr/bin/env ruby -w   
 require File.join(File.expand_path(File.dirname(__FILE__)), "helpers")    
 
-class DataFeederTest < Test::Unit::TestCase
+class DataFeederTest < Minitest::Test
    
   context "when using a default data feeder" do
       
-    def setup
-      @feeder = Ruport::Data::Feeder.new(Table(%w[a b c]))      
+    setup do
+      @feeder = Ruport::Data::Feeder.new(Ruport.Table(%w[a b c]))
     end    
     
-    def specify_data_attribute_should_return_wrapped_data
-      assert_equal Table(%w[a b c]), @feeder.data  
+    should "data attribute should return wrapped data" do
+      assert_equal Ruport.Table(%w[a b c]), @feeder.data
     end
      
-    def specify_append_should_forward_to_wrapped_data_by_default
-      t = Table(%w[a b c])
+    should "append should forward to wrapped data by default" do
+      t = Ruport.Table(%w[a b c])
       t << [1,2,3] << {"a" => 2, "b" => 3, "c" => 4}
       @feeder << [1,2,3] << {"a" => 2, "b" => 3, "c" => 4} 
       assert_equal t, @feeder.data 
@@ -23,66 +23,66 @@ class DataFeederTest < Test::Unit::TestCase
   end 
   
   context "when using a feeder with a filter" do
-     def setup 
-       @feeder = Ruport::Data::Feeder.new(Table(%w[a b c]))
+     setup do 
+       @feeder = Ruport::Data::Feeder.new(Ruport.Table(%w[a b c]))
        @feeder.filter { |r| r.a != 1 }
      end    
      
-     def specify_filter_should_only_append_rows_for_which_block_is_true
+     should "filter should only append rows for which block is true" do
        @feeder << [1,2,3] << [4,1,2] << [3,1,1] << [1,2,5]
-       assert_equal Table(%w[a b c], :data => [[4,1,2],[3,1,1]]), @feeder.data  
+       assert_equal Ruport.Table(%w[a b c], :data => [[4,1,2],[3,1,1]]), @feeder.data
      end
   end 
   
   context "when using a feeder with a transform" do
-     def setup
-       @feeder = Ruport::Data::Feeder.new(Table(%w[a b c])) 
+     setup do
+       @feeder = Ruport::Data::Feeder.new(Ruport.Table(%w[a b c]))
        @feeder.transform { |r| r.a += 1 }
      end
      
-     def specify_filter_should_be_applied_to_all_rows
+     should "filter should be applied to all rows" do
        @feeder << [1,2,3] << [4,1,2] << [3,1,1] << [1,2,5]
-       assert_equal Table(%w[a b c], :data => [[2,2,3],[5,1,2],[4,1,1],[2,2,5]]),
+       assert_equal Ruport.Table(%w[a b c], :data => [[2,2,3],[5,1,2],[4,1,1],[2,2,5]]),
                     @feeder.data
      end     
   end  
   
   context "when using a feeder and a filter together" do
-    def setup
-      @feeder = Ruport::Data::Feeder.new(Table(%w[a b c]))
+    setup do
+      @feeder = Ruport::Data::Feeder.new(Ruport.Table(%w[a b c]))
     end 
     
-    def specify_filter_is_called_first_when_defined_first
+    should "filter is called first when defined first" do
       @feeder.filter { |r| r.b != 2 }
       @feeder.transform { |r| r.b += 1 }
       @feeder << [1,2,3] << [4,1,2] << [3,1,1] << [1,2,5] 
-      assert_equal Table(%w[a b c], :data => [[4,2,2],[3,2,1]]),
+      assert_equal Ruport.Table(%w[a b c], :data => [[4,2,2],[3,2,1]]),
                    @feeder.data
     end
     
-    def specify_transform_is_called_first_when_defined_first
+    should "transform is called first when defined first" do
       @feeder.transform { |r| r.b += 1 }                    
       @feeder.filter { |r| r.b != 2 }      
       @feeder << [1,2,3] << [4,1,2] << [3,1,1] << [1,2,5] 
-      assert_equal Table(%w[a b c], :data => [[1,3,3],[1,3,5]]),
+      assert_equal Ruport.Table(%w[a b c], :data => [[1,3,3],[1,3,5]]),
                    @feeder.data
     end 
   end      
   
   context "when using many feeders and filters together" do
-    def setup
-      @feeder = Ruport::Data::Feeder.new(Table(%w[a b c])) 
+    setup do
+      @feeder = Ruport::Data::Feeder.new(Ruport.Table(%w[a b c]))
       @feeder.transform { |r| r.a += 1 }      
       @feeder.filter { |r| r.a > 5 }
       @feeder.transform { |r| r.b = r.b.to_s } 
       @feeder.filter { |r| r.b == "3" } 
    end
    
-   def specify_all_blocks_are_executed_in_order
+   should "all blocks are executed in order" do
      @feeder << [1,2,3] << [4,1,9] << [5,3,1] << [2,3,0] << [7,3,5] 
-     assert_equal Table(%w[a b c], :data => [[6,"3",1],[8,"3",5]]),
+     assert_equal Ruport.Table(%w[a b c], :data => [[6,"3",1],[8,"3",5]]),
                   @feeder.data
    end  
  end
   
-end
+end

data/test/grouping_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby -w   
 require File.join(File.expand_path(File.dirname(__FILE__)), "helpers")
 
-class TestGroup < Test::Unit::TestCase
+class TestGroup < Minitest::Test
 
   def setup
     @group = Ruport::Data::Group.new(:name => 'test',
@@ -34,7 +34,7 @@ class TestGroup < Test::Unit::TestCase
   end
 
   def test_eql
-    table = Table(%w[a b c], :data => [[1,2,3]])
+    table = Ruport.Table(%w[a b c], :data => [[1,2,3]])
 
     group2 = Ruport::Data::Group.new(:name => 'test',
                                      :data => [[1,2,3]],
@@ -79,7 +79,7 @@ class TestGroup < Test::Unit::TestCase
   end
 end
 
-class TestGroupRendering < Test::Unit::TestCase
+class TestGroupRendering < Minitest::Test
 
   def setup
     @group = Ruport::Data::Group.new(:name => 'test',
@@ -88,15 +88,16 @@ class TestGroupRendering < Test::Unit::TestCase
   end       
 
   def test_group_as
-    assert_equal(7, @group.to_text.to_a.length)
+    assert_equal(7, @group.to_text.split("\n").size)
     assert_equal(5, @group.as(:text,
-                              :show_table_headers => false).to_a.length)
-    assert_equal(13, @group.to_html.to_a.length)
+                              :show_table_headers => false).split("\n").size)
+    assert_equal(15, @group.to_html.split("\n").size)
+    assert_equal(8, @group.to_html(:show_table_headers => false).split("\n").size)
   end
   
   def test_as_throws_proper_errors
-    assert_nothing_raised { @group.as(:csv) }
-    assert_nothing_raised { @group.to_csv }
+    @group.as(:csv)
+    @group.to_csv
     assert_raises(Ruport::Controller::UnknownFormatError) {
       @group.as(:nothing) }
     assert_raises(Ruport::Controller::UnknownFormatError) {
@@ -111,15 +112,15 @@ class TestGroupRendering < Test::Unit::TestCase
   end
 end
     
-class TestGrouping < Test::Unit::TestCase
+class TestGrouping < Minitest::Test
   
   def setup
-    table = Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
+    table = Ruport.Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
     @grouping = Ruport::Data::Grouping.new(table, :by => "a")
   end
   
   def test_grouping_constructor
-    a = Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
+    a = Ruport.Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
     b = Ruport::Data::Grouping.new(a, :by => "a")
     c = { 1 => Ruport::Data::Group.new( :data => [[2,3]],
                                         :column_names => %w[b c],
@@ -174,7 +175,7 @@ class TestGrouping < Test::Unit::TestCase
   end
 
   def test_append
-   a = Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
+   a = Ruport.Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
    @grouping << a.to_group("red snapper")
    assert_equal @grouping["red snapper"], a.to_group("red snapper")
    
@@ -186,7 +187,7 @@ class TestGrouping < Test::Unit::TestCase
   end
 
   def test_grouping_on_multiple_columns
-    a = Table(%w[a b c d], :data => [[1,2,3,4],[4,5,6,7]])
+    a = Ruport.Table(%w[a b c d], :data => [[1,2,3,4],[4,5,6,7]])
     b = Ruport::Data::Grouping.new(a, :by => %w[a b c])
     c = { 1 => Ruport::Data::Group.new( :data => [[2,3,4]],
                                         :column_names => %w[b c d],
@@ -207,7 +208,7 @@ class TestGrouping < Test::Unit::TestCase
   end      
 
   def test_subgrouping
-    a = Table(%w[first_name last_name id])
+    a = Ruport.Table(%w[first_name last_name id])
     a << %w[ greg brown awesome ]
     a << %w[ mike milner schweet ]
     a << %w[ greg brown sick ]
@@ -233,12 +234,12 @@ class TestGrouping < Test::Unit::TestCase
   end
   
   def test_grouping_summary
-    source = Table(File.join(File.expand_path(File.dirname(__FILE__)), 
+    source = Ruport.Table(File.join(File.expand_path(File.dirname(__FILE__)),
                    *%w[samples ticket_count.csv]),
                      :record_class => TicketStatus)
     grouping = Grouping(source,:by => "date")
     
-    expected = Table(:date, :opened,:closed)
+    expected = Ruport.Table(:date, :opened,:closed)
     grouping.each do |date,group|
       opened = group.sigma { |r| r.opened  }
       closed = group.sigma { |r| r.closed  }
@@ -284,10 +285,10 @@ class TestGrouping < Test::Unit::TestCase
     end
   end
 
-  context "when sorting groupings" do
+  describe "when sorting groupings" do
     
     def setup
-      @table = Table(%w[a b c]) << ["dog",1,2] << ["cat",3,5] << 
+      @table = Ruport.Table(%w[a b c]) << ["dog",1,2] << ["cat",3,5] <<
                                    ["banana",8,1] << ["dog",5,6] << ["dog",2,4] << ["banana",7,9]
     end
     
@@ -346,7 +347,7 @@ class TestGrouping < Test::Unit::TestCase
   class MyRecord < Ruport::Data::Record; end
   
   def test_grouping_should_set_record_class
-    a = Table(%w[a b c], :record_class => MyRecord) { |t| 
+    a = Ruport.Table(%w[a b c], :record_class => MyRecord) { |t|
           t << [1,2,3]
           t << [4,5,6]
         }
@@ -357,28 +358,28 @@ class TestGrouping < Test::Unit::TestCase
   class MyGroupingSub < Ruport::Data::Grouping; end
 
   def test_ensure_grouping_subclasses_render_properly
-    t = Table(%w[a b c]) << [1,2,3]
+    t = Ruport.Table(%w[a b c]) << [1,2,3]
     a = MyGroupingSub.new(t, :by => "a") 
     assert_equal "1\n\nb,c\n2,3\n\n", a.to_csv
   end
 end
 
-class TestGroupingRendering < Test::Unit::TestCase
+class TestGroupingRendering < Minitest::Test
 
   def setup
-    table = Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
+    table = Ruport.Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
     @grouping = Ruport::Data::Grouping.new(table, :by => "a")
   end
   
   def test_grouping_as
-    assert_equal(16, @grouping.to_text.to_a.length)
-    assert_equal(12, @grouping.as(:text,
-      :show_table_headers => false).to_a.length)
+    assert_equal(15, @grouping.to_text.split("\n").size)
+    assert_equal(11, @grouping.as(:text,
+      :show_table_headers => false).split("\n").size)
   end
 
   def test_as_throws_proper_errors
-    assert_nothing_raised { @grouping.as(:csv) }
-    assert_nothing_raised { @grouping.to_csv }
+     @grouping.as(:csv)
+     @grouping.to_csv 
     assert_raises(Ruport::Controller::UnknownFormatError) {
       @grouping.as(:nothing) }
     assert_raises(Ruport::Controller::UnknownFormatError) {
@@ -386,7 +387,7 @@ class TestGroupingRendering < Test::Unit::TestCase
   end
 end
 
-class TestGroupingKernelHacks < Test::Unit::TestCase
+class TestGroupingKernelHacks < Minitest::Test
 
   def test_group_kernel_hack
     group = Ruport::Data::Group.new( :name => 'test',
@@ -397,7 +398,7 @@ class TestGroupingKernelHacks < Test::Unit::TestCase
   end
 
   def test_grouping_kernel_hack
-    table = Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
+    table = Ruport.Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
     grouping = Ruport::Data::Grouping.new(table, :by => "a")
     a = { 1 => Ruport::Data::Group.new( :data => [[2,3]],
                                         :column_names => %w[b c],

data/test/helpers.rb

@@ -1,10 +1,18 @@
-require "test/unit"
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib') 
-require "ruport"
-begin; require "rubygems"; rescue LoadError; nil; end
-require "spec-unit"
-require "mocha"
-
-class Test::Unit::TestCase
-  include SpecUnit
-end
+
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+require 'ruport'
+begin; require 'rubygems'; rescue LoadError; nil; end
+
+
+require 'minitest'
+require 'minitest/autorun'
+
+require 'minitest/spec'
+require 'minitest/unit'
+require 'shoulda-context'
+require 'mocha/mini_test'
+class Minitest::Test
+  include Ruport
+end
+
+TEST_SAMPLES = File.join(File.expand_path(File.dirname(__FILE__)), "samples")

data/test/html_formatter_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby -w  
 require File.join(File.expand_path(File.dirname(__FILE__)), "helpers")
 
-class TestRenderHTMLTable < Test::Unit::TestCase
+class TestRenderHTMLTable < Minitest::Test
   
   def setup
     Ruport::Formatter::Template.create(:simple) do |format|
@@ -25,7 +25,7 @@ class TestRenderHTMLTable < Test::Unit::TestCase
   def test_render_html_basic
     
     actual = Ruport::Controller::Table.render_html { |r|
-      r.data = Table([], :data => [[1,2,3],[4,5,6]])
+      r.data = Ruport.Table([], :data => [[1,2,3],[4,5,6]])
     }          
     
     assert_equal("\t<table>\n\t\t<tr>\n\t\t\t<td>1</td>\n\t\t\t<td>2"+
@@ -33,12 +33,12 @@ class TestRenderHTMLTable < Test::Unit::TestCase
                  "\t<td>4</td>\n\t\t\t<td>5</td>\n\t\t\t<td>6</td>\n\t"+
                  "\t</tr>\n\t</table>\n",actual)
 
-    actual = Ruport::Controller::Table.render_html { |r| 
-      r.data = Table(%w[a b c], :data => [ [1,2,3],[4,5,6]]) 
+    actual = Ruport::Controller::Table.render_html { |r|
+      r.data = Ruport.Table(%w[a b c], :data => [ [1,2,3],[4,5,6]])
     }
     
-    assert_equal("\t<table>\n\t\t<tr>\n\t\t\t<th>a</th>\n\t\t\t<th>b</th>"+
-      "\n\t\t\t<th>c</th>\n\t\t</tr>\n\t\t<tr>\n\t\t\t<td>1</td>"+
+    assert_equal("\t<table>\n\t\t<thead>\n\t\t<tr>\n\t\t\t<th>a</th>\n\t\t\t<th>b</th>"+
+      "\n\t\t\t<th>c</th>\n\t\t</tr>\n\t\t</thead>\n\t\t<tr>\n\t\t\t<td>1</td>"+
       "\n\t\t\t<td>2</td>\n\t\t\t<td>3</td>\n\t\t</tr>\n\t\t<tr>"+
       "\n\t\t\t<td>4</td>\n\t\t\t<td>5</td>\n\t\t\t<td>6</td>\n\t"+
       "\t</tr>\n\t</table>\n",actual)   
@@ -59,7 +59,7 @@ class TestRenderHTMLTable < Test::Unit::TestCase
 
   def test_options_hashes_override_template
     opts = nil
-    table = Table(%w[a b c])
+    table = Ruport.Table(%w[a b c])
     table.to_html(
       :template => :simple,
       :table_format => {
@@ -81,7 +81,7 @@ class TestRenderHTMLTable < Test::Unit::TestCase
 
   def test_individual_options_override_template
     opts = nil
-    table = Table(%w[a b c])
+    table = Ruport.Table(%w[a b c])
     table.to_html(
       :template => :simple,
       :show_table_headers => true,
@@ -99,7 +99,7 @@ class TestRenderHTMLTable < Test::Unit::TestCase
 end
    
 
-class TestRenderHTMLRow < Test::Unit::TestCase
+class TestRenderHTMLRow < Minitest::Test
   
   def test_render_html_row
     actual = Ruport::Controller::Row.render_html { |r| r.data = [1,2,3] }
@@ -109,7 +109,7 @@ class TestRenderHTMLRow < Test::Unit::TestCase
 end
    
 
-class TestRenderHTMLGroup < Test::Unit::TestCase
+class TestRenderHTMLGroup < Minitest::Test
     
   def test_render_html_group
     group = Ruport::Data::Group.new(:name => 'test',
@@ -117,8 +117,8 @@ class TestRenderHTMLGroup < Test::Unit::TestCase
                                     :column_names => %w[a b c])
     actual = Ruport::Controller::Group.render(:html, :data => group)
     assert_equal "\t<p>test</p>\n"+
-      "\t<table>\n\t\t<tr>\n\t\t\t<th>a</th>\n\t\t\t<th>b</th>"+
-      "\n\t\t\t<th>c</th>\n\t\t</tr>\n\t\t<tr>\n\t\t\t<td>1</td>"+
+      "\t<table>\n\t\t<thead>\n\t\t<tr>\n\t\t\t<th>a</th>\n\t\t\t<th>b</th>"+
+      "\n\t\t\t<th>c</th>\n\t\t</tr>\n\t\t</thead>\n\t\t<tr>\n\t\t\t<td>1</td>"+
       "\n\t\t\t<td>2</td>\n\t\t\t<td>3</td>\n\t\t</tr>\n\t\t<tr>"+
       "\n\t\t\t<td>4</td>\n\t\t\t<td>5</td>\n\t\t\t<td>6</td>\n\t"+
       "\t</tr>\n\t</table>\n", actual
@@ -138,10 +138,10 @@ class TestRenderHTMLGroup < Test::Unit::TestCase
 end
 
 
-class TestRenderHTMLGrouping < Test::Unit::TestCase
+class TestRenderHTMLGrouping < Minitest::Test
 
   def test_render_html_grouping
-    table = Table(%w[a b c]) << [1,2,3] << [1,1,3] << [2,7,9]
+    table = Ruport.Table(%w[a b c]) << [1,2,3] << [1,1,3] << [2,7,9]
     g = Grouping(table,:by => "a")
     actual = Ruport::Controller::Grouping.render(:html, :data => g,
                                                :show_table_headers => false)
@@ -153,27 +153,27 @@ class TestRenderHTMLGrouping < Test::Unit::TestCase
   end
 
   def test_render_html_grouping_with_table_headers
-    table = Table(%w[a b c]) << [1,2,3] << [1,1,3] << [2,7,9]
+    table = Ruport.Table(%w[a b c]) << [1,2,3] << [1,1,3] << [2,7,9]
     g = Grouping(table,:by => "a")
     actual = Ruport::Controller::Grouping.render(:html, :data => g)
 
-    assert_equal "\t<p>1</p>\n\t<table>\n\t\t<tr>\n\t\t\t<th>b</th>\n"+
-                 "\t\t\t<th>c</th>\n\t\t</tr>\n\t\t<tr>\n\t\t\t<td>"+
+    assert_equal "\t<p>1</p>\n\t<table>\n\t\t<thead>\n\t\t<tr>\n\t\t\t<th>b</th>\n"+
+                 "\t\t\t<th>c</th>\n\t\t</tr>\n\t\t</thead>\n\t\t<tr>\n\t\t\t<td>"+
                  "2</td>\n\t\t\t<td>3</td>\n\t\t</tr>\n\t\t<tr>\n\t\t"+
                  "\t<td>1</td>\n\t\t\t<td>3</td>\n\t\t</tr>\n\t</table>\n\n"+
-                 "\t<p>2</p>\n\t<table>\n\t\t<tr>\n\t\t\t<th>b</th>\n\t\t"+
-                 "\t<th>c</th>\n\t\t</tr>\n\t\t<tr>\n\t\t\t<td>7</td>\n"+
+                 "\t<p>2</p>\n\t<table>\n\t\t<thead>\n\t\t<tr>\n\t\t\t<th>b</th>\n\t\t"+
+                 "\t<th>c</th>\n\t\t</tr>\n\t\t</thead>\n\t\t<tr>\n\t\t\t<td>7</td>\n"+
                  "\t\t\t<td>9</td>\n\t\t</tr>\n\t</table>\n\n", actual
   end
 
   def test_render_justified_html_grouping
-    table = Table(%w[a b c]) << [1,2,3] << [1,1,3] << [2,7,9]
+    table = Ruport.Table(%w[a b c]) << [1,2,3] << [1,1,3] << [2,7,9]
     g = Grouping(table,:by => "a")
     actual = Ruport::Controller::Grouping.render(:html, :data => g,
                                                :style => :justified)
 
-    assert_equal "\t<table>\n\t\t<tr>\n\t\t\t<th>a</th>\n\t\t\t<th>b</th>\n"+
-                 "\t\t\t<th>c</th>\n\t\t</tr>\n\t\t<tr>\n\t\t\t"+
+    assert_equal "\t<table>\n\t\t<thead>\n\t\t<tr>\n\t\t\t<th>a</th>\n\t\t\t<th>b</th>\n"+
+                 "\t\t\t<th>c</th>\n\t\t</tr>\n\t\t</thead>\n\t\t<tr>\n\t\t\t"+
                  "<td class=\"groupName\">1</td>\n\t\t\t<td>"+
                  "2</td>\n\t\t\t<td>3</td>\n\t\t</tr>\n\t\t<tr>\n\t\t\t"+
                  "<td>&nbsp;</td>\n\t\t\t<td>1</td>\n\t\t\t<td>3</td>"+
@@ -184,7 +184,7 @@ class TestRenderHTMLGrouping < Test::Unit::TestCase
 end  
      
 
-class TestHTMLFormatterHelpers < Test::Unit::TestCase
+class TestHTMLFormatterHelpers < Minitest::Test
   begin
     require "rubygems"
   rescue LoadError
@@ -196,6 +196,6 @@ class TestHTMLFormatterHelpers < Test::Unit::TestCase
     a = Ruport::Formatter::HTML.new
     assert_equal "<p><strong>foo</strong></p>", a.textile("*foo*")
   rescue LoadError
-    STDERR.puts "Skipping textile test... needs redcloth"
+    STDERR.puts "Skipping textile test... needs RedCloth gem"
   end
 end