I2P_Developers/i2p.i2p-bote
3
0
Fork 0
Code Issues 4 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Fix: test failed because peers[199] was the same destination as localDestination

Browse Source 
* Comments
This commit is contained in:
HungryHobo
2010-02-09 19:13:39 +00:00
parent e4d317c76d
commit 40bd121a77
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/i2p/bote/network/kademlia/BucketManagerTest.java
View File

@ -250,7 +250,7 @@ public class BucketManagerTest {
peers[196] = new Destination("z88r9D6I34KYYJDhB7wjQsDIGEQRFjJ335O-HNvlUEbU7co794jXNl6VTPvPosD5MedFKXCfIA4ypyezeX4A0H7i0wXY22xlP7dXO0~qfXTdY6YK78bgywky4D9qPlj6TJ5HXFgzEmtmPvRHH77a3hogy7JSdt4iI8x6Ao3csE8FcE~XiIzw-hnVvcRAOZyxYRmYNYdRdEbvw1vPqLjdqgQuRmfecjSm14QlGu-2GqJ-gVHHDiB8pjAw6ixIrJhfYKz0ChUft3C1R0aZwTs7CrunFOG9dhQeovChTHci7BfFwVAh0yHynlO9rSngBl7wHc7LtjF2TPpym~sUnQF0e3yKPVHFmPVffmLNW~7yZZLgh9-Wo91k-Vayiz7EKtVCNOSwCInagC0w0EjnWqS5NJEVfIpNKDyY5RMqRCPaimiAXm2fD7G2r4k~mvax~x3cadHgdZDpptHQZ~PCOzD4SHQPzSYNC3qlwyAA~oY25RfAH-YYGyYrxkScY9JwNjNsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADmlW2iDMQ3iIv2PLDWPMqYMX5-YxdqJXoKf~H82bheMM9e0iF6BASCd8HIH4l-pq1");
peers[197] = new Destination("skUYyApfvRu00m2gU1vLrN6K-wMJrAt8ZqH9KyQdP~0O51CfdaJihjwQvhL0vzB0-tVflDGUE4xfMAyHAfgIFkEnRKq27MUKlqK3BT4wa-GWVb0AtP7iOEGmehued~nyqV1l3EVKlu6qCw0OgdpsAJj27Tx6kT1gke3p7I~qGsR9FyA~moOfVqPT~89T97hsgc7Z-ufGIrbNf8fUiiojoSPAkwynniLDO4UmaItT-ZWBAYbEZwoOL6NHXELPJJTOf408t4ImSoCzTmHJi-Bf5HWUvDXo9iWRrLuekHdAGbA6y6gZ40Pdl87GhvkhSMg0Ciduf1TH7qtiJl38Dx92boflnjgKb95b01TWuYntYjrS9EAVVnUaO1MJ546iEQZw92Vfkp~AirFVFc8ioO5jV9WhFu8RmOHtYyvILL-FW3rQ0cmYRVuiBut2-p8LMk6JAvPNaT37qPmY9AhpdCYAFEIVCMYPmcjDDQI1Vy8SUExr-dLOP72CFwRcDHD2PgddAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADc58G6GJvtP3MqE-ONGZHXsfagjTm2Ey0tRyRRYPzQ1AhTTF-tjVp-p-w1R9Za0dC");
peers[198] = new Destination("hAcUDpR-gcFApoyQpQPlls33zGfCUkLI-WKbKITu7chMB7XB1j2SdRM2ufSzWKhnde90i9UEjdmvVvnR30lWPXJN8metSxCxhkwbeVSGNVR5SCcI92ctp51QxALBMM~OnHn2HM48Y2a7VEiPqZlV7Nhh4wMYWcloPMT1FVCBPnVSMw6hkLdKruHy5nRB7BNytB~mMmKb5dD44ytnqlAqb-phWZGQNlewtBTcVAEK7M3z8Sfyqd6nYZr99QbSWz8CiBhFgWQsHJ~sd7tlqamtU870GwWJ-zG7mQfcbBFbRh2M0xdgkLYiYVaFIDSDSQuAMzkOpe85YtnZBuMSBvTJ4hV~-3-z515ZW6825tTzrATVKygcfQikaRADx7UqpNvZf7B3VH66V~KvQcFwJHCSRNjdc30fabXAaZRQtkvMol~nxalKM8~4lk~Cwfof1MBYb5Wkvxizas3O3erc6bBlv31DytSAtXbQOzwBRM0mHWMJgX9GU33YRr8maBOjoQGtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACyARgIM2XQrQc8D6MvFSOLZnrk~C~Wi76y5H-FxvKbrc5PGxgsNHf4ZY5A1p40imf");
peers[199] = new Destination("-9MbVsIvFXRzeTMyJmZeEzU6OsGS6cvth21HB1IzftqJs3frleYrGVAtIVlkLMX66bV~nM8Fxhk8Rs-6Qk3tvIW1MJK68X3lY1e1FVw70x6jtlJNMww4uUuL5r1DdBggW8h1srCtXixHACi8JsKqaLVjJ6WwpLigTsUP6r82jxeJ-QF-lcPrIsx1Ku6YLMVY4jeAOOqFpZKHw6wXlQL28mhHK7ZyAMLgZyHQsQuJ3BWnU57znbA8-6Chk2jbZS9gepWrlW1Bx~1D3UAKtp-5odloSnKqjSMBQCa4xG7s1r2xmnGTsjecfQJldby4EI-~dsmHfNr-aVkvO9FlD8lmhDs0ICFEaH9sWcpss3KQayF6ZstrBPvlSDImkkDqwpXQHSC-b9fRYjZojeGOgEiOq5p-5vDge9y-W5y0SWlxq58UqYxEVLwSJB-7KugcMqjMVNPRXyxZZdkMyEZpaLYoA0n6n4Sk43Ogn~EVdeSgGFoFBwKd2Nfve8puwkN6BgzCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfbCpYfylIhd8g6rx4VR4M7KTRxafDCOjzpw4z2lZtYgqOU3Vgsfscz3a9Bgr9dKb");
peers[199] = new Destination("LsWHwmsa10PSqTYCJZA5VKNxFVrBdixfoUypyqolPalQRRjgYvbRbMvF3TDY1jvv8NV2wg~V8Ju35TXhyqUL2eUT8w1F5FN4ramRwIDO4ahCvDSiIy~CB2MlJGGncFV3q4F4g6FqwjEQcPEWz2lYeLJxtHgrB2MFZhLNAriNFMvuAujNouTEreWNSziJN92paXZgYYChvVknKd3C1sZ2T-upBD1Du6PYiV5HGnvJf1eqSpCFGAI4EqWe2ubsMg9ku8HP0-QzaBkCfslywh8WvcpwJr3yylw2d4tLmCCzt80VQjH-DEzXjOTwgxysD5dKqweQWFB2oh5Ogwj2KKO6pG5dIc2TsVLyH0nPxOkc1pMjhCxq0ChNfsSkX8kO-9WocuIlnw32yPn2nyrk8VneHVOWOzNBNbP~cIr1afLNYG5z12RYVx9KCr95e8f5LU-5-tVw8a3sjxWVzt3Dc~wfTKXGgdrHYWoRQdOFv2mkyckCaxM4DhLDFCGVdj2jjxk9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC-8jmLgwEOpRNMQfxoCAXP~ksLV36RxM9NNPEhwS4eSXeR3iSOzaYu8-etb5M~3p8");
bucketManager = new BucketManager(localDestination.calculateHash());
}
@ -276,14 +276,14 @@ public class BucketManagerTest {
assertEquals(S + K, bucketManager.getAllPeers().size());
assertEquals(1, getNumKBuckets());
// add one more destination
// add one more destination, which should split the k-bucket
int index = S + K;
bucketManager.addOrUpdate(peers[index]);
assertEquals(S+K+1, bucketManager.getPeerCount());
assertEquals(S+K+1, bucketManager.getAllPeers().size());
assertTrue(getNumKBuckets() >= 2); // there should be at least 2 buckets after the split
// add the 4*K-1 more peers for a total of S + 5 * K
// add 4*K-1 more peers for a total of S + 5 * K
startIndex = S + K + 1;
for (int i=0; i<4*K-1; i++)
bucketManager.addOrUpdate(peers[startIndex+i]);
@ -377,7 +377,8 @@ public class BucketManagerTest {
numBuckets++;
return numBuckets;
}
// returns all k-buckets and the sibling bucket
private List<AbstractBucket> getAllBuckets() throws IllegalArgumentException, SecurityException, IllegalAccessException, NoSuchFieldException {
List<AbstractBucket> buckets = new ArrayList<AbstractBucket>();
for (AbstractBucket bucket: bucketManager)
@ -385,7 +386,8 @@ public class BucketManagerTest {
buckets.add(getSiblingBucket());
return buckets;
}
// returns all peers from the k-buckets, i.e. all peers except siblings
private List<KademliaPeer> getKPeers() {
List<KademliaPeer> peers = new ArrayList<KademliaPeer>();
for (AbstractBucket bucket: bucketManager)