From e452a2ec377334144aa9204514b8ad4bd2c2254e Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 24 Aug 2022 14:27:07 +0200 Subject: more cleanup --- evaluator/evaluator_test.go | 27 +++++++++------------------ evaluator/macro_expansion_test.go | 9 +++------ evaluator/quote_unquote_test.go | 12 ++++-------- 3 files changed, 16 insertions(+), 32 deletions(-) (limited to 'evaluator') diff --git a/evaluator/evaluator_test.go b/evaluator/evaluator_test.go index 606078a..fd1cef2 100644 --- a/evaluator/evaluator_test.go +++ b/evaluator/evaluator_test.go @@ -233,14 +233,12 @@ if (10 > 1) { errObj, ok := evaluated.(*object.Error) if !ok { - t.Errorf("no error object returned. got=%T(%+v)", - evaluated, evaluated) + t.Errorf("no error object returned. got=%T(%+v)", evaluated, evaluated) continue } if errObj.Message != tt.expectedMessage { - t.Errorf("wrong error message. expected=%q, got=%q", - tt.expectedMessage, errObj.Message) + t.Errorf("wrong error message. expected=%q, got=%q", tt.expectedMessage, errObj.Message) } } } @@ -271,8 +269,7 @@ func TestFunctionObject(t *testing.T) { } if len(fn.Parameters) != 1 { - t.Fatalf("function has wrong parameters. Parameters=%+v", - fn.Parameters) + t.Fatalf("function has wrong parameters. Parameters=%+v", fn.Parameters) } if fn.Parameters[0].String() != "x" { @@ -397,13 +394,11 @@ func TestBuiltinFunctions(t *testing.T) { case string: errObj, ok := evaluated.(*object.Error) if !ok { - t.Errorf("object is not Error. got=%T (%+v)", - evaluated, evaluated) + t.Errorf("object is not Error. got=%T (%+v)", evaluated, evaluated) continue } if errObj.Message != expected { - t.Errorf("wrong error message. expected=%q, got=%q", - expected, errObj.Message) + t.Errorf("wrong error message. expected=%q, got=%q", expected, errObj.Message) } case []int: array, ok := evaluated.(*object.Array) @@ -413,8 +408,7 @@ func TestBuiltinFunctions(t *testing.T) { } if len(array.Elements) != len(expected) { - t.Errorf("wrong num of elements. want=%d, got=%d", - len(expected), len(array.Elements)) + t.Errorf("wrong num of elements. want=%d, got=%d", len(expected), len(array.Elements)) continue } @@ -435,8 +429,7 @@ func TestArrayLiterals(t *testing.T) { } if len(result.Elements) != 3 { - t.Fatalf("array has wrong num of elements. got=%d", - len(result.Elements)) + t.Fatalf("array has wrong num of elements. got=%d", len(result.Elements)) } testIntegerObject(t, result.Elements[0], 1) @@ -605,8 +598,7 @@ func testIntegerObject(t *testing.T, obj object.Object, expected int64) bool { return false } if result.Value != expected { - t.Errorf("object has wrong value. got=%d, want=%d", - result.Value, expected) + t.Errorf("object has wrong value. got=%d, want=%d", result.Value, expected) return false } @@ -621,8 +613,7 @@ func testBooleanObject(t *testing.T, obj object.Object, expected bool) bool { return false } if result.Value != expected { - t.Errorf("object has wrong value. got=%t, want=%t", - result.Value, expected) + t.Errorf("object has wrong value. got=%t, want=%t", result.Value, expected) return false } return true diff --git a/evaluator/macro_expansion_test.go b/evaluator/macro_expansion_test.go index 9d4f3d1..df0042d 100644 --- a/evaluator/macro_expansion_test.go +++ b/evaluator/macro_expansion_test.go @@ -22,8 +22,7 @@ let mymacro = macro(x, y) { x + y; }; DefineMacros(program, env) if len(program.Statements) != 2 { - t.Fatalf("Wrong number of statements. got=%d", - len(program.Statements)) + t.Fatalf("Wrong number of statements. got=%d", len(program.Statements)) } _, ok := env.Get("number") @@ -46,8 +45,7 @@ let mymacro = macro(x, y) { x + y; }; } if len(macro.Parameters) != 2 { - t.Fatalf("Wrong number of macro parameters. got=%d", - len(macro.Parameters)) + t.Fatalf("Wrong number of macro parameters. got=%d", len(macro.Parameters)) } if macro.Parameters[0].String() != "x" { @@ -118,8 +116,7 @@ func TestExpandMacros(t *testing.T) { expanded := ExpandMacros(program, env) if expanded.String() != expected.String() { - t.Errorf("not equal. want=%q, got=%q", - expected.String(), expanded.String()) + t.Errorf("not equal. want=%q, got=%q", expected.String(), expanded.String()) } } } diff --git a/evaluator/quote_unquote_test.go b/evaluator/quote_unquote_test.go index 9b0de5b..edcff16 100644 --- a/evaluator/quote_unquote_test.go +++ b/evaluator/quote_unquote_test.go @@ -33,8 +33,7 @@ func TestQuote(t *testing.T) { evaluated := testEval(t, tt.input) quote, ok := evaluated.(*object.Quote) if !ok { - t.Fatalf("expected *object.Quote. got=%T (%+v)", - evaluated, evaluated) + t.Fatalf("expected *object.Quote. got=%T (%+v)", evaluated, evaluated) } if quote.Node == nil { @@ -42,8 +41,7 @@ func TestQuote(t *testing.T) { } if quote.Node.String() != tt.expected { - t.Errorf("not equal. got=%q, want=%q", - quote.Node.String(), tt.expected) + t.Errorf("not equal. got=%q, want=%q", quote.Node.String(), tt.expected) } } } @@ -102,8 +100,7 @@ func TestQuoteUnquote(t *testing.T) { evaluated := testEval(t, tt.input) quote, ok := evaluated.(*object.Quote) if !ok { - t.Fatalf("expected *object.Quote. got=%T (%+v)", - evaluated, evaluated) + t.Fatalf("expected *object.Quote. got=%T (%+v)", evaluated, evaluated) } if quote.Node == nil { @@ -111,8 +108,7 @@ func TestQuoteUnquote(t *testing.T) { } if quote.Node.String() != tt.expected { - t.Errorf("not equal. got=%q, want=%q", - quote.Node.String(), tt.expected) + t.Errorf("not equal. got=%q, want=%q", quote.Node.String(), tt.expected) } } } -- cgit v1.2.3