Items - DeactivateTwice

brian-dot-net · Dec 12, 2018 · 641d234 · 641d234
1 parent fdb067b
commit 641d234
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/core/src/Items.cs b/core/src/Items.cs
@@ -33,7 +33,13 @@ public void Activate()
 
         public void Deactivate()
         {
+            if (this.sub == null)
+            {
+                throw new InvalidOperationException("Cannot Deactivate before Activate.");
+            }
+
             this.sub.Dispose();
+            this.sub = null;
         }
 
         public void Look()

diff --git a/core/test/ItemsTest.cs b/core/test/ItemsTest.cs
@@ -202,6 +202,19 @@ public void ActivateTwice()
             act.Should().Throw<InvalidOperationException>().WithMessage("Cannot Activate again.");
         }
 
+        [Fact]
+        public void DeactivateTwice()
+        {
+            MessageBus bus = new MessageBus();
+            Items items = new Items(bus);
+
+            items.Activate();
+            items.Deactivate();
+            Action act = () => items.Deactivate();
+
+            act.Should().Throw<InvalidOperationException>().WithMessage("Cannot Deactivate before Activate.");
+        }
+
         private sealed class TestItemNoActions : Item
         {
             public override string ShortDescription => "a dull item";