filter enhancements

tools/search/simple_field_resolver_test.go

@@ -61,7 +61,7 @@ func TestSimpleFieldResolverResolve(t *testing.T) {
 	}
 
 	for i, s := range scenarios {
-		name, params, err := r.Resolve(s.fieldName)
+		r, err := r.Resolve(s.fieldName)
 
 		hasErr := err != nil
 		if hasErr != s.expectError {
@@ -69,13 +69,17 @@ func TestSimpleFieldResolverResolve(t *testing.T) {
 			continue
 		}
 
-		if name != s.expectName {
-			t.Errorf("(%d) Expected name %q, got %q", i, s.expectName, name)
+		if hasErr {
+			continue
+		}
+
+		if r.Identifier != s.expectName {
+			t.Errorf("(%d) Expected r.Identifier %q, got %q", i, s.expectName, r.Identifier)
 		}
 
 		// params should be empty
-		if len(params) != 0 {
-			t.Errorf("(%d) Expected 0 params, got %v", i, params)
+		if len(r.Params) != 0 {
+			t.Errorf("(%d) Expected 0 r.Params, got %v", i, r.Params)
 		}
 	}
 }