fix(JSON): errors with wrong origin operator

td/check_test.go

@@ -61,6 +61,7 @@ type expectedError struct {
 	Expected expectedErrorMatch
 	Summary  expectedErrorMatch
 	Located  bool
+	Under    expectedErrorMatch
 	Origin   *expectedError
 }
 
@@ -86,6 +87,10 @@ func indent(str string, numSpc int) string {
 	return strings.ReplaceAll(str, "\n", "\n\t"+strings.Repeat(" ", numSpc))
 }
 
+func fullError(err *ctxerr.Error) string {
+	return strings.ReplaceAll(err.Error(), "\n", "\n\t> ")
+}
+
 func cmpErrorStr(t *testing.T, err *ctxerr.Error,
 	got string, expected expectedErrorMatch, fieldName string,
 	args ...any,
@@ -100,7 +105,7 @@ func cmpErrorStr(t *testing.T, err *ctxerr.Error,
 	> %s`,
 			tdutil.BuildTestName(args...),
 			fieldName, indent(got, 10), indent(expected.Exact, 10),
-			strings.ReplaceAll(err.Error(), "\n\t", "\n\t> "))
+			fullError(err))
 		return false
 	}
 
@@ -113,7 +118,7 @@ func cmpErrorStr(t *testing.T, err *ctxerr.Error,
 			tdutil.BuildTestName(args...),
 			fieldName,
 			indent(got, 16), indent(expected.Contain, 16),
-			strings.ReplaceAll(err.Error(), "\n\t", "\n\t> "))
+			fullError(err))
 		return false
 	}
 
@@ -126,7 +131,7 @@ func cmpErrorStr(t *testing.T, err *ctxerr.Error,
 			tdutil.BuildTestName(args...),
 			fieldName,
 			indent(got, 14), indent(expected.Match.String(), 14),
-			strings.ReplaceAll(err.Error(), "\n\t", "\n\t> "))
+			fullError(err))
 		return false
 	}
 
@@ -162,6 +167,16 @@ func matchError(t *testing.T, err *ctxerr.Error, expectedError expectedError,
 		return false
 	}
 
+	// under
+	serr, under := err.Error(), ""
+	if pos := strings.Index(serr, "\n[under operator "); pos > 0 {
+		under = serr[pos+2:]
+		under = under[:strings.IndexByte(under, ']')]
+	}
+	if !cmpErrorStr(t, err, under, expectedError.Under, "[under operator …]", args...) {
+		return false
+	}
+
 	// If expected is a TestDeep, the Location should be set
 	if expectedIsTestDeep {
 		expectedError.Located = true

td/equal.go

@@ -55,7 +55,9 @@ func nilHandler(ctx ctxerr.Context, got, expected reflect.Value) *ctxerr.Error {
 	if expected.IsValid() { // here: !got.IsValid()
 		if expected.Type().Implements(testDeeper) {
 			curOperator := dark.MustGetInterface(expected).(TestDeep)
-			ctx.CurOperator = curOperator
+			if curOperator.GetLocation().IsInitialized() {
+				ctx.CurOperator = curOperator
+			}
 			if curOperator.HandleInvalid() {
 				return curOperator.Match(ctx, got)
 			}
@@ -201,7 +203,9 @@ func deepValueEqual(ctx ctxerr.Context, got, expected reflect.Value) (err *ctxer
 				}
 			}
 
-			ctx.CurOperator = curOperator
+			if curOperator.GetLocation().IsInitialized() {
+				ctx.CurOperator = curOperator
+			}
 			return curOperator.Match(ctx, got)
 		}
 

td/td_json.go

@@ -330,7 +330,7 @@ type tdJSONPlaceholder struct {
 func newJSONNamedPlaceholder(name string, expectedValue any) TestDeep {
 	p := tdJSONPlaceholder{
 		tdJSONSmuggler: tdJSONSmuggler{
-			tdSmugglerBase: newSmugglerBase(expectedValue, 1),
+			tdSmugglerBase: newSmugglerBase(expectedValue, -100), // without location
 		},
 		name: name,
 	}
@@ -344,7 +344,7 @@ func newJSONNamedPlaceholder(name string, expectedValue any) TestDeep {
 func newJSONNumPlaceholder(num uint64, expectedValue any) TestDeep {
 	p := tdJSONPlaceholder{
 		tdJSONSmuggler: tdJSONSmuggler{
-			tdSmugglerBase: newSmugglerBase(expectedValue, 1),
+			tdSmugglerBase: newSmugglerBase(expectedValue, -100), // without location
 		},
 		num: num,
 	}
@@ -397,11 +397,12 @@ type tdJSONEmbedded struct {
 }
 
 func newJSONEmbedded(tdOp TestDeep) TestDeep {
-	return &tdJSONEmbedded{
+	e := tdJSONEmbedded{
 		tdJSONSmuggler: tdJSONSmuggler{
-			tdSmugglerBase: newSmugglerBase(tdOp, 1),
+			tdSmugglerBase: newSmugglerBase(tdOp, -100), // without location
 		},
 	}
+	return &e
 }
 
 func (e *tdJSONEmbedded) MarshalJSON() ([]byte, error) {