Added tests and code improvements
This commit is contained in:
@ -31,16 +31,13 @@ import org.hamcrest.Description;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.*;
|
||||
|
||||
import static ch.dissem.bitmessage.entity.payload.ObjectType.*;
|
||||
import static ch.dissem.bitmessage.utils.MessageMatchers.object;
|
||||
import static org.hamcrest.CoreMatchers.is;
|
||||
import static org.hamcrest.CoreMatchers.notNullValue;
|
||||
import static org.junit.Assert.*;
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
/**
|
||||
@ -216,6 +213,38 @@ public class BitmessageContextTest {
|
||||
assertTrue(chan.isChan());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void ensureDeterministicAddressesAreCreated() {
|
||||
final int expected_size = 8;
|
||||
List<BitmessageAddress> addresses = ctx.createDeterministicAddresses("test", expected_size, 4, 1, false);
|
||||
assertEquals(expected_size, addresses.size());
|
||||
Set<String> expected = new HashSet<>(expected_size);
|
||||
expected.add("BM-2cWFkyuXXFw6d393RGnin2RpSXj8wxtt6F");
|
||||
expected.add("BM-2cX8TF9vuQZEWvT7UrEeq1HN9dgiSUPLEN");
|
||||
expected.add("BM-2cUzX8f9CKUU7L8NeB8GExZvf54PrcXq1S");
|
||||
expected.add("BM-2cU7MAoQd7KE8SPF7AKFPpoEZKjk86KRqE");
|
||||
expected.add("BM-2cVm8ByVBacc2DVhdTNs6rmy5ZQK6DUsrt");
|
||||
expected.add("BM-2cW2af1vB6kWon2WkygDHqGwfcpfAFm2Jk");
|
||||
expected.add("BM-2cWdWD7UtUN4gWChgNX9pvyvNPjUZvU8BT");
|
||||
expected.add("BM-2cXkYgYcUrv4fGxSHzyEScW955Cc8sDteo");
|
||||
for (BitmessageAddress a : addresses) {
|
||||
assertTrue(expected.contains(a.getAddress()));
|
||||
expected.remove(a.getAddress());
|
||||
}
|
||||
}
|
||||
@Test
|
||||
public void ensureShortDeterministicAddressesAreCreated() {
|
||||
final int expected_size = 1;
|
||||
List<BitmessageAddress> addresses = ctx.createDeterministicAddresses("test", expected_size, 4, 1, true);
|
||||
assertEquals(expected_size, addresses.size());
|
||||
Set<String> expected = new HashSet<>(expected_size);
|
||||
expected.add("BM-NBGyBAEp6VnBkFWKpzUSgxuTqVdWPi78");
|
||||
for (BitmessageAddress a : addresses) {
|
||||
assertTrue(expected.contains(a.getAddress()));
|
||||
expected.remove(a.getAddress());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void ensureChanIsCreated() {
|
||||
BitmessageAddress chan = ctx.createChan("test");
|
||||
|
@ -40,8 +40,6 @@ import static ch.dissem.bitmessage.entity.Plaintext.Status.PUBKEY_REQUESTED;
|
||||
import static ch.dissem.bitmessage.entity.Plaintext.Type.BROADCAST;
|
||||
import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
|
||||
import static ch.dissem.bitmessage.utils.MessageMatchers.plaintext;
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
/**
|
||||
|
@ -34,10 +34,6 @@ import java.util.Arrays;
|
||||
import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
|
||||
import static org.hamcrest.CoreMatchers.equalTo;
|
||||
import static org.junit.Assert.assertThat;
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Matchers.isNull;
|
||||
import static org.mockito.Mockito.anyLong;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
/**
|
||||
|
@ -57,7 +57,7 @@ public class EncodeTest {
|
||||
checkBytes(stream, 4, 3, 2, 1);
|
||||
|
||||
stream = new ByteArrayOutputStream();
|
||||
Encode.int32(3355443201l, stream);
|
||||
Encode.int32(3355443201L, stream);
|
||||
checkBytes(stream, 200, 0, 0, 1);
|
||||
}
|
||||
|
||||
|
@ -21,7 +21,6 @@ import ch.dissem.bitmessage.entity.Plaintext;
|
||||
import ch.dissem.bitmessage.entity.payload.ObjectType;
|
||||
import org.hamcrest.BaseMatcher;
|
||||
import org.hamcrest.Description;
|
||||
import org.hamcrest.Matcher;
|
||||
import org.mockito.Matchers;
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user