From 3090f64ddec14edb153345f0b0662665a53e8834 Mon Sep 17 00:00:00 2001 From: Roman Mandeleil Date: Sat, 7 Feb 2015 21:56:44 +0200 Subject: [PATCH] Map failures in TCK / VMTest --- .../ethereum/jsontestsuite/GitHubVMTest.java | 74 +++++++++++++++---- 1 file changed, 60 insertions(+), 14 deletions(-) diff --git a/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubVMTest.java b/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubVMTest.java index 2e00adab..63ee4ec6 100644 --- a/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubVMTest.java +++ b/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubVMTest.java @@ -43,7 +43,7 @@ public class GitHubVMTest { GitHubJSONTestSuite.runGitHubJsonVMTest(json, excluded); } - @Ignore + @Test // testing full suite public void testBitwiseLogicOperationFromGitHub() throws ParseException { @@ -52,25 +52,33 @@ public class GitHubVMTest { GitHubJSONTestSuite.runGitHubJsonVMTest(json, excluded); } - @Ignore + @Test // testing full suite public void testBlockInfoFromGitHub() throws ParseException { Set excluded = new HashSet<>(); + excluded.add("blockhash258Block"); + excluded.add("blockhashInRange"); + String json = JSONReader.loadJSON("VMTests/vmBlockInfoTest.json"); GitHubJSONTestSuite.runGitHubJsonVMTest(json, excluded); } - @Ignore + @Test // testing full suite public void testEnvironmentalInfoFromGitHub() throws ParseException { Set excluded = new HashSet<>(); + excluded.add("ExtCodeSizeAddressInputTooBigRightMyAddress"); + excluded.add("balanceAddressInputTooBigRightMyAddress"); + excluded.add("balanceAddressInputTooBig"); + excluded.add("extcodecopy0AddressTooBigRight"); + String json = JSONReader.loadJSON("VMTests/vmEnvironmentalInfoTest.json"); GitHubJSONTestSuite.runGitHubJsonVMTest(json, excluded); } - @Ignore + @Test // testing full suite public void testIOandFlowOperationsFromGitHub() throws ParseException { @@ -80,6 +88,22 @@ public class GitHubVMTest { } @Ignore + @Test // testing random + public void testvmInputLimitsTest1FromGitHub() throws ParseException { + + Set excluded = new HashSet<>(); + String json = JSONReader.loadJSON("VMTests/vmInputLimitsTest1.json"); + GitHubJSONTestSuite.runGitHubJsonVMTest(json, excluded); + } + + @Test // testing full suite + public void testVMLogGitHub() throws ParseException { + + Set excluded = new HashSet<>(); + String json = JSONReader.loadJSON("VMTests/vmLogTest.json"); + GitHubJSONTestSuite.runGitHubJsonVMTest(json, excluded); + } + @Test // testing full suite public void testPushDupSwapFromGitHub() throws ParseException { @@ -88,16 +112,46 @@ public class GitHubVMTest { GitHubJSONTestSuite.runGitHubJsonVMTest(json, excluded); } - @Ignore @Test // testing full suite public void testShaFromGitHub() throws ParseException { Set excluded = new HashSet<>(); + excluded.add("sha3_bigOffset2"); + String json = JSONReader.loadJSON("VMTests/vmSha3Test.json"); GitHubJSONTestSuite.runGitHubJsonVMTest(json, excluded); } - @Ignore + @Test // testing full suite + public void testvmSystemOperationsTestGitHub() throws ParseException { + + Set excluded = new HashSet<>(); + excluded.add("CallToNameRegistratorNotMuchMemory0"); + excluded.add("ABAcallsSuicide0"); + excluded.add("CallToNameRegistratorNotMuchMemory1"); + excluded.add("CallToNameRegistratorOutOfGas"); + excluded.add("callcodeToReturn1"); + excluded.add("createNameRegistrator"); + excluded.add("ABAcallsSuicide1"); + excluded.add("CallToPrecompiledContract"); + excluded.add("ABAcalls1"); + excluded.add("ABAcalls2"); + excluded.add("ABAcalls3"); + excluded.add("CallToNameRegistrator0"); + excluded.add("ABAcalls0"); + excluded.add("CallRecursiveBomb3"); + excluded.add("CallRecursiveBomb2"); + excluded.add("CallRecursiveBomb1"); + excluded.add("CallRecursiveBomb0"); + excluded.add("CallToReturn1"); + excluded.add("callcodeToNameRegistrator0"); + + + String json = JSONReader.loadJSON("VMTests/vmSystemOperationsTest.json"); + GitHubJSONTestSuite.runGitHubJsonVMTest(json, excluded); + } + + @Test // testing full suite public void testVMGitHub() throws ParseException { @@ -106,12 +160,4 @@ public class GitHubVMTest { GitHubJSONTestSuite.runGitHubJsonVMTest(json, excluded); } - @Ignore - @Test // testing full suite - public void testVMLogGitHub() throws ParseException { - - Set excluded = new HashSet<>(); - String json = JSONReader.loadJSON("VMTests/vmLogTest.json"); - GitHubJSONTestSuite.runGitHubJsonVMTest(json, excluded); - } }