From 772eb27dd2d6b73d346e8763821741dd7308b495 Mon Sep 17 00:00:00 2001
From: shaozhuguang <shaozhuguang@jd.com>
Date: Thu, 20 Jun 2019 15:25:49 +0800
Subject: [PATCH] Fixed Test case !

---
 .../jd/blockchain/ledger/ContractInvokingTest.java | 48 ++++++++++++++++++++--
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/ContractInvokingTest.java b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/ContractInvokingTest.java
index 20f49bd4..eab81350 100644
--- a/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/ContractInvokingTest.java
+++ b/source/ledger/ledger-core/src/test/java/test/com/jd/blockchain/ledger/ContractInvokingTest.java
@@ -92,21 +92,26 @@ public class ContractInvokingTest {
 		DefaultOperationHandleRegisteration opReg = new DefaultOperationHandleRegisteration();
 		opReg.insertAsTopPriority(contractInvokingHandle);
 
+		// 发布指定地址合约
+		deploy(ledgerRepo, ledgerManager, opReg, ledgerHash, contractKey);
+
+
 		// 创建新区块的交易处理器；
 		LedgerBlock preBlock = ledgerRepo.getLatestBlock();
-		LedgerDataSet previousBlockDataset = ledgerRepo.getDataSet(ledgerRepo.getLatestBlock());
+		LedgerDataSet previousBlockDataset = ledgerRepo.getDataSet(preBlock);
+
+		// 加载合约
 		LedgerEditor newBlockEditor = ledgerRepo.createNextBlock();
 		TransactionBatchProcessor txbatchProcessor = new TransactionBatchProcessor(newBlockEditor, previousBlockDataset,
 				opReg, ledgerManager);
 
 		// 构建基于接口调用合约的交易请求，用于测试合约调用；
-		Random rand = new Random();
 		TxBuilder txBuilder = new TxBuilder(ledgerHash);
 		TestContract contractProxy = txBuilder.contract(contractAddress, TestContract.class);
 		TestContract contractProxy1 = txBuilder.contract(contractAddress, TestContract.class);
 
 		String asset = "AK";
-		long issueAmount = rand.nextLong();
+		long issueAmount = new Random().nextLong();
 		when(contractInstance.issue(anyString(), anyLong())).thenReturn(issueAmount);
 		contractProxy.issue(asset, issueAmount);
 
@@ -137,12 +142,41 @@ public class ContractInvokingTest {
 		// 再验证一次结果；
 		assertEquals(1, opResults.length);
 		assertEquals(0, opResults[0].getIndex());
-		
+
 		reallyRetnBytes = BinaryProtocol.encode(opResults[0].getResult(), BytesValue.class);
 		assertArrayEquals(expectedRetnBytes, reallyRetnBytes);
 
 	}
 
+	private void deploy(LedgerRepository ledgerRepo, LedgerManager ledgerManager,
+						DefaultOperationHandleRegisteration opReg, HashDigest ledgerHash,
+						BlockchainKeypair contractKey) {
+		// 创建新区块的交易处理器；
+		LedgerBlock preBlock = ledgerRepo.getLatestBlock();
+		LedgerDataSet previousBlockDataset = ledgerRepo.getDataSet(preBlock);
+
+		// 加载合约
+		LedgerEditor newBlockEditor = ledgerRepo.createNextBlock();
+		TransactionBatchProcessor txbatchProcessor = new TransactionBatchProcessor(newBlockEditor, previousBlockDataset,
+				opReg, ledgerManager);
+
+		// 构建基于接口调用合约的交易请求，用于测试合约调用；
+		TxBuilder txBuilder = new TxBuilder(ledgerHash);
+		txBuilder.contracts().deploy(contractKey.getIdentity(), chainCode());
+		TransactionRequestBuilder txReqBuilder = txBuilder.prepareRequest();
+		txReqBuilder.signAsEndpoint(parti0);
+		txReqBuilder.signAsNode(parti0);
+		TransactionRequest txReq = txReqBuilder.buildRequest();
+
+		TransactionResponse resp = txbatchProcessor.schedule(txReq);
+		OperationResult[] opResults = resp.getOperationResults();
+		assertNull(opResults);
+
+		// 提交区块；
+		TransactionBatchResultHandle txResultHandle = txbatchProcessor.prepare();
+		txResultHandle.commit();
+	}
+
 	private HashDigest initLedger(MemoryKVStorage storage, BlockchainKeypair... partiKeys) {
 		// 创建初始化配置；
 		LedgerInitSetting initSetting = LedgerTestUtils.createLedgerInitSetting(partiKeys);
@@ -180,4 +214,10 @@ public class ContractInvokingTest {
 		HashDigest ledgerHash = block.getHash();
 		return ledgerHash;
 	}
+
+	private byte[] chainCode() {
+		byte[] chainCode = new byte[1024];
+		new Random().nextBytes(chainCode);
+		return chainCode;
+	}
 }