Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-13 10:45:51 +00:00
Code Issues Projects Releases Wiki Activity

WalletTest: Clean up some assert messages.

Browse Source
This commit is contained in:
Andreas Schildbach 2016-01-01 14:31:10 +01:00
parent 720f7d2a92
commit 73467ea4c9
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
core/src/test/java/org/bitcoinj/core/WalletTest.java
View File

@ -222,9 +222,9 @@ public class WalletTest extends TestWithWallet {
Transaction t = sendMoneyToWallet(wallet, v1, myAddress, null); Transaction t = sendMoneyToWallet(wallet, v1, myAddress, null);
Threading.waitForUserCode(); Threading.waitForUserCode();
sendMoneyToWallet(wallet, t, null); sendMoneyToWallet(wallet, t, null);
assertEquals("Wrong number of PENDING.4", 2, wallet.getPoolSize(Pool.PENDING)); assertEquals("Wrong number of PENDING", 2, wallet.getPoolSize(Pool.PENDING));
assertEquals("Wrong number of UNSPENT.4", 0, wallet.getPoolSize(Pool.UNSPENT)); assertEquals("Wrong number of UNSPENT", 0, wallet.getPoolSize(Pool.UNSPENT));
assertEquals("Wrong number of ALL.4", 3, wallet.getTransactions(true).size()); assertEquals("Wrong number of ALL", 3, wallet.getTransactions(true).size());
assertEquals(valueOf(0, 59), wallet.getBalance(Wallet.BalanceType.ESTIMATED)); assertEquals(valueOf(0, 59), wallet.getBalance(Wallet.BalanceType.ESTIMATED));
// Now we have another incoming pending // Now we have another incoming pending
@ -241,9 +241,9 @@ public class WalletTest extends TestWithWallet {
wallet.cleanup(); wallet.cleanup();
assertTrue(wallet.isConsistent()); assertTrue(wallet.isConsistent());
assertEquals("Wrong number of PENDING.5", 1, wallet.getPoolSize(WalletTransaction.Pool.PENDING)); assertEquals("Wrong number of PENDING", 1, wallet.getPoolSize(WalletTransaction.Pool.PENDING));
assertEquals("Wrong number of UNSPENT.5", 0, wallet.getPoolSize(WalletTransaction.Pool.UNSPENT)); assertEquals("Wrong number of UNSPENT", 0, wallet.getPoolSize(WalletTransaction.Pool.UNSPENT));
assertEquals("Wrong number of ALL.5", 2, wallet.getTransactions(true).size()); assertEquals("Wrong number of ALL", 2, wallet.getTransactions(true).size());
assertEquals(valueOf(0, 49), wallet.getBalance(Wallet.BalanceType.ESTIMATED)); assertEquals(valueOf(0, 49), wallet.getBalance(Wallet.BalanceType.ESTIMATED));
} }
@ -263,9 +263,9 @@ public class WalletTest extends TestWithWallet {
wallet.completeTx(req); wallet.completeTx(req);
wallet.commitTx(req.tx); wallet.commitTx(req.tx);
assertEquals("Wrong number of PENDING.5", 3, wallet.getPoolSize(WalletTransaction.Pool.PENDING)); assertEquals("Wrong number of PENDING", 3, wallet.getPoolSize(WalletTransaction.Pool.PENDING));
assertEquals("Wrong number of UNSPENT.5", 0, wallet.getPoolSize(WalletTransaction.Pool.UNSPENT)); assertEquals("Wrong number of UNSPENT", 0, wallet.getPoolSize(WalletTransaction.Pool.UNSPENT));
assertEquals("Wrong number of ALL.5", 4, wallet.getTransactions(true).size()); assertEquals("Wrong number of ALL", 4, wallet.getTransactions(true).size());
// Consider the new pending as risky and try to remove it from the wallet // Consider the new pending as risky and try to remove it from the wallet
wallet.setRiskAnalyzer(new TestRiskAnalysis.Analyzer(t)); wallet.setRiskAnalyzer(new TestRiskAnalysis.Analyzer(t));
@ -274,9 +274,9 @@ public class WalletTest extends TestWithWallet {
assertTrue(wallet.isConsistent()); assertTrue(wallet.isConsistent());
// The removal should have failed // The removal should have failed
assertEquals("Wrong number of PENDING.5", 3, wallet.getPoolSize(WalletTransaction.Pool.PENDING)); assertEquals("Wrong number of PENDING", 3, wallet.getPoolSize(WalletTransaction.Pool.PENDING));
assertEquals("Wrong number of UNSPENT.5", 0, wallet.getPoolSize(WalletTransaction.Pool.UNSPENT)); assertEquals("Wrong number of UNSPENT", 0, wallet.getPoolSize(WalletTransaction.Pool.UNSPENT));
assertEquals("Wrong number of ALL.5", 4, wallet.getTransactions(true).size()); assertEquals("Wrong number of ALL", 4, wallet.getTransactions(true).size());
assertEquals(ZERO, wallet.getBalance(Wallet.BalanceType.ESTIMATED)); assertEquals(ZERO, wallet.getBalance(Wallet.BalanceType.ESTIMATED));
} }
@ -315,8 +315,8 @@ public class WalletTest extends TestWithWallet {
fail(); fail();
} catch (ECKey.MissingPrivateKeyException kce) { } catch (ECKey.MissingPrivateKeyException kce) {
} }
assertEquals("Wrong number of UNSPENT.1", 1, wallet.getPoolSize(WalletTransaction.Pool.UNSPENT)); assertEquals("Wrong number of UNSPENT", 1, wallet.getPoolSize(WalletTransaction.Pool.UNSPENT));
assertEquals("Wrong number of ALL.1", 1, wallet.getTransactions(true).size()); assertEquals("Wrong number of ALL", 1, wallet.getTransactions(true).size());
// Try to create a send with a fee but the wrong password (this should fail). // Try to create a send with a fee but the wrong password (this should fail).
req = Wallet.SendRequest.to(destination, v2); req = Wallet.SendRequest.to(destination, v2);
@ -331,8 +331,8 @@ public class WalletTest extends TestWithWallet {
assertEquals("Could not decrypt bytes", kce.getMessage()); assertEquals("Could not decrypt bytes", kce.getMessage());
} }
assertEquals("Wrong number of UNSPENT.2", 1, wallet.getPoolSize(WalletTransaction.Pool.UNSPENT)); assertEquals("Wrong number of UNSPENT", 1, wallet.getPoolSize(WalletTransaction.Pool.UNSPENT));
assertEquals("Wrong number of ALL.2", 1, wallet.getTransactions(true).size()); assertEquals("Wrong number of ALL", 1, wallet.getTransactions(true).size());
// Create a send with a fee with the correct password (this should succeed). // Create a send with a fee with the correct password (this should succeed).
req = Wallet.SendRequest.to(destination, v2); req = Wallet.SendRequest.to(destination, v2);
@ -346,8 +346,8 @@ public class WalletTest extends TestWithWallet {
wallet.completeTx(req); wallet.completeTx(req);
Transaction t2 = req.tx; Transaction t2 = req.tx;
assertEquals("Wrong number of UNSPENT.3", 1, wallet.getPoolSize(WalletTransaction.Pool.UNSPENT)); assertEquals("Wrong number of UNSPENT", 1, wallet.getPoolSize(WalletTransaction.Pool.UNSPENT));
assertEquals("Wrong number of ALL.3", 1, wallet.getTransactions(true).size()); assertEquals("Wrong number of ALL", 1, wallet.getTransactions(true).size());
assertEquals(TransactionConfidence.Source.SELF, t2.getConfidence().getSource()); assertEquals(TransactionConfidence.Source.SELF, t2.getConfidence().getSource());
assertEquals(Transaction.Purpose.USER_PAYMENT, t2.getPurpose()); assertEquals(Transaction.Purpose.USER_PAYMENT, t2.getPurpose());
@ -2043,23 +2043,23 @@ public class WalletTest extends TestWithWallet {
assertTrue("Wallet is not an encrypted wallet", encryptedWallet.getEncryptionType() == EncryptionType.ENCRYPTED_SCRYPT_AES); assertTrue("Wallet is not an encrypted wallet", encryptedWallet.getEncryptionType() == EncryptionType.ENCRYPTED_SCRYPT_AES);
// Decrypt wallet. // Decrypt wallet.
assertTrue("The keyCrypter is missing but should not be.1", keyCrypter != null); assertTrue("The keyCrypter is missing but should not be", keyCrypter != null);
encryptedWallet.decrypt(aesKey); encryptedWallet.decrypt(aesKey);
// Try decrypting it again // Try decrypting it again
try { try {
assertTrue("The keyCrypter is missing but should not be.2", keyCrypter != null); assertTrue("The keyCrypter is missing but should not be", keyCrypter != null);
encryptedWallet.decrypt(aesKey); encryptedWallet.decrypt(aesKey);
fail("Should not be able to decrypt a decrypted wallet"); fail("Should not be able to decrypt a decrypted wallet");
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
assertTrue("Expected behaviour", true); assertTrue("Expected behaviour", true);
} }
assertTrue("Wallet is not an unencrypted wallet.2", encryptedWallet.getKeyCrypter() == null); assertTrue("Wallet is not an unencrypted wallet", encryptedWallet.getKeyCrypter() == null);
// Encrypt wallet. // Encrypt wallet.
encryptedWallet.encrypt(keyCrypter, aesKey); encryptedWallet.encrypt(keyCrypter, aesKey);
assertTrue("Wallet is not an encrypted wallet.2", encryptedWallet.getEncryptionType() == EncryptionType.ENCRYPTED_SCRYPT_AES); assertTrue("Wallet is not an encrypted wallet", encryptedWallet.getEncryptionType() == EncryptionType.ENCRYPTED_SCRYPT_AES);
// Try encrypting it again // Try encrypting it again
try { try {
@ -2068,7 +2068,7 @@ public class WalletTest extends TestWithWallet {
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
assertTrue("Expected behaviour", true); assertTrue("Expected behaviour", true);
} }
assertTrue("Wallet is not an encrypted wallet.3", encryptedWallet.getEncryptionType() == EncryptionType.ENCRYPTED_SCRYPT_AES); assertTrue("Wallet is not an encrypted wallet", encryptedWallet.getEncryptionType() == EncryptionType.ENCRYPTED_SCRYPT_AES);
} }
@Test(expected = KeyCrypterException.class) @Test(expected = KeyCrypterException.class)