Changeset 215

Timestamp:

06/08/05 05:24:39 (3 years ago)

Author:

ged

Message:

- Moved mutex from Entity

Location:

branches/simplest-thing

Files:

• lib/fm/gameobject.rb (modified) (5 diffs)
• tests/gameobject.tests.rb (modified) (1 diff)

branches/simplest-thing/lib/fm/gameobject.rb

@@ -24 +24 @@
 require 'digest/md5'
 require 'logger'
+require 'sync'
 
 require 'fm/mixins'
@@ -42 +43 @@
     # SVN Id
     SVNId = %q$Id$
-
-    # SVN URL
-    SVNURL = %q$URL$
 
     # The total number of "attribution" points for this object. 
@@ -164 +162 @@
         super()
 
-        # Add unique ID and rev
+        # Add unique ID, rev, and mutex
         @id = self.class::makeObjectId( self )
         @rev = self.class::rev
+        @mutex = Sync::new
 
         # Call setters for named arguments
@@ -175 +174 @@
 
 
-    ### Copy initializer -- generate a unique id for cloned objects.
+    ### Copy initializer -- generate a unique id and mutex for cloned objects.
     def initialize_copy( original )
         super
         @id = self.class::makeObjectId( self )
+        @mutex = Sync::new
         self.log.debug "Cloned #{self.class.name} #{original.id}."
     end
@@ -193 +193 @@
     # the time of its creation or last upgrade.
     attr_reader :rev
+
+    # The Sync mutex for this object
+    attr_reader :mutex
+
 
 

branches/simplest-thing/tests/gameobject.tests.rb

@@ -163 +163 @@
         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