Make Remove/Clear on non collections throw

Author: xPaw

ValveKeyValue/ValveKeyValue.Test/EdgeCaseTestCase.cs

@@ -120,6 +120,26 @@ public void AddChildToScalarThrowsInvalidOperationException()
                 Throws.InstanceOf<InvalidOperationException>());
         }
 
+        [Test]
+        public void RemoveFromScalarThrowsInvalidOperationException()
+        {
+            var obj = new KVObject("hello");
+
+            Assert.That(
+                () => obj.Remove("child"),
+                Throws.InstanceOf<InvalidOperationException>());
+        }
+
+        [Test]
+        public void ClearOnScalarThrowsInvalidOperationException()
+        {
+            var obj = new KVObject("hello");
+
+            Assert.That(
+                () => obj.Clear(),
+                Throws.InstanceOf<InvalidOperationException>());
+        }
+
         #endregion
 
         #region Add(KVObject) to non-array throws
@@ -601,23 +621,23 @@ public void IndexerSetOnArrayThrowsInvalidOperationException()
 
         #endregion
 
-        #region Remove on scalar and array returns false
+        #region Remove on scalar and array throws
 
         [Test]
-        public void RemoveOnScalarReturnsFalse()
+        public void RemoveOnScalarThrows()
         {
             var obj = new KVObject("hello");
 
-            Assert.That(obj.Remove("anything"), Is.False);
+            Assert.That(() => obj.Remove("anything"), Throws.InstanceOf<InvalidOperationException>());
         }
 
         [Test]
-        public void RemoveOnArrayReturnsFalse()
+        public void RemoveOnArrayThrows()
         {
             var arr = KVObject.Array();
             arr.Add(1);
 
-            Assert.That(arr.Remove("anything"), Is.False);
+            Assert.That(() => arr.Remove("anything"), Throws.InstanceOf<InvalidOperationException>());
         }
 
         #endregion
@@ -659,17 +679,14 @@ public void IndexerSetNullOnMissingKeyInDictCollectionStoresNullValue()
 
         #endregion
 
-        #region Clear on scalar is no-op
+        #region Clear on scalar throws
 
         [Test]
-        public void ClearOnScalarIsNoOp()
+        public void ClearOnScalarThrows()
         {
             var obj = new KVObject(42);
 
-            obj.Clear();
-
-            Assert.That((int)obj, Is.EqualTo(42));
-            Assert.That(obj.ValueType, Is.EqualTo(KVValueType.Int32));
+            Assert.That(() => obj.Clear(), Throws.InstanceOf<InvalidOperationException>());
         }
 
         #endregion

ValveKeyValue/ValveKeyValue/KVObject.cs

@@ -342,7 +342,7 @@ public bool Remove(string key)
                 Dictionary<string, KVObject> dict => dict.Remove(key),
                 // RemoveAll: removes all entries with this key, not just the first (list-backed collections allow duplicate keys)
                 List<KeyValuePair<string, KVObject>> list when ValueType == KVValueType.Collection => list.RemoveAll(c => c.Key == key) > 0,
-                _ => false,
+                _ => throw new InvalidOperationException($"Cannot remove a named child from a {ValueType} value."),
             };
         }
 
@@ -375,6 +375,8 @@ public void Clear()
                 case List<KVObject> list when ValueType == KVValueType.Array:
                     list.Clear();
                     break;
+                default:
+                    throw new InvalidOperationException($"Cannot clear a {ValueType} value.");
             }
         }