fix remove and test

Author: Kevin Wiesmüller

typed/remove_test.go

@@ -117,23 +117,29 @@ func TestRemoveShallowRemovesParents(t *testing.T) {
 		},
 	}
 
-	test = removeItemsWithSchema(test, remove, schema, typeRef, false)
+	tv := TypedValue{
+		value:   test,
+		typeRef: typeRef,
+		schema:  schema,
+	}
+
+	result := tv.RemoveItems(remove)
 
 	expect, err := value.FromJSON([]byte(`{"keep": "value", "keepMap": {"child": "value"}, "keepList": [{"child": "value"}], "removeMap": {"child":"value"}, "removeList": [{"child": "value"}]}`))
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !value.Equals(test, expect) {
+	if !value.Equals(result.AsValue(), expect) {
 		t.Fatalf("unexpected result after remove:\ngot: %v\nexp: %v", test.String(), expect.String())
 	}
 
-	test = removeItemsWithSchema(test, remove, schema, typeRef, true)
+	result = tv.Remove(remove)
 
 	expect, err = value.FromJSON([]byte(`{"keep": "value", "keepMap": {"child": "value"}, "keepList": [{"child": "value"}]}`))
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !value.Equals(test, expect) {
+	if !value.Equals(result.AsValue(), expect) {
 		t.Fatalf("unexpected result after remove:\ngot: %v\nexp: %v", value.ToString(test), value.ToString(expect))
 	}
 }

typed/typed.go

@@ -146,7 +146,7 @@ func (tv TypedValue) RemoveItems(items *fieldpath.Set) *TypedValue {
 
 // Remove removes each provided path from the value.
 func (tv TypedValue) Remove(paths *fieldpath.Set) *TypedValue {
-	tv.value = removeItemsWithSchema(tv.value, paths, tv.schema, tv.typeRef, false)
+	tv.value = removeItemsWithSchema(tv.value, paths, tv.schema, tv.typeRef, true)
 	return &tv
 }