From 1bf087f9f75dd8407445646eec58bd7d0085db91 Mon Sep 17 00:00:00 2001 From: romanman Date: Wed, 3 Dec 2014 23:52:44 +0100 Subject: [PATCH] json testing uncommented --- .../java/org/ethereum/jsontestsuite/Logs.java | 2 +- .../jsontestsuite/GitHubJSONTestSuite.java | 1 - .../jsontestsuite/GitHubRandomTest.java | 27 --- .../ethereum/jsontestsuite/GitHubVMTest.java | 24 +- .../jsontestsuite/LocalJSONTestSuiteTest.java | 220 ------------------ 5 files changed, 9 insertions(+), 265 deletions(-) delete mode 100644 ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubRandomTest.java delete mode 100644 ethereumj-core/src/test/java/test/ethereum/jsontestsuite/LocalJSONTestSuiteTest.java diff --git a/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/Logs.java b/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/Logs.java index 35270ec0..9542103e 100644 --- a/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/Logs.java +++ b/ethereumj-core/src/main/java/org/ethereum/jsontestsuite/Logs.java @@ -49,7 +49,7 @@ public class Logs { return logs.get(k); return null; } - public Iterator getLogsRLPSHA3KeyIterator() { + public Iterator getLogsBloomKeyIterator() { return logs.keySet().iterator(); } } diff --git a/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubJSONTestSuite.java b/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubJSONTestSuite.java index e7d90f5f..22f33d59 100644 --- a/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubJSONTestSuite.java +++ b/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubJSONTestSuite.java @@ -24,7 +24,6 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) @SuiteClasses({ GitHubVMTest.class, - GitHubRandomTest.class }) public class GitHubJSONTestSuite { diff --git a/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubRandomTest.java b/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubRandomTest.java deleted file mode 100644 index 8a01b381..00000000 --- a/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubRandomTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package test.ethereum.jsontestsuite; - -import org.ethereum.jsontestsuite.JSONReader; -import org.json.simple.parser.ParseException; -import org.junit.FixMethodOrder; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runners.MethodSorters; - -@FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class GitHubRandomTest { - - @Test // testing full suite - @Ignore - public void testRandom04FromGitHub() throws ParseException { - String json = JSONReader.loadJSON("randomTests/201410211705.json"); - GitHubJSONTestSuite.runGitHubJsonTest(json); - } - - @Test // testing full suite - @Ignore - public void testRandom06FromGitHub() throws ParseException { - String json = JSONReader.loadJSON("randomTests/201410211708.json"); - GitHubJSONTestSuite.runGitHubJsonTest(json); - } - -} 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 29fb639d..854b792f 100644 --- a/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubVMTest.java +++ b/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/GitHubVMTest.java @@ -10,8 +10,7 @@ import org.junit.runners.MethodSorters; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class GitHubVMTest { - @Test // testing full suite - @Ignore + @Test public void testArithmeticFromGitHub() throws ParseException { String json = JSONReader.loadJSON("VMTests/vmArithmeticTest.json"); @@ -19,7 +18,6 @@ public class GitHubVMTest { } @Test // testing full suite - @Ignore public void testBitwiseLogicOperationFromGitHub() throws ParseException { String json = JSONReader.loadJSON("VMTests/vmBitwiseLogicOperationTest.json"); @@ -27,57 +25,51 @@ public class GitHubVMTest { } @Test // testing full suite - @Ignore public void testBlockInfoFromGitHub() throws ParseException { - String json = JSONReader.loadJSON("vmtests/vmBlockInfoTest.json"); + String json = JSONReader.loadJSON("VMTests/vmBlockInfoTest.json"); GitHubJSONTestSuite.runGitHubJsonTest(json); } @Test // testing full suite - @Ignore public void testEnvironmentalInfoFromGitHub() throws ParseException { - String json = JSONReader.loadJSON("vmtests/vmEnvironmentalInfoTest.json"); + String json = JSONReader.loadJSON("VMTests/vmEnvironmentalInfoTest.json"); GitHubJSONTestSuite.runGitHubJsonTest(json); } @Test // testing full suite - @Ignore public void testIOandFlowOperationsFromGitHub() throws ParseException { - String json = JSONReader.loadJSON("vmtests/vmIOandFlowOperationsTest.json"); + String json = JSONReader.loadJSON("VMTests/vmIOandFlowOperationsTest.json"); GitHubJSONTestSuite.runGitHubJsonTest(json); } @Test // testing full suite - @Ignore public void testPushDupSwapFromGitHub() throws ParseException { - String json = JSONReader.loadJSON("vmtests/vmPushDupSwapTest.json"); + String json = JSONReader.loadJSON("VMTests/vmPushDupSwapTest.json"); GitHubJSONTestSuite.runGitHubJsonTest(json); } @Test // testing full suite - @Ignore public void testShaFromGitHub() throws ParseException { - String json = JSONReader.loadJSON("vmtests/vmSha3Test.json"); + String json = JSONReader.loadJSON("VMTests/vmSha3Test.json"); GitHubJSONTestSuite.runGitHubJsonTest(json); } @Test // testing full suite - @Ignore public void testVMGitHub() throws ParseException { - String json = JSONReader.loadJSON("vmtests/vmtests.json"); + String json = JSONReader.loadJSON("VMTests/vmtests.json"); GitHubJSONTestSuite.runGitHubJsonTest(json); } @Test // testing full suite public void testVMLogGitHub() throws ParseException { - String json = JSONReader.loadJSON("vmtests/vmLogTest.json"); + String json = JSONReader.loadJSON("VMTests/vmLogTest.json"); GitHubJSONTestSuite.runGitHubJsonTest(json); } } diff --git a/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/LocalJSONTestSuiteTest.java b/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/LocalJSONTestSuiteTest.java deleted file mode 100644 index a1e6d3b6..00000000 --- a/ethereumj-core/src/test/java/test/ethereum/jsontestsuite/LocalJSONTestSuiteTest.java +++ /dev/null @@ -1,220 +0,0 @@ -package test.ethereum.jsontestsuite; - -import java.math.BigInteger; -import java.util.List; - -import org.ethereum.db.ByteArrayWrapper; -import org.ethereum.jsontestsuite.*; -import org.json.simple.JSONObject; -import org.json.simple.parser.JSONParser; -import org.json.simple.parser.ParseException; -import org.junit.Assert; -import org.junit.Test; -import org.spongycastle.util.encoders.Hex; - -/** - * www.ethereumJ.com - * - * @author: Roman Mandeleil - * Created on: 29/06/2014 10:46 - */ - -public class LocalJSONTestSuiteTest { - - @Test // AccountState parsing // - public void test1() throws ParseException { - - String expectedNonce = "01"; - String expectedBalance = "0de0b6b3a763ff6c"; - String expectedCode = "6000600060006000604a3360c85c03f1"; - - ByteArrayWrapper expectedKey1 = new ByteArrayWrapper(Hex.decode("ffaa")); - ByteArrayWrapper expectedKey2 = new ByteArrayWrapper(Hex.decode("ffab")); - - ByteArrayWrapper expectedVal1 = new ByteArrayWrapper(Hex.decode("c8")); - ByteArrayWrapper expectedVal2 = new ByteArrayWrapper(Hex.decode("b2b2b2")); - - JSONParser parser = new JSONParser(); - String accountString = "{'balance':999999999999999852,'nonce':1," + - "'code':'0x6000600060006000604a3360c85c03f1'," + - "'storage':{'0xffaa' : '0xc8', '0xffab' : '0xb2b2b2'}}"; - accountString = accountString.replace("'", "\""); - - JSONObject accountJSONObj = (JSONObject)parser.parse(accountString); - - AccountState state = - new AccountState(Hex.decode("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"), - accountJSONObj); - - Assert.assertEquals(expectedNonce, Hex.toHexString(state.getNonce())); - Assert.assertEquals(expectedBalance, Hex.toHexString(state.getBalance())); - Assert.assertEquals(expectedCode, Hex.toHexString(state.getCode())); - - Assert.assertTrue(state.getStorage().keySet().contains(expectedKey1)); - Assert.assertTrue(state.getStorage().keySet().contains(expectedKey2)); - - Assert.assertTrue(state.getStorage().values().contains(expectedVal1)); - Assert.assertTrue(state.getStorage().values().contains(expectedVal2)); - } - - - - @Test // Exec parsing // - public void test2() throws ParseException { - - String expectedAddress = "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"; - String expectedCaller = "cd1722f3947def4cf144679da39c4c32bdc35681"; - String expectedData = "ffaabb"; - String expectedCode = "6000600060006000604a3360c85c03f1"; - String expectedGas = "2710"; - String expectedGasPrice = "5af3107a4000"; - String expectedOrigin = "cd1722f3947def4cf144679da39c4c32bdc35681"; - String expectedValue = "0de0b6b3a7640000"; - - JSONParser parser = new JSONParser(); - String execString = "{'address' : '0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6'," + - " 'caller' : 'cd1722f3947def4cf144679da39c4c32bdc35681'," + - " 'data' : '0xffaabb'," + - " 'code' : '0x6000600060006000604a3360c85c03f1'," + - " 'gas' : 10000," + - " 'gasPrice' : 100000000000000," + - " 'origin' : 'cd1722f3947def4cf144679da39c4c32bdc35681'," + - " 'value' : 1000000000000000000}"; - execString = execString.replace("'", "\""); - - JSONObject execJSONObj = (JSONObject)parser.parse(execString); - Exec exec = new Exec(execJSONObj); - - Assert.assertEquals(expectedAddress, Hex.toHexString(exec.getAddress())); - Assert.assertEquals(expectedCaller, Hex.toHexString(exec.getCaller())); - Assert.assertEquals(expectedData, Hex.toHexString(exec.getData())); - Assert.assertEquals(expectedCode, Hex.toHexString(exec.getCode())); - Assert.assertEquals(expectedGas, Hex.toHexString(exec.getGas())); - Assert.assertEquals(expectedGasPrice, Hex.toHexString(exec.getGasPrice())); - Assert.assertEquals(expectedOrigin, Hex.toHexString(exec.getOrigin())); - Assert.assertEquals(expectedValue, Hex.toHexString(exec.getValue())); - } - - - - @Test // Env parsing // - public void test3() throws ParseException { - - String expectedCurrentCoinbase = "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"; - String expectedCurrentDifficulty = "256"; - String expectedCurrentGasLimit = "1000000"; - String expectedCurrentNumber = "0"; - String expectedCurrentTimestamp = "1"; - String expectedPreviousHash = "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"; - - JSONParser parser = new JSONParser(); - String envString = "{'currentCoinbase' : '2adc25665018aa1fe0e6bc666dac8fc2697ff9ba'," + - "'currentDifficulty' : '256'," + - "'currentGasLimit' : '1000000'," + - "'currentNumber' : '0'," + - "'currentTimestamp' : 1," + - "'previousHash' : '5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6'}"; - envString = envString.replace("'", "\""); - - JSONObject envJSONObj = (JSONObject)parser.parse(envString); - - Env env = new Env(envJSONObj); - - Assert.assertEquals(expectedCurrentCoinbase, Hex.toHexString(env.getCurrentCoinbase())); - Assert.assertEquals(expectedCurrentDifficulty, new BigInteger(env.getCurrentDifficlty()).toString()); - Assert.assertEquals(expectedCurrentGasLimit, new BigInteger(env.getCurrentGasLimit()).toString()); - Assert.assertEquals(expectedCurrentNumber, new BigInteger(env.getCurrentNumber()).toString()); - Assert.assertEquals(expectedCurrentTimestamp, new BigInteger(env.getCurrentTimestamp()).toString()); - Assert.assertEquals(expectedPreviousHash, Hex.toHexString(env.getPreviousHash())); - - } - - - @Test // CallCreate parsing // - public void test4() throws ParseException { - - String expectedData = ""; - String expectedDestination = "cd1722f3947def4cf144679da39c4c32bdc35681"; - String expectedGasLimit = "9792"; - String expectedValue = "74"; - - JSONParser parser = new JSONParser(); - String callCreateString = "{'data' : '','destination' : 'cd1722f3947def4cf144679da39c4c32bdc35681','gasLimit' : 9792,'value' : 74}"; - callCreateString = callCreateString.replace("'", "\""); - - JSONObject callCreateJSONObj = (JSONObject)parser.parse(callCreateString); - - CallCreate callCreate = new CallCreate(callCreateJSONObj); - - Assert.assertEquals(expectedData, Hex.toHexString(callCreate.getData())); - Assert.assertEquals(expectedDestination, Hex.toHexString(callCreate.getDestination())); - Assert.assertEquals(expectedGasLimit, new BigInteger( callCreate.getGasLimit()).toString()); - Assert.assertEquals(expectedValue, new BigInteger( callCreate.getValue()).toString()); - } - - @Test // TestCase parsing // - public void test5() throws ParseException { - - JSONParser parser = new JSONParser(); -// String testCaseString = "{'callcreates':[{'data':[],'destination':'cd1722f3947def4cf144679da39c4c32bdc35681','gasLimit':9786,'value':2},{'data':[],'destination':'cd1722f3947def4cf144679da39c4c32bdc35681','gasLimit':9732,'value':12},{'data':[],'destination':'cd1722f3947def4cf144679da39c4c32bdc35681','gasLimit':9696,'value':13},{'data':[],'destination':'cd1722f3947def4cf144679da39c4c32bdc35681','gasLimit':9660,'value':14}],'env':{'currentCoinbase':'2adc25665018aa1fe0e6bc666dac8fc2697ff9ba','currentDifficulty':'256','currentGasLimit':'1000000','currentNumber':'0','currentTimestamp':1,'previousHash':'5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6'},'exec':{'address':'0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6','caller':'cd1722f3947def4cf144679da39c4c32bdc35681','code':['0x60006001100f603459600060006000600060033360c85c03f150', '0x60016000100f604e59600060006000600060043360c85c03f150','0x60006000100f606859600060006000600060053360c85c03f150', '0x60016001110f6082596000600060006000600c3360c85c03f150','0x60006001110f609c596000600060006000600d3360c85c03f150','0x60016000110f60b6596000600060006000600e3360c85c03f150','0x60006000110f60d0596000600060006000600f3360c85c03f150'],'data':[],'gas':10000,'gasPrice':100000000000000,'origin':'cd1722f3947def4cf144679da39c4c32bdc35681','value':1000000000000000000},'gas':9832,'out':[]}"; - String testCaseString = "{'callcreates':[{'data':'','destination':'cd1722f3947def4cf144679da39c4c32bdc35681','gasLimit':200,'value':74}],'env':{'currentCoinbase':'2adc25665018aa1fe0e6bc666dac8fc2697ff9ba','currentDifficulty':'256','currentGasLimit':'1000000','currentNumber':'0','currentTimestamp':1,'previousHash':'5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6'},'exec':{'address':'0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6','caller':'cd1722f3947def4cf144679da39c4c32bdc35681','code':'0x6000600060006000604a3360c8f1','data':'','gas':10000,'gasPrice':100000000000000,'origin':'cd1722f3947def4cf144679da39c4c32bdc35681','value':1000000000000000000},'gas':9973,'out':[],'post':{'0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6':{'balance':999999999999999926,'code':'','nonce':0,'storage':{}}},'pre':{'0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6':{'balance':1000000000000000000,'code':'','nonce':0,'storage':{}}}}"; - testCaseString = testCaseString.replace("'", "\""); - - JSONObject testCaseJSONObj = (JSONObject)parser.parse(testCaseString); - - TestCase testCase = new TestCase(testCaseJSONObj); - int ccList = testCase.getCallCreateList().size(); - - Assert.assertEquals(1, ccList); - - TestRunner runner = new TestRunner(); - List result = runner.runTestCase(testCase); - Assert.assertTrue(result.size() == 0); - } - - @Test // TestCase file: vmtest-1.json // - public void test6() { - String vmtest = JSONReader.getFromLocal("vmtest-1.json"); - runTest(vmtest); - } - - @Test // TestCase file: vmtest-2.json // - public void test7() { - String vmtest = JSONReader.getFromLocal("vmtest-2.json"); - runTest(vmtest); - } - - @Test // TestCase file: vmtest-3.json // - public void test8() { - String vmtest = JSONReader.getFromLocal("vmtest-3.json"); - runTest(vmtest); - } - - @Test // TestCase file: vmtest-4.json // - public void test9() { - String vmtest = JSONReader.getFromLocal("vmtest-4.json"); - runTest(vmtest); - } - - @Test // TestCase file: vmtest-5.json // - public void test10() { - String vmtest = JSONReader.getFromLocal("vmtest-5.json"); - runTest(vmtest); - } - - private void runTest(String vmtest) { - try { - JSONParser parser = new JSONParser(); - JSONObject testCaseJSONObj = (JSONObject)parser.parse(vmtest); - - TestSuite testSuite = new TestSuite(testCaseJSONObj); - - TestRunner runner = new TestRunner(); - List result = runner.runTestSuite(testSuite); - - Assert.assertTrue(result.size() == 0); - } catch (ParseException e) { - Assert.fail(e.getMessage()); - } - } -}