change error message format

Signed-off-by: kpango <[email protected]>
vdaas · Sep 7, 2020 · 39b09d3 · 39b09d3
1 parent d23ea5a
commit 39b09d3
Show file tree

Hide file tree

Showing 365 changed files with 3,432 additions and 3,410 deletions.
diff --git a/assets/test/templates/common/function.tmpl b/assets/test/templates/common/function.tmpl
@@ -54,12 +54,12 @@ func {{ .TestName }}(t *testing.T) {
 
         {{- if .ReturnsError }}
             if !errors.Is(err, w.err) {
-                return errors.Errorf("got error = %v, want %v", err, w.err)
+                return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
             }
         {{- end }}
         {{- range .TestResults }} {{ $want := Want . }} {{ $got := Got . }}
             if !reflect.DeepEqual({{ $got }}, w.{{ $want }}) {
-                return errors.Errorf("got = %v, want %v", {{ $got }}, w.{{ $want }})
+                return errors.Errorf("got: \"%v\",\twant: \"%v\"", {{ $got }}, w.{{ $want }})
             }
         {{- end }}
         return nil

diff --git a/assets/test/templates/option/function.tmpl b/assets/test/templates/option/function.tmpl
@@ -52,10 +52,10 @@ func {{ .TestName }}(t *testing.T) {
     /*
     defaultCheckFunc := func(w want, obj *T, err error) error {
         if !errors.Is(err, w.err) {
-            return errors.Errorf("got error = %v, want %v", err, w.err)
+            return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
         }
         if !reflect.DeepEqual(obj, w.obj) {
-            return errors.Errorf("got = %v, want %v", obj, w.obj)
+            return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.obj)
         }
         return nil
     }
@@ -65,7 +65,7 @@ func {{ .TestName }}(t *testing.T) {
     /*
     defaultCheckFunc := func(w want, obj *T) error {
         if !reflect.DeepEqual(obj, w.obj) {
-            return errors.Errorf("got = %v, want %v", obj, w.obj)
+            return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.obj)
         }
         return nil
     }

diff --git a/hack/benchmark/core/benchmark/benchmark_test.go b/hack/benchmark/core/benchmark/benchmark_test.go
@@ -44,7 +44,7 @@ func TestNew(t *testing.T) {
 	}
 	defaultCheckFunc := func(w want, got Benchmark) error {
 		if !reflect.DeepEqual(got, w.want) {
-			return errors.Errorf("got = %v, want %v", got, w.want)
+			return errors.Errorf("got: \"%v\",\twant: \"%v\"", got, w.want)
 		}
 		return nil
 	}

diff --git a/hack/benchmark/core/benchmark/option_test.go b/hack/benchmark/core/benchmark/option_test.go
@@ -48,10 +48,10 @@ func TestWithName(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T, err error) error {
 	       if !errors.Is(err, w.err) {
-	           return errors.Errorf("got error = %v, want %v", err, w.err)
+	           return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
 	       }
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.obj)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.obj)
 	       }
 	       return nil
 	   }
@@ -61,7 +61,7 @@ func TestWithName(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T) error {
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.c)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.c)
 	       }
 	       return nil
 	   }
@@ -161,10 +161,10 @@ func TestWithStrategy(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T, err error) error {
 	       if !errors.Is(err, w.err) {
-	           return errors.Errorf("got error = %v, want %v", err, w.err)
+	           return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
 	       }
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.obj)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.obj)
 	       }
 	       return nil
 	   }
@@ -174,7 +174,7 @@ func TestWithStrategy(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T) error {
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.c)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.c)
 	       }
 	       return nil
 	   }

diff --git a/hack/benchmark/core/benchmark/strategy/bulk_insert_commit_test.go b/hack/benchmark/core/benchmark/strategy/bulk_insert_commit_test.go
@@ -43,7 +43,7 @@ func TestNewBulkInsertCommit(t *testing.T) {
 	}
 	defaultCheckFunc := func(w want, got benchmark.Strategy) error {
 		if !reflect.DeepEqual(got, w.want) {
-			return errors.Errorf("got = %v, want %v", got, w.want)
+			return errors.Errorf("got: \"%v\",\twant: \"%v\"", got, w.want)
 		}
 		return nil
 	}

diff --git a/hack/benchmark/core/benchmark/strategy/bulk_insert_test.go b/hack/benchmark/core/benchmark/strategy/bulk_insert_test.go
@@ -42,7 +42,7 @@ func TestNewBulkInsert(t *testing.T) {
 	}
 	defaultCheckFunc := func(w want, got benchmark.Strategy) error {
 		if !reflect.DeepEqual(got, w.want) {
-			return errors.Errorf("got = %v, want %v", got, w.want)
+			return errors.Errorf("got: \"%v\",\twant: \"%v\"", got, w.want)
 		}
 		return nil
 	}

diff --git a/hack/benchmark/core/benchmark/strategy/get_vector_test.go b/hack/benchmark/core/benchmark/strategy/get_vector_test.go
@@ -42,7 +42,7 @@ func TestNewGetVector(t *testing.T) {
 	}
 	defaultCheckFunc := func(w want, got benchmark.Strategy) error {
 		if !reflect.DeepEqual(got, w.want) {
-			return errors.Errorf("got = %v, want %v", got, w.want)
+			return errors.Errorf("got: \"%v\",\twant: \"%v\"", got, w.want)
 		}
 		return nil
 	}

diff --git a/hack/benchmark/core/benchmark/strategy/insert_commit_test.go b/hack/benchmark/core/benchmark/strategy/insert_commit_test.go
@@ -43,7 +43,7 @@ func TestNewInsertCommit(t *testing.T) {
 	}
 	defaultCheckFunc := func(w want, got benchmark.Strategy) error {
 		if !reflect.DeepEqual(got, w.want) {
-			return errors.Errorf("got = %v, want %v", got, w.want)
+			return errors.Errorf("got: \"%v\",\twant: \"%v\"", got, w.want)
 		}
 		return nil
 	}

diff --git a/hack/benchmark/core/benchmark/strategy/insert_test.go b/hack/benchmark/core/benchmark/strategy/insert_test.go
@@ -42,7 +42,7 @@ func TestNewInsert(t *testing.T) {
 	}
 	defaultCheckFunc := func(w want, got benchmark.Strategy) error {
 		if !reflect.DeepEqual(got, w.want) {
-			return errors.Errorf("got = %v, want %v", got, w.want)
+			return errors.Errorf("got: \"%v\",\twant: \"%v\"", got, w.want)
 		}
 		return nil
 	}

diff --git a/hack/benchmark/core/benchmark/strategy/remove_test.go b/hack/benchmark/core/benchmark/strategy/remove_test.go
@@ -42,7 +42,7 @@ func TestNewRemove(t *testing.T) {
 	}
 	defaultCheckFunc := func(w want, got benchmark.Strategy) error {
 		if !reflect.DeepEqual(got, w.want) {
-			return errors.Errorf("got = %v, want %v", got, w.want)
+			return errors.Errorf("got: \"%v\",\twant: \"%v\"", got, w.want)
 		}
 		return nil
 	}

diff --git a/hack/benchmark/core/benchmark/strategy/search_test.go b/hack/benchmark/core/benchmark/strategy/search_test.go
@@ -45,7 +45,7 @@ func TestNewSearch(t *testing.T) {
 	}
 	defaultCheckFunc := func(w want, got benchmark.Strategy) error {
 		if !reflect.DeepEqual(got, w.want) {
-			return errors.Errorf("got = %v, want %v", got, w.want)
+			return errors.Errorf("got: \"%v\",\twant: \"%v\"", got, w.want)
 		}
 		return nil
 	}

diff --git a/hack/benchmark/core/benchmark/strategy/strategy_option_test.go b/hack/benchmark/core/benchmark/strategy/strategy_option_test.go
@@ -52,10 +52,10 @@ func TestWithPreProp32(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T, err error) error {
 	       if !errors.Is(err, w.err) {
-	           return errors.Errorf("got error = %v, want %v", err, w.err)
+	           return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
 	       }
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.obj)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.obj)
 	       }
 	       return nil
 	   }
@@ -65,7 +65,7 @@ func TestWithPreProp32(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T) error {
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.c)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.c)
 	       }
 	       return nil
 	   }
@@ -165,10 +165,10 @@ func TestWithProp32(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T, err error) error {
 	       if !errors.Is(err, w.err) {
-	           return errors.Errorf("got error = %v, want %v", err, w.err)
+	           return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
 	       }
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.obj)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.obj)
 	       }
 	       return nil
 	   }
@@ -178,7 +178,7 @@ func TestWithProp32(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T) error {
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.c)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.c)
 	       }
 	       return nil
 	   }
@@ -278,10 +278,10 @@ func TestWithPreProp64(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T, err error) error {
 	       if !errors.Is(err, w.err) {
-	           return errors.Errorf("got error = %v, want %v", err, w.err)
+	           return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
 	       }
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.obj)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.obj)
 	       }
 	       return nil
 	   }
@@ -291,7 +291,7 @@ func TestWithPreProp64(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T) error {
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.c)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.c)
 	       }
 	       return nil
 	   }
@@ -391,10 +391,10 @@ func TestWithProp64(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T, err error) error {
 	       if !errors.Is(err, w.err) {
-	           return errors.Errorf("got error = %v, want %v", err, w.err)
+	           return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
 	       }
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.obj)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.obj)
 	       }
 	       return nil
 	   }
@@ -404,7 +404,7 @@ func TestWithProp64(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T) error {
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.c)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.c)
 	       }
 	       return nil
 	   }
@@ -504,10 +504,10 @@ func TestWithPropName(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T, err error) error {
 	       if !errors.Is(err, w.err) {
-	           return errors.Errorf("got error = %v, want %v", err, w.err)
+	           return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
 	       }
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.obj)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.obj)
 	       }
 	       return nil
 	   }
@@ -517,7 +517,7 @@ func TestWithPropName(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T) error {
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.c)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.c)
 	       }
 	       return nil
 	   }
@@ -617,10 +617,10 @@ func TestWithCore32(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T, err error) error {
 	       if !errors.Is(err, w.err) {
-	           return errors.Errorf("got error = %v, want %v", err, w.err)
+	           return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
 	       }
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.obj)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.obj)
 	       }
 	       return nil
 	   }
@@ -630,7 +630,7 @@ func TestWithCore32(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T) error {
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.c)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.c)
 	       }
 	       return nil
 	   }
@@ -730,10 +730,10 @@ func TestWithCore64(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T, err error) error {
 	       if !errors.Is(err, w.err) {
-	           return errors.Errorf("got error = %v, want %v", err, w.err)
+	           return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
 	       }
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.obj)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.obj)
 	       }
 	       return nil
 	   }
@@ -743,7 +743,7 @@ func TestWithCore64(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T) error {
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.c)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.c)
 	       }
 	       return nil
 	   }
@@ -839,10 +839,10 @@ func TestWithParallel(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T, err error) error {
 	       if !errors.Is(err, w.err) {
-	           return errors.Errorf("got error = %v, want %v", err, w.err)
+	           return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
 	       }
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.obj)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.obj)
 	       }
 	       return nil
 	   }
@@ -852,7 +852,7 @@ func TestWithParallel(t *testing.T) {
 	/*
 	   defaultCheckFunc := func(w want, obj *T) error {
 	       if !reflect.DeepEqual(obj, w.obj) {
-	           return errors.Errorf("got = %v, want %v", obj, w.c)
+	           return errors.Errorf("got: \"%v\",\twant: \"%v\"", obj, w.c)
 	       }
 	       return nil
 	   }

diff --git a/hack/benchmark/core/benchmark/strategy/strategy_test.go b/hack/benchmark/core/benchmark/strategy/strategy_test.go
@@ -47,7 +47,7 @@ func Test_newStrategy(t *testing.T) {
 	}
 	defaultCheckFunc := func(w want, got benchmark.Strategy) error {
 		if !reflect.DeepEqual(got, w.want) {
-			return errors.Errorf("got = %v, want %v", got, w.want)
+			return errors.Errorf("got: \"%v\",\twant: \"%v\"", got, w.want)
 		}
 		return nil
 	}
@@ -135,7 +135,7 @@ func Test_strategy_Init(t *testing.T) {
 	}
 	defaultCheckFunc := func(w want, err error) error {
 		if !errors.Is(err, w.err) {
-			return errors.Errorf("got error = %v, want %v", err, w.err)
+			return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
 		}
 		return nil
 	}
@@ -270,10 +270,10 @@ func Test_strategy_PreProp(t *testing.T) {
 	}
 	defaultCheckFunc := func(w want, got []uint, err error) error {
 		if !errors.Is(err, w.err) {
-			return errors.Errorf("got error = %v, want %v", err, w.err)
+			return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
 		}
 		if !reflect.DeepEqual(got, w.want) {
-			return errors.Errorf("got = %v, want %v", got, w.want)
+			return errors.Errorf("got: \"%v\",\twant: \"%v\"", got, w.want)
 		}
 		return nil
 	}

diff --git a/hack/benchmark/core/benchmark/strategy/util_test.go b/hack/benchmark/core/benchmark/strategy/util_test.go
@@ -46,7 +46,7 @@ func Test_wrapErrors(t *testing.T) {
 	}
 	defaultCheckFunc := func(w want, err error) error {
 		if !errors.Is(err, w.err) {
-			return errors.Errorf("got error = %v, want %v", err, w.err)
+			return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
 		}
 		return nil
 	}
@@ -120,10 +120,10 @@ func Test_insertAndCreateIndex32(t *testing.T) {
 	}
 	defaultCheckFunc := func(w want, gotIds []uint, err error) error {
 		if !errors.Is(err, w.err) {
-			return errors.Errorf("got error = %v, want %v", err, w.err)
+			return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
 		}
 		if !reflect.DeepEqual(gotIds, w.wantIds) {
-			return errors.Errorf("got = %v, want %v", gotIds, w.wantIds)
+			return errors.Errorf("got: \"%v\",\twant: \"%v\"", gotIds, w.wantIds)
 		}
 		return nil
 	}
@@ -201,10 +201,10 @@ func Test_insertAndCreateIndex64(t *testing.T) {
 	}
 	defaultCheckFunc := func(w want, gotIds []uint, err error) error {
 		if !errors.Is(err, w.err) {
-			return errors.Errorf("got error = %v, want %v", err, w.err)
+			return errors.Errorf("got_error: \"%v\",\twant: \"%v\"", err, w.err)
 		}
 		if !reflect.DeepEqual(gotIds, w.wantIds) {
-			return errors.Errorf("got = %v, want %v", gotIds, w.wantIds)
+			return errors.Errorf("got: \"%v\",\twant: \"%v\"", gotIds, w.wantIds)
 		}
 		return nil
 	}