From a67a15528aa5da902a17d49f5dad19db3975032a Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Wed, 10 Jun 2015 12:04:56 -0400 Subject: Split tests from helper code --- tests/state_test.go | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 tests/state_test.go (limited to 'tests/state_test.go') diff --git a/tests/state_test.go b/tests/state_test.go new file mode 100644 index 000000000..5e7be124b --- /dev/null +++ b/tests/state_test.go @@ -0,0 +1,96 @@ +package tests + +import "testing" + +func TestStateSystemOperations(t *testing.T) { + const fn = "../files/StateTests/stSystemOperationsTest.json" + RunVmTest(fn, t) +} + +func TestStateExample(t *testing.T) { + const fn = "../files/StateTests/stExample.json" + RunVmTest(fn, t) +} + +func TestStatePreCompiledContracts(t *testing.T) { + const fn = "../files/StateTests/stPreCompiledContracts.json" + RunVmTest(fn, t) +} + +func TestStateRecursiveCreate(t *testing.T) { + const fn = "../files/StateTests/stRecursiveCreate.json" + RunVmTest(fn, t) +} + +func TestStateSpecial(t *testing.T) { + const fn = "../files/StateTests/stSpecialTest.json" + RunVmTest(fn, t) +} + +func TestStateRefund(t *testing.T) { + const fn = "../files/StateTests/stRefundTest.json" + RunVmTest(fn, t) +} + +func TestStateBlockHash(t *testing.T) { + const fn = "../files/StateTests/stBlockHashTest.json" + RunVmTest(fn, t) +} + +func TestStateInitCode(t *testing.T) { + const fn = "../files/StateTests/stInitCodeTest.json" + RunVmTest(fn, t) +} + +func TestStateLog(t *testing.T) { + const fn = "../files/StateTests/stLogTests.json" + RunVmTest(fn, t) +} + +func TestStateTransaction(t *testing.T) { + const fn = "../files/StateTests/stTransactionTest.json" + RunVmTest(fn, t) +} + +func TestCallCreateCallCode(t *testing.T) { + const fn = "../files/StateTests/stCallCreateCallCodeTest.json" + RunVmTest(fn, t) +} + +func TestMemory(t *testing.T) { + const fn = "../files/StateTests/stMemoryTest.json" + RunVmTest(fn, t) +} + +func TestMemoryStress(t *testing.T) { + if os.Getenv("TEST_VM_COMPLEX") == "" { + t.Skip() + } + const fn = "../files/StateTests/stMemoryStressTest.json" + RunVmTest(fn, t) +} + +func TestQuadraticComplexity(t *testing.T) { + if os.Getenv("TEST_VM_COMPLEX") == "" { + t.Skip() + } + const fn = "../files/StateTests/stQuadraticComplexityTest.json" + RunVmTest(fn, t) +} + +func TestSolidity(t *testing.T) { + const fn = "../files/StateTests/stSolidityTest.json" + RunVmTest(fn, t) +} + +func TestWallet(t *testing.T) { + const fn = "../files/StateTests/stWalletTest.json" + RunVmTest(fn, t) +} + +func TestStateTestsRandom(t *testing.T) { + fns, _ := filepath.Glob("../files/StateTests/RandomTests/*") + for _, fn := range fns { + RunVmTest(fn, t) + } +} -- cgit v1.2.3 From e82100367f794856a8807b5fcfe9f0043902a294 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Wed, 10 Jun 2015 12:34:38 -0400 Subject: Fix paths --- tests/state_test.go | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) (limited to 'tests/state_test.go') diff --git a/tests/state_test.go b/tests/state_test.go index 5e7be124b..fa000ec53 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -1,64 +1,70 @@ package tests -import "testing" +import ( + "os" + "path/filepath" + "testing" +) + +var stateTestDir = filepath.Join(baseDir, "StateTests") func TestStateSystemOperations(t *testing.T) { - const fn = "../files/StateTests/stSystemOperationsTest.json" + fn := filepath.Join(stateTestDir, "stSystemOperationsTest.json") RunVmTest(fn, t) } func TestStateExample(t *testing.T) { - const fn = "../files/StateTests/stExample.json" + fn := filepath.Join(stateTestDir, "stExample.json") RunVmTest(fn, t) } func TestStatePreCompiledContracts(t *testing.T) { - const fn = "../files/StateTests/stPreCompiledContracts.json" + fn := filepath.Join(stateTestDir, "stPreCompiledContracts.json") RunVmTest(fn, t) } func TestStateRecursiveCreate(t *testing.T) { - const fn = "../files/StateTests/stRecursiveCreate.json" + fn := filepath.Join(stateTestDir, "stRecursiveCreate.json") RunVmTest(fn, t) } func TestStateSpecial(t *testing.T) { - const fn = "../files/StateTests/stSpecialTest.json" + fn := filepath.Join(stateTestDir, "stSpecialTest.json") RunVmTest(fn, t) } func TestStateRefund(t *testing.T) { - const fn = "../files/StateTests/stRefundTest.json" + fn := filepath.Join(stateTestDir, "stRefundTest.json") RunVmTest(fn, t) } func TestStateBlockHash(t *testing.T) { - const fn = "../files/StateTests/stBlockHashTest.json" + fn := filepath.Join(stateTestDir, "stBlockHashTest.json") RunVmTest(fn, t) } func TestStateInitCode(t *testing.T) { - const fn = "../files/StateTests/stInitCodeTest.json" + fn := filepath.Join(stateTestDir, "stInitCodeTest.json") RunVmTest(fn, t) } func TestStateLog(t *testing.T) { - const fn = "../files/StateTests/stLogTests.json" + fn := filepath.Join(stateTestDir, "stLogTests.json") RunVmTest(fn, t) } func TestStateTransaction(t *testing.T) { - const fn = "../files/StateTests/stTransactionTest.json" + fn := filepath.Join(stateTestDir, "stTransactionTest.json") RunVmTest(fn, t) } func TestCallCreateCallCode(t *testing.T) { - const fn = "../files/StateTests/stCallCreateCallCodeTest.json" + fn := filepath.Join(stateTestDir, "stCallCreateCallCodeTest.json") RunVmTest(fn, t) } func TestMemory(t *testing.T) { - const fn = "../files/StateTests/stMemoryTest.json" + fn := filepath.Join(stateTestDir, "stMemoryTest.json") RunVmTest(fn, t) } @@ -66,7 +72,7 @@ func TestMemoryStress(t *testing.T) { if os.Getenv("TEST_VM_COMPLEX") == "" { t.Skip() } - const fn = "../files/StateTests/stMemoryStressTest.json" + fn := filepath.Join(stateTestDir, "stMemoryStressTest.json") RunVmTest(fn, t) } @@ -74,22 +80,22 @@ func TestQuadraticComplexity(t *testing.T) { if os.Getenv("TEST_VM_COMPLEX") == "" { t.Skip() } - const fn = "../files/StateTests/stQuadraticComplexityTest.json" + fn := filepath.Join(stateTestDir, "stQuadraticComplexityTest.json") RunVmTest(fn, t) } func TestSolidity(t *testing.T) { - const fn = "../files/StateTests/stSolidityTest.json" + fn := filepath.Join(stateTestDir, "stSolidityTest.json") RunVmTest(fn, t) } func TestWallet(t *testing.T) { - const fn = "../files/StateTests/stWalletTest.json" + fn := filepath.Join(stateTestDir, "stWalletTest.json") RunVmTest(fn, t) } func TestStateTestsRandom(t *testing.T) { - fns, _ := filepath.Glob("../files/StateTests/RandomTests/*") + fns, _ := filepath.Glob("./files/StateTests/RandomTests/*") for _, fn := range fns { RunVmTest(fn, t) } -- cgit v1.2.3 From 7c6ef0ddac91564f31ef852fd4ef1e821db17c2e Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Wed, 10 Jun 2015 14:38:39 -0400 Subject: Separate and identify tests runners --- tests/state_test.go | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'tests/state_test.go') diff --git a/tests/state_test.go b/tests/state_test.go index fa000ec53..dbef7bd0c 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -10,62 +10,62 @@ var stateTestDir = filepath.Join(baseDir, "StateTests") func TestStateSystemOperations(t *testing.T) { fn := filepath.Join(stateTestDir, "stSystemOperationsTest.json") - RunVmTest(fn, t) + RunStateTest(fn, t) } func TestStateExample(t *testing.T) { fn := filepath.Join(stateTestDir, "stExample.json") - RunVmTest(fn, t) + RunStateTest(fn, t) } func TestStatePreCompiledContracts(t *testing.T) { fn := filepath.Join(stateTestDir, "stPreCompiledContracts.json") - RunVmTest(fn, t) + RunStateTest(fn, t) } func TestStateRecursiveCreate(t *testing.T) { fn := filepath.Join(stateTestDir, "stRecursiveCreate.json") - RunVmTest(fn, t) + RunStateTest(fn, t) } func TestStateSpecial(t *testing.T) { fn := filepath.Join(stateTestDir, "stSpecialTest.json") - RunVmTest(fn, t) + RunStateTest(fn, t) } func TestStateRefund(t *testing.T) { fn := filepath.Join(stateTestDir, "stRefundTest.json") - RunVmTest(fn, t) + RunStateTest(fn, t) } func TestStateBlockHash(t *testing.T) { fn := filepath.Join(stateTestDir, "stBlockHashTest.json") - RunVmTest(fn, t) + RunStateTest(fn, t) } func TestStateInitCode(t *testing.T) { fn := filepath.Join(stateTestDir, "stInitCodeTest.json") - RunVmTest(fn, t) + RunStateTest(fn, t) } func TestStateLog(t *testing.T) { fn := filepath.Join(stateTestDir, "stLogTests.json") - RunVmTest(fn, t) + RunStateTest(fn, t) } func TestStateTransaction(t *testing.T) { fn := filepath.Join(stateTestDir, "stTransactionTest.json") - RunVmTest(fn, t) + RunStateTest(fn, t) } func TestCallCreateCallCode(t *testing.T) { fn := filepath.Join(stateTestDir, "stCallCreateCallCodeTest.json") - RunVmTest(fn, t) + RunStateTest(fn, t) } func TestMemory(t *testing.T) { fn := filepath.Join(stateTestDir, "stMemoryTest.json") - RunVmTest(fn, t) + RunStateTest(fn, t) } func TestMemoryStress(t *testing.T) { @@ -73,7 +73,7 @@ func TestMemoryStress(t *testing.T) { t.Skip() } fn := filepath.Join(stateTestDir, "stMemoryStressTest.json") - RunVmTest(fn, t) + RunStateTest(fn, t) } func TestQuadraticComplexity(t *testing.T) { @@ -81,22 +81,22 @@ func TestQuadraticComplexity(t *testing.T) { t.Skip() } fn := filepath.Join(stateTestDir, "stQuadraticComplexityTest.json") - RunVmTest(fn, t) + RunStateTest(fn, t) } func TestSolidity(t *testing.T) { fn := filepath.Join(stateTestDir, "stSolidityTest.json") - RunVmTest(fn, t) + RunStateTest(fn, t) } func TestWallet(t *testing.T) { fn := filepath.Join(stateTestDir, "stWalletTest.json") - RunVmTest(fn, t) + RunStateTest(fn, t) } func TestStateTestsRandom(t *testing.T) { fns, _ := filepath.Glob("./files/StateTests/RandomTests/*") for _, fn := range fns { - RunVmTest(fn, t) + RunStateTest(fn, t) } } -- cgit v1.2.3 From c5d6fcbaba545d1078f5411dc67208d5d388222e Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Wed, 10 Jun 2015 16:10:33 -0400 Subject: Return error up stack instead of passing testing var down --- tests/state_test.go | 68 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 17 deletions(-) (limited to 'tests/state_test.go') diff --git a/tests/state_test.go b/tests/state_test.go index dbef7bd0c..5c16a3e91 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -10,62 +10,86 @@ var stateTestDir = filepath.Join(baseDir, "StateTests") func TestStateSystemOperations(t *testing.T) { fn := filepath.Join(stateTestDir, "stSystemOperationsTest.json") - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } func TestStateExample(t *testing.T) { fn := filepath.Join(stateTestDir, "stExample.json") - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } func TestStatePreCompiledContracts(t *testing.T) { fn := filepath.Join(stateTestDir, "stPreCompiledContracts.json") - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } func TestStateRecursiveCreate(t *testing.T) { fn := filepath.Join(stateTestDir, "stRecursiveCreate.json") - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } func TestStateSpecial(t *testing.T) { fn := filepath.Join(stateTestDir, "stSpecialTest.json") - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } func TestStateRefund(t *testing.T) { fn := filepath.Join(stateTestDir, "stRefundTest.json") - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } func TestStateBlockHash(t *testing.T) { fn := filepath.Join(stateTestDir, "stBlockHashTest.json") - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } func TestStateInitCode(t *testing.T) { fn := filepath.Join(stateTestDir, "stInitCodeTest.json") - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } func TestStateLog(t *testing.T) { fn := filepath.Join(stateTestDir, "stLogTests.json") - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } func TestStateTransaction(t *testing.T) { fn := filepath.Join(stateTestDir, "stTransactionTest.json") - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } func TestCallCreateCallCode(t *testing.T) { fn := filepath.Join(stateTestDir, "stCallCreateCallCodeTest.json") - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } func TestMemory(t *testing.T) { fn := filepath.Join(stateTestDir, "stMemoryTest.json") - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } func TestMemoryStress(t *testing.T) { @@ -73,7 +97,9 @@ func TestMemoryStress(t *testing.T) { t.Skip() } fn := filepath.Join(stateTestDir, "stMemoryStressTest.json") - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } func TestQuadraticComplexity(t *testing.T) { @@ -81,22 +107,30 @@ func TestQuadraticComplexity(t *testing.T) { t.Skip() } fn := filepath.Join(stateTestDir, "stQuadraticComplexityTest.json") - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } func TestSolidity(t *testing.T) { fn := filepath.Join(stateTestDir, "stSolidityTest.json") - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } func TestWallet(t *testing.T) { fn := filepath.Join(stateTestDir, "stWalletTest.json") - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } func TestStateTestsRandom(t *testing.T) { fns, _ := filepath.Glob("./files/StateTests/RandomTests/*") for _, fn := range fns { - RunStateTest(fn, t) + if err := RunStateTest(fn); err != nil { + t.Error(err) + } } } -- cgit v1.2.3 From b6d40a931286b4c998f58ad074db0a692aeace6e Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Wed, 10 Jun 2015 16:29:42 -0400 Subject: Cleanup/reorg --- tests/state_test.go | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests/state_test.go') diff --git a/tests/state_test.go b/tests/state_test.go index 5c16a3e91..9c3d6f209 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -6,8 +6,6 @@ import ( "testing" ) -var stateTestDir = filepath.Join(baseDir, "StateTests") - func TestStateSystemOperations(t *testing.T) { fn := filepath.Join(stateTestDir, "stSystemOperationsTest.json") if err := RunStateTest(fn); err != nil { -- cgit v1.2.3 From 0743243dce05c38c1f4949e44467d20a22a1f743 Mon Sep 17 00:00:00 2001 From: Taylor Gerring Date: Fri, 19 Jun 2015 11:38:23 +0200 Subject: Add --skip option to CLI Disassociates hardcoded tests to skip when running via CLI. Tests still skipped when running `go test` --- tests/state_test.go | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'tests/state_test.go') diff --git a/tests/state_test.go b/tests/state_test.go index 9c3d6f209..e58f588f4 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -8,84 +8,84 @@ import ( func TestStateSystemOperations(t *testing.T) { fn := filepath.Join(stateTestDir, "stSystemOperationsTest.json") - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } func TestStateExample(t *testing.T) { fn := filepath.Join(stateTestDir, "stExample.json") - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } func TestStatePreCompiledContracts(t *testing.T) { fn := filepath.Join(stateTestDir, "stPreCompiledContracts.json") - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } func TestStateRecursiveCreate(t *testing.T) { fn := filepath.Join(stateTestDir, "stRecursiveCreate.json") - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } func TestStateSpecial(t *testing.T) { fn := filepath.Join(stateTestDir, "stSpecialTest.json") - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } func TestStateRefund(t *testing.T) { fn := filepath.Join(stateTestDir, "stRefundTest.json") - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } func TestStateBlockHash(t *testing.T) { fn := filepath.Join(stateTestDir, "stBlockHashTest.json") - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } func TestStateInitCode(t *testing.T) { fn := filepath.Join(stateTestDir, "stInitCodeTest.json") - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } func TestStateLog(t *testing.T) { fn := filepath.Join(stateTestDir, "stLogTests.json") - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } func TestStateTransaction(t *testing.T) { fn := filepath.Join(stateTestDir, "stTransactionTest.json") - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } func TestCallCreateCallCode(t *testing.T) { fn := filepath.Join(stateTestDir, "stCallCreateCallCodeTest.json") - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } func TestMemory(t *testing.T) { fn := filepath.Join(stateTestDir, "stMemoryTest.json") - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } @@ -95,7 +95,7 @@ func TestMemoryStress(t *testing.T) { t.Skip() } fn := filepath.Join(stateTestDir, "stMemoryStressTest.json") - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } @@ -105,21 +105,21 @@ func TestQuadraticComplexity(t *testing.T) { t.Skip() } fn := filepath.Join(stateTestDir, "stQuadraticComplexityTest.json") - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } func TestSolidity(t *testing.T) { fn := filepath.Join(stateTestDir, "stSolidityTest.json") - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } func TestWallet(t *testing.T) { fn := filepath.Join(stateTestDir, "stWalletTest.json") - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } @@ -127,7 +127,7 @@ func TestWallet(t *testing.T) { func TestStateTestsRandom(t *testing.T) { fns, _ := filepath.Glob("./files/StateTests/RandomTests/*") for _, fn := range fns { - if err := RunStateTest(fn); err != nil { + if err := RunStateTest(fn, StateSkipTests); err != nil { t.Error(err) } } -- cgit v1.2.3