Changeset 209

Timestamp:

06/07/05 05:12:30 (3 years ago)

Author:

ged

Message:

- Fixed $LOAD_PATH
- Imported utils instead of redefining them.
- Unindented.

Files:

• branches/simplest-thing/tests/lib/fmtestcase.rb (modified) (2 diffs)

branches/simplest-thing/tests/lib/fmtestcase.rb

@@ -48 +48 @@
 
 begin
-    basedir = File::dirname( File::dirname(__FILE__) )
+    basedir = File::dirname( File::dirname(File::dirname(__FILE__)) )
     unless $LOAD_PATH.include?( "#{basedir}/lib" )
         $LOAD_PATH.unshift "#{basedir}/lib",
             "#{basedir}/ext"
     end
+
+    require "#{basedir}/utils.rb"
 end
 
@@ -63 +65 @@
 ### The abstract base class for FaerieMUD test cases.
 class FaerieMUD::TestCase < Test::Unit::TestCase
-
-        class << self
-            @methodCounter = 0
-            attr_accessor :methodCounter
+    include UtilityFunctions
+
+    class << self
+        @methodCounter = 0
+        attr_accessor :methodCounter
+    end
+
+
+    ### Inheritance callback -- adds @setupBlocks and @teardownBlocks ivars
+    ### and accessors to the inheriting class.
+    def self::inherited( klass )
+        klass.module_eval {
+            @setupBlocks = []
+            @teardownBlocks = []
+
+            class << self
+                attr_accessor :setupBlocks
+                attr_accessor :teardownBlocks
+            end
+        }
+        klass.methodCounter = 0
+    end
+
+
+    ### Add a setup block for the current testcase
+    def self::addSetupBlock( &block )
+        self.methodCounter += 1
+        newMethodName = "setup_#{self.methodCounter}".intern
+        define_method( newMethodName, &block )
+        self.setupBlocks.push newMethodName
+    end
+
+
+    ### Add a teardown block for the current testcase
+    def self::addTeardownBlock( &block )
+        self.methodCounter += 1
+        newMethodName = "teardown_#{self.methodCounter}".intern
+        define_method( newMethodName, &block )
+        self.teardownBlocks.unshift newMethodName
+    end
+
+
+    #############################################################
+    ### I N S T A N C E   M E T H O D S
+    #############################################################
+
+    ### Forward-compatibility method for namechange in Test::Unit
+    def setup( *args )
+        self.class.setupBlocks.each {|sblock|
+            debugMsg "Calling setup block method #{sblock}"
+            self.send( sblock )
+        }
+        super( *args )
+    end
+    alias_method :set_up, :setup
+
+
+    ### Forward-compatibility method for namechange in Test::Unit
+    def teardown( *args )
+        super( *args )
+        self.class.teardownBlocks.each {|tblock|
+            debugMsg "Calling teardown block method #{tblock}"
+            self.send( tblock )
+        }
+    end
+    alias_method :tear_down, :teardown
+
+
+    ### Skip the current step (called from #setup) with the +reason+ given.
+    def skip( reason=nil )
+        if reason
+            msg = "Skipping %s: %s" % [ @method_name, reason ]
+        else
+            msg = "Skipping %s: No reason given." % @method_name
         end
 
-
-        ### Inheritance callback -- adds @setupBlocks and @teardownBlocks ivars
-        ### and accessors to the inheriting class.
-        def self::inherited( klass )
-            klass.module_eval {
-                @setupBlocks = []
-                @teardownBlocks = []
-
-                class << self
-                    attr_accessor :setupBlocks
-                    attr_accessor :teardownBlocks
-                end
-            }
-            klass.methodCounter = 0
+        $stderr.puts( msg ) if $VERBOSE
+        @method_name = :skipped_test
+    end
+
+
+    def skipped_test # :nodoc:
+    end
+
+
+    ### Add the specified +block+ to the code that gets executed by #setup.
+    def addSetupBlock( &block ); self.class.addSetupBlock( &block ); end
+
+
+    ### Add the specified +block+ to the code that gets executed by #teardown.
+    def addTeardownBlock( &block ); self.class.addTeardownBlock( &block ); end
+
+
+    ### Turn off the stupid 'No tests were specified'
+    def default_test; end
+
+
+    ### Output a header for delimiting tests
+    def printTestHeader( desc )
+        return unless $VERBOSE || $DEBUG
+        message ">>> %s <<<\n" % desc
+    end
+
+
+    ### Try to force garbage collection to start.
+    def collectGarbage
+        a = []
+        1000.times { a << {} }
+        a = nil
+        GC.start
+    end
+
+
+    ### Output the name of the test as it's running if in verbose mode.
+    def run( result )
+        $stderr.puts self.name if $VERBOSE || $DEBUG
+
+        # Support debugging for individual tests
+        olddb = nil
+        if $DebugPattern && $DebugPattern =~ @method_name
+            MUES::Logger::global.outputters <<
+                MUES::Logger::Outputter::create( 'file', $stderr, "STDERR" )
+            MUES::Logger::global.level = :debug
+
+            olddb = $DEBUG
+            $DEBUG = true
         end
-        
-
-        ### Output the specified <tt>msgs</tt> joined together to
-        ### <tt>STDERR</tt> if <tt>$DEBUG</tt> is set.
-        def self::debugMsg( *msgs )
-            return unless $DEBUG
-            self.message "DEBUG>>> %s" % msgs.join('')
+
+        super
+
+        unless olddb.nil?
+            $DEBUG = olddb 
+            MUES::Logger::global.outputters.clear
         end
-
-
-        ### Output the specified <tt>msgs</tt> joined together to
-        ### <tt>STDOUT</tt>.
-        def self::message( *msgs )
-            $stderr.puts msgs.join('')
-            $stderr.flush
-        end
-
-
-        ### Add a setup block for the current testcase
-        def self::addSetupBlock( &block )
-            self.methodCounter += 1
-            newMethodName = "setup_#{self.methodCounter}".intern
-            define_method( newMethodName, &block )
-            self.setupBlocks.push newMethodName
-        end
-
-            
-        ### Add a teardown block for the current testcase
-        def self::addTeardownBlock( &block )
-            self.methodCounter += 1
-            newMethodName = "teardown_#{self.methodCounter}".intern
-            define_method( newMethodName, &block )
-            self.teardownBlocks.unshift newMethodName
-        end
-            
-
-        #############################################################
-        ### I N S T A N C E   M E T H O D S
-        #############################################################
-
-        ### Forward-compatibility method for namechange in Test::Unit
-        def setup( *args )
-            self.class.setupBlocks.each {|sblock|
-                debugMsg "Calling setup block method #{sblock}"
-                self.send( sblock )
-            }
-            super( *args )
-        end
-        alias_method :set_up, :setup
-
-
-        ### Forward-compatibility method for namechange in Test::Unit
-        def teardown( *args )
-            super( *args )
-            self.class.teardownBlocks.each {|tblock|
-                debugMsg "Calling teardown block method #{tblock}"
-                self.send( tblock )
-            }
-        end
-        alias_method :tear_down, :teardown
-
-
-        ### Skip the current step (called from #setup) with the +reason+ given.
-        def skip( reason=nil )
-            if reason
-                msg = "Skipping %s: %s" % [ @method_name, reason ]
-            else
-                msg = "Skipping %s: No reason given." % @method_name
-            end
-
-            $stderr.puts( msg ) if $VERBOSE
-            @method_name = :skipped_test
-        end
-
-
-        def skipped_test # :nodoc:
-        end
-
-
-        ### Add the specified +block+ to the code that gets executed by #setup.
-        def addSetupBlock( &block ); self.class.addSetupBlock( &block ); end
-
-
-        ### Add the specified +block+ to the code that gets executed by #teardown.
-        def addTeardownBlock( &block ); self.class.addTeardownBlock( &block ); end
-
-
-        ### Turn off the stupid 'No tests were specified'
-        def default_test; end
-
-
-        ### Instance alias for the like-named class method.
-        def message( *msgs )
-            self.class.message( *msgs )
-        end
-
-
-        ### Instance alias for the like-named class method
-        def debugMsg( *msgs )
-            self.class.debugMsg( *msgs )
-        end
-
-
-        ### Output a separator line made up of <tt>length</tt> of the specified
-        ### <tt>char</tt>.
-        def writeLine( length=75, char="-" )
-            $stderr.puts "\r" + (char * length )
-        end
-
-
-        ### Output a header for delimiting tests
-        def printTestHeader( desc )
-            return unless $VERBOSE || $DEBUG
-            message ">>> %s <<<" % desc
-        end
-
-
-        ### Try to force garbage collection to start.
-        def collectGarbage
-            a = []
-            1000.times { a << {} }
-            a = nil
-            GC.start
-        end
-
-
-        ### Output the name of the test as it's running if in verbose mode.
-        def run( result )
-            $stderr.puts self.name if $VERBOSE || $DEBUG
-
-            # Support debugging for individual tests
-            olddb = nil
-            if $DebugPattern && $DebugPattern =~ @method_name
-                MUES::Logger::global.outputters <<
-                    MUES::Logger::Outputter::create( 'file', $stderr, "STDERR" )
-                MUES::Logger::global.level = :debug
-
-                olddb = $DEBUG
-                $DEBUG = true
-            end
-            
-            super
-
-            unless olddb.nil?
-                $DEBUG = olddb 
-                MUES::Logger::global.outputters.clear
-            end
-        end
-
-
-
-        #############################################################
-        ### E X T R A   A S S E R T I O N S
-        #############################################################
-
-        ### Negative of assert_respond_to
-        def assert_not_respond_to( obj, meth )
-            msg = "%s expected NOT to respond to '%s'" %
-                [ obj.inspect, meth ]
-            assert_block( msg ) {
-                !obj.respond_to?( meth )
-            }
-        rescue Test::Unit::AssertionFailedError => err
-            cutframe = err.backtrace.reverse.find {|frame|
-                /assert_not_respond_to/ =~ frame
-            }
-            firstIdx = (err.backtrace.rindex( cutframe )||0) + 1
-            Kernel::raise( err, err.message, err.backtrace[firstIdx..-1] )
-        end
-
-
-        ### Assert that the instance variable specified by +sym+ of an +object+
-        ### is equal to the specified +value+. The '@' at the beginning of the
-        ### +sym+ will be prepended if not present.
-        def assert_ivar_equal( value, object, sym )
-            sym = "@#{sym}".intern unless /^@/ =~ sym.to_s
-            msg = "Instance variable '%s'\n\tof <%s>\n\texpected to be <%s>\n" %
-                [ sym, object.inspect, value.inspect ]
-            msg += "\tbut was: <%s>" % object.instance_variable_get(sym)
-            assert_block( msg ) {
-                value == object.instance_variable_get(sym)
-            }
-        rescue Test::Unit::AssertionFailedError => err
-            cutframe = err.backtrace.reverse.find {|frame|
-                /assert_ivar_equal/ =~ frame
-            }
-            firstIdx = (err.backtrace.rindex( cutframe )||0) + 1
-            Kernel::raise( err, err.message, err.backtrace[firstIdx..-1] )
-        end
-
-
-        ### Assert that the specified +object+ has an instance variable which
-        ### matches the specified +sym+. The '@' at the beginning of the +sym+
-        ### will be prepended if not present.
-        def assert_has_ivar( sym, object )
-            sym = "@#{sym}" unless /^@/ =~ sym.to_s
-            msg = "Object <%s> expected to have an instance variable <%s>" %
-                [ object.inspect, sym ]
-            assert_block( msg ) {
-                object.instance_variables.include?( sym.to_s )
-            }
-        rescue Test::Unit::AssertionFailedError => err
-            cutframe = err.backtrace.reverse.find {|frame|
-                /assert_has_ivar/ =~ frame
-            }
-            firstIdx = (err.backtrace.rindex( cutframe )||0) + 1
-            Kernel::raise( err, err.message, err.backtrace[firstIdx..-1] )
-        end
-
-        
-        ### Override the stupid deprecated #assert_not_nil so when it
-        ### disappears, code doesn't break.
-        def assert_not_nil( obj, msg=nil )
-            msg ||= "<%p> expected to not be nil." % obj
-            assert_block( msg ) { !obj.nil? }
-        rescue Test::Unit::AssertionFailedError => err
-            cutframe = err.backtrace.reverse.find {|frame|
-                /assert_not_nil/ =~ frame
-            }
-            firstIdx = (err.backtrace.rindex( cutframe )||0) + 1
-            Kernel::raise( err, err.message, err.backtrace[firstIdx..-1] )
-        end
-
+    end
+
+
+
+    #############################################################
+    ### E X T R A   A S S E R T I O N S
+    #############################################################
+
+    ### Negative of assert_respond_to
+    def assert_not_respond_to( obj, meth )
+        msg = "%s expected NOT to respond to '%s'" %
+            [ obj.inspect, meth ]
+        assert_block( msg ) {
+            !obj.respond_to?( meth )
+        }
+    rescue Test::Unit::AssertionFailedError => err
+        cutframe = err.backtrace.reverse.find {|frame|
+            /assert_not_respond_to/ =~ frame
+        }
+        firstIdx = (err.backtrace.rindex( cutframe )||0) + 1
+        Kernel::raise( err, err.message, err.backtrace[firstIdx..-1] )
+    end
+
+
+    ### Assert that the instance variable specified by +sym+ of an +object+
+    ### is equal to the specified +value+. The '@' at the beginning of the
+    ### +sym+ will be prepended if not present.
+    def assert_ivar_equal( value, object, sym )
+        sym = "@#{sym}".intern unless /^@/ =~ sym.to_s
+        msg = "Instance variable '%s'\n\tof <%s>\n\texpected to be <%s>\n" %
+            [ sym, object.inspect, value.inspect ]
+        msg += "\tbut was: <%s>" % object.instance_variable_get(sym)
+        assert_block( msg ) {
+            value == object.instance_variable_get(sym)
+        }
+    rescue Test::Unit::AssertionFailedError => err
+        cutframe = err.backtrace.reverse.find {|frame|
+            /assert_ivar_equal/ =~ frame
+        }
+        firstIdx = (err.backtrace.rindex( cutframe )||0) + 1
+        Kernel::raise( err, err.message, err.backtrace[firstIdx..-1] )
+    end
+
+
+    ### Assert that the specified +object+ has an instance variable which
+    ### matches the specified +sym+. The '@' at the beginning of the +sym+
+    ### will be prepended if not present.
+    def assert_has_ivar( sym, object )
+        sym = "@#{sym}" unless /^@/ =~ sym.to_s
+        msg = "Object <%s> expected to have an instance variable <%s>" %
+            [ object.inspect, sym ]
+        assert_block( msg ) {
+            object.instance_variables.include?( sym.to_s )
+        }
+    rescue Test::Unit::AssertionFailedError => err
+        cutframe = err.backtrace.reverse.find {|frame|
+            /assert_has_ivar/ =~ frame
+        }
+        firstIdx = (err.backtrace.rindex( cutframe )||0) + 1
+        Kernel::raise( err, err.message, err.backtrace[firstIdx..-1] )
+    end
+
+
+    ### Override the stupid deprecated #assert_not_nil so when it
+    ### disappears, code doesn't break.
+    def assert_not_nil( obj, msg=nil )
+        msg ||= "<%p> expected to not be nil." % obj
+        assert_block( msg ) { !obj.nil? }
+    rescue Test::Unit::AssertionFailedError => err
+        cutframe = err.backtrace.reverse.find {|frame|
+            /assert_not_nil/ =~ frame
+        }
+        firstIdx = (err.backtrace.rindex( cutframe )||0) + 1
+        Kernel::raise( err, err.message, err.backtrace[firstIdx..-1] )
+    end
 
 end # class FaerieMUD::TestCase