From 7884fae7af29e6cf7b862b270501685ff39ce137 Mon Sep 17 00:00:00 2001
From: Norman Clarke <norman@njclarke.com>
Date: Thu, 23 May 2013 09:41:27 -0300
Subject: [PATCH] Revert "Merge pull request #684 from
 teeparham/minitest_warnings"

This reverts commit a1f3abcf332c42f3a65e2e5f70115e0bf344ccf1, reversing
changes made to 1c0f1385dac93077e729688a794010aad047c882.
---
 test/engine_test.rb   |  2 +-
 test/filters_test.rb  | 14 +++++++-------
 test/helper_test.rb   |  2 +-
 test/parser_test.rb   |  2 +-
 test/template_test.rb |  2 +-
 test/test_helper.rb   |  2 +-
 test/util_test.rb     |  2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/engine_test.rb b/test/engine_test.rb
index 6794f0aa..fbc94277 100644
--- a/test/engine_test.rb
+++ b/test/engine_test.rb
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'test_helper'
 
-class EngineTest < MiniTest::Test
+class EngineTest < MiniTest::Unit::TestCase
   # A map of erroneous Haml documents to the error messages they should produce.
   # The error messages may be arrays;
   # if so, the second element should be the line number that should be reported for the error.
diff --git a/test/filters_test.rb b/test/filters_test.rb
index e664024a..2914511b 100644
--- a/test/filters_test.rb
+++ b/test/filters_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class FiltersTest < MiniTest::Test
+class FiltersTest < MiniTest::Unit::TestCase
   test "should be registered as filters when including Haml::Filters::Base" do
     begin
       refute Haml::Filters.defined.has_key? "bar"
@@ -111,7 +111,7 @@ class FiltersTest < MiniTest::Test
 
 end
 
-class ErbFilterTest < MiniTest::Test
+class ErbFilterTest < MiniTest::Unit::TestCase
   test "multiline expressions should work" do
     html = "foobarbaz\n"
     haml = %Q{:erb\n  <%= "foo" +\n      "bar" +\n      "baz" %>}
@@ -132,7 +132,7 @@ class ErbFilterTest < MiniTest::Test
 
 end
 
-class JavascriptFilterTest < MiniTest::Test
+class JavascriptFilterTest < MiniTest::Unit::TestCase
   test "should interpolate" do
     scope = Object.new.instance_eval {foo = "bar"; nil if foo; binding}
     haml  = ":javascript\n  \#{foo}"
@@ -178,7 +178,7 @@ class JavascriptFilterTest < MiniTest::Test
   end
 end
 
-class CSSFilterTest < MiniTest::Test
+class CSSFilterTest < MiniTest::Unit::TestCase
   test "should wrap output in CDATA and a CSS tag when output is XHTML" do
     html = "<style type='text/css'>\n  /*<![CDATA[*/\n    foo\n  /*]]>*/\n</style>\n"
     haml = ":css\n  foo"
@@ -217,7 +217,7 @@ class CSSFilterTest < MiniTest::Test
   end
 end
 
-class CDATAFilterTest < MiniTest::Test
+class CDATAFilterTest < MiniTest::Unit::TestCase
   test "should wrap output in CDATA tag" do
     html = "<![CDATA[\n    foo\n]]>\n"
     haml = ":cdata\n  foo"
@@ -225,7 +225,7 @@ class CDATAFilterTest < MiniTest::Test
   end
 end
 
-class EscapedFilterTest < MiniTest::Test
+class EscapedFilterTest < MiniTest::Unit::TestCase
   test "should escape ampersands" do
     html = "&amp;\n"
     haml = ":escaped\n  &"
@@ -233,7 +233,7 @@ class EscapedFilterTest < MiniTest::Test
   end
 end
 
-class RubyFilterTest < MiniTest::Test
+class RubyFilterTest < MiniTest::Unit::TestCase
   test "can write to haml_io" do
     haml = ":ruby\n  haml_io.puts 'hello'\n"
     html = "hello\n"
diff --git a/test/helper_test.rb b/test/helper_test.rb
index f94f0ad2..7df8f3ba 100644
--- a/test/helper_test.rb
+++ b/test/helper_test.rb
@@ -16,7 +16,7 @@ module Haml::Helpers
   end
 end
 
-class HelperTest < MiniTest::Test
+class HelperTest < MiniTest::Unit::TestCase
   Post = Struct.new('Post', :body, :error_field, :errors)
   class PostErrors
     def on(name)
diff --git a/test/parser_test.rb b/test/parser_test.rb
index f86385a2..a9767e4a 100644
--- a/test/parser_test.rb
+++ b/test/parser_test.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Haml
-  class ParserTest < MiniTest::Test
+  class ParserTest < MiniTest::Unit::TestCase
 
     test "should raise error for 'else' at wrong indent level" do
       begin
diff --git a/test/template_test.rb b/test/template_test.rb
index eb286c73..d6f16122 100644
--- a/test/template_test.rb
+++ b/test/template_test.rb
@@ -38,7 +38,7 @@ class DummyController
   end
 end
 
-class TemplateTest < MiniTest::Test
+class TemplateTest < MiniTest::Unit::TestCase
   TEMPLATE_PATH = File.join(File.dirname(__FILE__), "templates")
   TEMPLATES = %w{          very_basic        standard    helpers
     whitespace_handling    original_engine   list        helpful
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 6a274aa3..187efb3a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -36,7 +36,7 @@ module Declarative
   end
 end
 
-class MiniTest::Test
+class MiniTest::Unit::TestCase
 
   extend Declarative
 
diff --git a/test/util_test.rb b/test/util_test.rb
index 1b82608a..310b28de 100644
--- a/test/util_test.rb
+++ b/test/util_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class UtilTest < MiniTest::Test
+class UtilTest < MiniTest::Unit::TestCase
   include Haml::Util
 
   def test_powerset