Changeset 37789 for lang/csharp

Timestamp:

06/02/10 18:38:41 (3 years ago)

Author:

isaisstillalive

Message:

: Card.Moveの結果を返すようにした

Location:

lang/csharp/DominionEngine

Files:

• DominionEngine.CardInfo.Test/DDL/CardTest.cs (modified) (1 diff)
• DominionEngine.CardInfo/DDL/Card.cs (modified) (1 diff)

lang/csharp/DominionEngine/DominionEngine.CardInfo.Test/DDL/CardTest.cs

@@ -51 +51 @@
             };
 
-            card.Move(CardPosition.Discard(0));
+            bool result = card.Move(CardPosition.Discard(0));
+
+            Assert.That(result, Is.True);
 
             Assert.That(movingSender, Is.SameAs(card));
             Assert.That(movingArgs.From, Is.SameAs(card));
             Assert.That(movingArgs.ToPosition, Is.EqualTo(CardPosition.Discard(0)));
+        }
+
+        [Test]
+        public void Move_NoMove()
+        {
+            Card card = new Card<Copper>(CardPosition.Hand(0));
+
+            object movingSender = null;
+            Card.MovingEventArgs movingArgs = null;
+            Card.Moving += (sender, e) =>
+            {
+                movingSender = sender;
+                movingArgs = e;
+            };
+
+            bool result = card.Move(CardPosition.Hand(0));
+
+            Assert.That(result, Is.False);
+
+            Assert.That(movingSender, Is.Null);
+            Assert.That(movingArgs, Is.Null);
         }
 

lang/csharp/DominionEngine/DominionEngine.CardInfo/DDL/Card.cs

@@ -72 +72 @@
         /// </summary>
         /// <param name="toPosition">移動先の場所</param>
-        public void Move(CardPosition toPosition)
+        public bool Move(CardPosition toPosition)
         {
+            if (Position == toPosition) return false;
+
             Moving(this, new MovingEventArgs(this, toPosition));
+            return true;
         }