Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 74 additions & 1 deletion stdlib/test_contract.go
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,78 @@ func newTestTypeExpectFunctionType(matcherType *sema.CompositeType) *sema.Functi
}
}

func formatValueForTestOutput(
context interpreter.InvocationContext,
value interpreter.Value,
) string {
return formatValueForTestOutputHelper(context, value, interpreter.SeenReferences{})
}

func formatValueForTestOutputHelper(
context interpreter.InvocationContext,
value interpreter.Value,
seenReferences interpreter.SeenReferences,
) string {
if value == nil {
return "nil"
}

if someValue, ok := value.(*interpreter.SomeValue); ok {
innerValue := someValue.InnerValue()
return formatValueForTestOutputHelper(context, innerValue, seenReferences)
}

compositeValue, ok := value.(*interpreter.CompositeValue)
if !ok {
return value.String()
}

typeID := compositeValue.TypeID()

if strings.HasSuffix(string(typeID), ".Test.Error") {
messageField := compositeValue.GetMember(context, "message")
if messageField != nil {
if stringValue, ok := messageField.(*interpreter.StringValue); ok {
var builder strings.Builder
builder.WriteString(string(typeID))
builder.WriteByte('(')
builder.WriteString("message: ")
builder.WriteString(stringValue.Str)
builder.WriteByte(')')
return builder.String()
}
}
}

if strings.HasSuffix(string(typeID), ".Test.ScriptResult") ||
strings.HasSuffix(string(typeID), ".Test.TransactionResult") {
var builder strings.Builder
builder.WriteString(string(typeID))
builder.WriteByte('(')

first := true
compositeValue.ForEachField(
context,
func(fieldName string, fieldValue interpreter.Value) (resume bool) {
if !first {
builder.WriteString(", ")
}
first = false
builder.WriteString(fieldName)
builder.WriteString(": ")
formattedFieldValue := formatValueForTestOutputHelper(context, fieldValue, seenReferences)
builder.WriteString(formattedFieldValue)
return true
},
)

builder.WriteByte(')')
return builder.String()
}

return value.String()
}

func newTestTypeExpectFunction(functionType *sema.FunctionType) testContractBoundFunctionGenerator {
return func(context interpreter.FunctionCreationContext, testContractValue *interpreter.CompositeValue) interpreter.BoundFunctionValue {
return interpreter.NewUnmeteredBoundHostFunctionValue(
Expand All @@ -302,9 +374,10 @@ func newTestTypeExpectFunction(functionType *sema.FunctionType) testContractBoun
)

if !result {
formattedValue := formatValueForTestOutput(invocationContext, value)
message := fmt.Sprintf(
"given value is: %s",
value,
formattedValue,
)
panic(&AssertionError{
Message: message,
Expand Down
32 changes: 32 additions & 0 deletions stdlib/test_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1942,6 +1942,38 @@ func TestTestExpect(t *testing.T) {
require.NoError(t, err)
})

t.Run("error message with newlines", func(t *testing.T) {
t.Parallel()

script := `
import Test

access(all)
fun test() {
let result = Test.ScriptResult(
status: Test.ResultStatus.failed,
returnValue: nil,
error: Test.Error("error: line 1\nerror: line 2\n\ttab indented line")
)
Test.expect(result, Test.beSucceeded())
}
`

inter, err := newTestContractInterpreter(t, script)
require.NoError(t, err)

_, err = inter.Invoke("test")
require.Error(t, err)

var assertionErr *AssertionError
require.ErrorAs(t, err, &assertionErr)
assert.Contains(t, assertionErr.Message, "error: line 1")
assert.Contains(t, assertionErr.Message, "error: line 2")
assert.Contains(t, assertionErr.Message, "\ttab indented line")
assert.NotContains(t, assertionErr.Message, "\\n")
assert.NotContains(t, assertionErr.Message, "\\t")
})

t.Run("mismatching types", func(t *testing.T) {
t.Parallel()

Expand Down
Loading