Changeset 275

Timestamp:

06/18/07 09:22:18 (17 months ago)

Author:

ged

Message:

Converted a few more specs

Location:

trunk

Files:

• . (modified) (1 prop)
• acceptance/epic4.rb (modified) (8 diffs)
• docs/smoke_and_mirrors.rb (modified) (1 diff)
• lib/fm/gameobject.rb (modified) (4 diffs)
• spec/event_spec.rb (modified) (1 diff)
• spec/gameobject_spec.rb (moved) (moved from trunk/spec/gameobject.tests.rb) (2 diffs)
• spec/mixins_spec.rb (added)

trunk

@@ -1 +1 @@
 test.log
 .glimpse*
+pkg
+coverage
+artifacts

@@ -1 +1 @@
 test.log
 .glimpse*
+pkg
+coverage
+artifacts

trunk/acceptance/epic4.rb

@@ -26 +26 @@
 
     %w{lib redist}.each do |dir|
-        $LOAD_PATH.unshift( File::join($basedir, dir) )
+        $LOAD_PATH.unshift( File.join($basedir, dir) )
     end
 }
@@ -40 +40 @@
     def invoke( instigator, origin=nil )
         origin ||= instigator
-        return FaerieMUD::AuditoryEvent::new(
+        return FaerieMUD::AuditoryEvent.new(
             :instigator => instigator,
             :origin => origin,
@@ -53 +53 @@
     def invoke( instigator, origin=nil )
         origin ||= instigator
-        return FaerieMUD::AuditoryEvent::new(
+        return FaerieMUD::AuditoryEvent.new(
             :instigator => instigator,
             :origin => origin,
@@ -76 +76 @@
         @tickCount = 0
         @verbs = {
-            :tick => TickVerb::instance,
-            :chime => ChimeVerb::instance,
+            :tick => TickVerb.instance,
+            :chime => ChimeVerb.instance,
         }
         @count = 120
@@ -89 +89 @@
     ### Start a new thread, start ticking in it and return the thread.  
     def start
-        @thread = Thread::new do
+        @thread = Thread.new do
             Thread.current.abort_on_exception = true
             @count.times do
@@ -125 +125 @@
 
     def invoke( speaker, language, words )
-        return FaerieMUD::SpeechEvent::new(
+        return FaerieMUD::SpeechEvent.new(
             :instigator => speaker,
             :origin => speaker,
@@ -143 +143 @@
         @onDuty = true
         @chimeCount = 0
-        @sayVerb = SayVerb::instance
+        @sayVerb = SayVerb.instance
 
         super
@@ -223 +223 @@
 if $0 == __FILE__
     if $DEBUG
-        FaerieMUD::Logger::global.outputters <<
-            FaerieMUD::Logger::Outputter::create( 'file', $stderr, "STDERR" )
-        FaerieMUD::Logger::global.level = :debug
+        FaerieMUD::Logger.global.outputters <<
+            FaerieMUD::Logger::Outputter.create( 'file', $stderr, "STDERR" )
+        FaerieMUD::Logger.global.level = :debug
     end
 
     # Set up the scene 
-    topArea = FaerieMUD::Area::new
-    punchbag = QuasiOrc::new
-    clock = Clock::new
-    observer = Observer::new
+    topArea = FaerieMUD::Area.new
+    punchbag = QuasiOrc.new
+    clock = Clock.new
+    observer = Observer.new
 
     # Put the clock and punchbag into the void

trunk/docs/smoke_and_mirrors.rb

@@ -157 +157 @@
     Readline.readline
     print "  Password: "
-    
 
     formatter = Text::Format.new \

trunk/lib/fm/gameobject.rb

@@ -60 +60 @@
     # The authors hash for this class
     @authors = Hash::new( 0 )
+    @contributors = []
     class << self
         attr_reader :authors
@@ -77 +78 @@
         unless self.instance_variables.include?( "@authors" )
             self.instance_variable_set( :@authors, Hash::new(0) )
+            self.instance_variable_set( :@contributors, [] )
             class << self
                 attr_reader :authors
@@ -85 +87 @@
 
     ### Add one or more authors to the contributors for the current class.
-    def self::contributors( *contributors )
+    def self::contributors( *userids)
         self.add_authors_data
-        chart = self.distribute_points( *contributors )
+        return @contributors if userids.empty?
+        @contributors.replace( userids )
+        chart = self.distribute_points( *userids )
         self.authors.replace( chart )
     end
@@ -168 +172 @@
 
     # This must come after the declaration of the contributors method above.
-    contributors :ged, :stillflame
+    contributors :ged, :stillflame, :phaedrus
 
     ### Initialize a new FaerieMUD::GameObject. Arguments in the 

trunk/spec/event_spec.rb

@@ -48 +48 @@
 #                   |
 #              LunarEvent
-#                   | ____ Remarkable (mixin)
-#                   |/
-#                   |\____ AstrologicallySignificant (mixin)
 #                   |
 #           LunarEclipseEvent

trunk/spec/gameobject_spec.rb

@@ -1 +1 @@
 #!/usr/bin/ruby -w
 #
-# Unit test for the FaerieMUD::GameObject class
+# Specification for the FaerieMUD::GameObject class
 # $Id$
 #
-# Copyright (c) 2003-2005 The FaerieMUD Consortium.
+# Copyright (c) 2003-2007 The FaerieMUD Consortium.
 # 
 
@@ -12 +12 @@
     $LOAD_PATH.unshift "#{basedir}/lib" unless
         $LOAD_PATH.include?( "#{basedir}/lib" )
-    $LOAD_PATH.unshift "#{basedir}/tests/lib" unless
-        $LOAD_PATH.include?( "#{basedir}/tests/lib" )
-
-    require 'fmtestcase'
+    $LOAD_PATH.unshift "#{basedir}/spec/lib" unless
+        $LOAD_PATH.include?( "#{basedir}/spec/lib" )
 end
 
+require 'spec/runner'
 require 'fm/gameobject'
 
-### Test case for the FaerieMUD::GameObject class and associated classes/modules.
-class GameObjectTestCase < FaerieMUD::TestCase
 
-    TestingAuthorNames = %w{ged scotus stillflame rhil reltuk bhaij eeeeee}
+describe FaerieMUD::GameObject, " with no contributors" do
+
+    before( :all ) do
+        @class = Class.new( FaerieMUD::GameObject )
+    end
+    
+    it "doesn't give contributor points to anyone if no contributors are list" do
+        @class.authors.should be_an_instance_of( Hash )
+        @class.authors.should be_empty()
+    end
+    
+end
+
+describe FaerieMUD::GameObject, " with one contributor" do
+
+    before( :all ) do
+        @class = Class.new( FaerieMUD::GameObject ) do
+            contributors :phaedrus
+        end
+    end
+    
+    it "gives all contributor points for the class to the contributor" do
+        @class.authors.should be_an_instance_of( Hash )
+        @class.should have(1).authors
+        @class.authors[:phaedrus].should == 100
+    end
+    
+end
 
 
-    #################################################################
-    ### E X A M P L E S
-    #################################################################
+describe FaerieMUD::GameObject, " with two contributors" do
 
-    ### Instance test
-    def test_00_Instance
-        printTestHeader "GameObject: Instantiation"
-        rval, derivClass, derivObject = nil, nil, nil
+    before( :all ) do
+        @class = Class.new( FaerieMUD::GameObject ) do
+            contributors :ged, :phaedrus
+        end
+    end
+    
 
-        # Make sure the class is defined, but not instantiatable.
-        assert_instance_of Class, FaerieMUD::GameObject
-        assert_nothing_raised {
-            rval = FaerieMUD::GameObject::new
-        }
-        assert_instance_of FaerieMUD::GameObject, rval
+    it "gives contributor points to each contributor" do
+        @class.should have(2).authors
+        @class.authors[:ged].should > 0
+        @class.authors[:phaedrus].should > 0
+    end
+    
+    it "gives the second contributor listed less contributor points" do
+        @class.authors[ @class.contributors.first ].should >
+            @class.authors[ @class.contributors.last ]
+    end
+    
+end
 
-        # Make sure other classes can inherit from it and be instantiated.
-        assert_nothing_raised {
-            derivClass = Class::new( FaerieMUD::GameObject )
-            derivObject = derivClass::new
-        }
-
-        assert_kind_of FaerieMUD::GameObject, derivObject
+describe "An instance of a FaerieMUD::GameObject" do
+    before( :all ) do
+        @class = Class.new( FaerieMUD::GameObject ) do
+            contributors :mcfly
+        end
     end
+    
+    it "knows what an author's contributor points for its class is" do
+        @class.new.contribution( :mcfly ).should be_an_instance_of( Fixnum )
+    end
+    
+    it "generates new IDs for clones" do
+        obj = @class.new
+        obj.id.should_not == obj.clone.id
+    end
+    
+    it "creates a new mutex for clones" do
+        obj = @class.new
+        obj.mutex.should_not == obj.clone.mutex
+    end
+    
+end
 
 
-    ### Test the authors hash
-    def test_10_authors
-        printTestHeader "GameObject: Authors"
-
-        derivClass = Class::new( FaerieMUD::GameObject )
-        rval = nil
-        
-        TestingAuthorNames.each {|name|
-            [ FaerieMUD::GameObject, derivClass ].each {|klass|
-                assert_nothing_raised {
-                    rval = klass.authors[name]
-                }
-                assert_kind_of Integer, rval
-            }
-        }
+describe FaerieMUD::GameObject do
+    before( :all ) do
+        @class = Class.new( FaerieMUD::GameObject ) do
+            SVNRev = 'Rev: 270 '
+        end
     end
-
-
-    ### Test the contribution method
-    def test_11_contribution
-        printTestHeader "GameObject: Contribution"
-
-        derivClass = Class::new( FaerieMUD::GameObject )
-        derivObj = derivClass::new
-        rval = nil
-        
-        TestingAuthorNames.each {|name|
-            assert_nothing_raised {
-                rval = derivObj.contribution( name )
-            }
-            assert_kind_of Integer, rval
-        }
+    
+    
+    it "can extract a numeric version from its subversion rev number" do
+        @class.rev.should == 270
     end
-
-
-    ### Test the contributors class method
-    def test_20_contributors
-        printTestHeader "GameObject: Contributors"
-        derivClass, derivObject, rval, lastval, lastname = [nil] * 5
-
-        assert_nothing_raised {
-            derivClass = Class::new( FaerieMUD::GameObject ) {
-                contributors :ged, :scotus, :stillflame,
-                    :rhil, :reltuk, :bhaij
-            }
-        }
-        assert_nothing_raised { derivObject = derivClass::new }
-
-        %w{ged stillflame scotus rhil reltuk bhaij eeeeee}.each {|name|
-            assert_nothing_raised {
-                rval = derivObject.contribution( name )
-            }
-
-            debug_msg "Last contributor's contribution (%s/%d); this one's (%s/%d)" %
-                [ lastname, lastval, name, rval ]
-
-            assert_kind_of Integer, rval
-            assert lastval.nil? || lastval >= rval,
-                "Last contributor's contribution (%s/%d) was greater than "\
-                "this one's (%s/%d)" %
-                [ lastname, lastval, name, rval ]
-
-            lastname = name
-            lastval = rval
-        }
-    end
-
-
-    ### Test versioning
-    def test_30_versioning
-        printTestHeader "GameObject: versioning"
-        obj = rev = rval = nil
-
-        derivClass = Class::new( FaerieMUD::GameObject ) {
-            self::const_set( :SVNRev, %q{Rev: 101 } )
-        }
-
-        # Class revision
-        assert_nothing_raised { rev = derivClass::rev }
-        assert_equal 101, rev
-
-        # Instance revision
-        obj = derivClass::new
-        assert_nothing_raised { rval = obj.rev }
-        assert_equal rev, rval
-    end
-
-
-    ### Test the to_html method
-    def test_50_toHtml
-        printTestHeader "GameObject: to_html"
-
-        derivClass = Class::new( FaerieMUD::GameObject ) {
-            def initialize
-                @test1 = "foo"
-                @test2 = "<foo atchoo"
-                @test3 = "Other & random >> stuff"
-
-                super
-            end
-        }
-        derivObj = derivClass::new
-        rval = nil
-
-        assert_nothing_raised { rval = derivObj.to_html }
-        assert_equal rval.count("<"), rval.count(">"),
-            "Angle-bracket balance"
-        assert_match( /@test1/, rval, "@test1 ivar" )
-        assert_match( /@test2/, rval, "@test2 ivar" )
-        assert_match( /@test3/, rval, "@test3 ivar" )
-    end
-
-
-    ### Cloned objects should get unique ids and mutexen
-    def test_clonedObjectsShouldHaveUniqueIds
-        printTestHeader "GameObject: cloned objects should have unique ids and mutexes"
-
-        derivClass = Class::new( FaerieMUD::GameObject )
-        derivObj = derivClass::new
-        clonedObj = nil
-
-        assert_nothing_raised do
-            clonedObj = derivObj.clone
-        end
-
-        assert_not_same derivObj.id, clonedObj.id
-        assert_not_same derivObj.mutex, clonedObj.mutex
-    end
+end
 
 
 
-
-end
-

@@ -1 +1 @@
 test.log
 .glimpse*
+pkg
+coverage
+artifacts