dstepanov-yadro/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

vm/tests: compare static slot contents in JSON tests

Browse source 
Make use of "staticFields" test field to compare vm static slots.
Also remove altStack because it is doesn't exist.
This commit is contained in:
Evgenii Stratonikov 2020-05-21 09:38:12 +03:00
parent 16bf72f9cc
commit 22791272bf
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkg/vm/json_test.go
View file

@ -39,8 +39,8 @@ type (
vmUTExecutionContextState struct { vmUTExecutionContextState struct {
Instruction string `json:"nextInstruction"` Instruction string `json:"nextInstruction"`
InstructionPointer int `json:"instructionPointer"` InstructionPointer int `json:"instructionPointer"`
AStack []vmUTStackItem `json:"altStack"`
EStack []vmUTStackItem `json:"evaluationStack"` EStack []vmUTStackItem `json:"evaluationStack"`
StaticFields []vmUTStackItem `json:"staticFields"`
} }
vmUTExecutionEngineState struct { vmUTExecutionEngineState struct {
@ -166,7 +166,7 @@ func testFile(t *testing.T, filename string) {
require.Equal(t, op, opcode.Opcode(ctx.prog[ctx.nextip])) require.Equal(t, op, opcode.Opcode(ctx.prog[ctx.nextip]))
} }
compareStacks(t, s.EStack, vm.estack) compareStacks(t, s.EStack, vm.estack)
compareStacks(t, s.AStack, vm.astack) compareSlots(t, s.StaticFields, vm.static)
} }
} }
@ -207,20 +207,32 @@ func compareItems(t *testing.T, a, b StackItem) {
} }
func compareStacks(t *testing.T, expected []vmUTStackItem, actual *Stack) { func compareStacks(t *testing.T, expected []vmUTStackItem, actual *Stack) {
compareItemArrays(t, expected, actual.Len(), func(i int) StackItem { return actual.Peek(i).Item() })
}
func compareSlots(t *testing.T, expected []vmUTStackItem, actual *Slot) {
if actual == nil && len(expected) == 0 {
return
}
require.NotNil(t, actual)
compareItemArrays(t, expected, actual.Size(), actual.Get)
}
func compareItemArrays(t *testing.T, expected []vmUTStackItem, n int, getItem func(i int) StackItem) {
if expected == nil { if expected == nil {
return return
} }
require.Equal(t, len(expected), actual.Len()) require.Equal(t, len(expected), n)
for i, item := range expected { for i, item := range expected {
e := actual.Peek(i) it := getItem(i)
require.NotNil(t, e) require.NotNil(t, it)
if item.Type == typeInterop { if item.Type == typeInterop {
require.IsType(t, (*InteropItem)(nil), e.value) require.IsType(t, (*InteropItem)(nil), it)
continue continue
} }
compareItems(t, item.toStackItem(), e.value) compareItems(t, item.toStackItem(), it)
} }
} }