mirror of
https://github.com/haveno-dex/haveno.git
synced 2025-07-26 00:15:18 -04:00
use tomp2p master branch
This commit is contained in:
parent
79a52a6e38
commit
d943ee0918
14 changed files with 40 additions and 952 deletions
|
@ -3,6 +3,7 @@ package io.bitsquare;
|
|||
import io.bitsquare.btc.BtcValidatorTest;
|
||||
import io.bitsquare.gui.util.BitSquareConverterTest;
|
||||
import io.bitsquare.gui.util.BitSquareValidatorTest;
|
||||
import io.bitsquare.msg.P2PNodeTest;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.runners.Suite;
|
||||
|
||||
|
@ -11,6 +12,7 @@ import org.junit.runners.Suite;
|
|||
BtcValidatorTest.class,
|
||||
BitSquareConverterTest.class,
|
||||
BitSquareValidatorTest.class,
|
||||
P2PNodeTest.class
|
||||
})
|
||||
|
||||
public class BitSquareTestSuite
|
||||
|
|
|
@ -17,13 +17,13 @@ public class BitSquareConverterTest
|
|||
assertEquals(1, BitSquareConverter.stringToDouble("1.0"), 0);
|
||||
assertEquals(1, BitSquareConverter.stringToDouble("1,0"), 0);
|
||||
|
||||
assertEquals(Double.NEGATIVE_INFINITY, BitSquareConverter.stringToDouble("1,000.2"), 0);
|
||||
assertEquals(Double.NEGATIVE_INFINITY, BitSquareConverter.stringToDouble("1,000.2"), 0);
|
||||
assertEquals(Double.NEGATIVE_INFINITY, BitSquareConverter.stringToDouble(null), 0);
|
||||
assertEquals(Double.NEGATIVE_INFINITY, BitSquareConverter.stringToDouble(""), 0);
|
||||
assertEquals(Double.NEGATIVE_INFINITY, BitSquareConverter.stringToDouble(""), 0);
|
||||
assertEquals(Double.NEGATIVE_INFINITY, BitSquareConverter.stringToDouble("."), 0);
|
||||
assertEquals(Double.NEGATIVE_INFINITY, BitSquareConverter.stringToDouble(","), 0);
|
||||
assertEquals(Double.NEGATIVE_INFINITY, BitSquareConverter.stringToDouble("a"), 0);
|
||||
assertEquals(0, BitSquareConverter.stringToDouble("1,000.2"), 0);
|
||||
assertEquals(0, BitSquareConverter.stringToDouble("1,000.2"), 0);
|
||||
assertEquals(0, BitSquareConverter.stringToDouble(null), 0);
|
||||
assertEquals(0, BitSquareConverter.stringToDouble(""), 0);
|
||||
assertEquals(0, BitSquareConverter.stringToDouble(""), 0);
|
||||
assertEquals(0, BitSquareConverter.stringToDouble("."), 0);
|
||||
assertEquals(0, BitSquareConverter.stringToDouble(","), 0);
|
||||
assertEquals(0, BitSquareConverter.stringToDouble("a"), 0);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@ import java.io.IOException;
|
|||
import java.security.KeyPair;
|
||||
import java.security.KeyPairGenerator;
|
||||
import java.util.Random;
|
||||
import net.tomp2p.connection.Ports;
|
||||
import net.tomp2p.dht.FutureGet;
|
||||
import net.tomp2p.dht.FuturePut;
|
||||
import net.tomp2p.dht.FutureRemove;
|
||||
|
@ -29,7 +30,7 @@ public class P2PNodeTest
|
|||
@Test
|
||||
public void testSendData() throws Exception
|
||||
{
|
||||
PeerDHT[] peers = UtilsDHT2.createNodes(3, rnd, 41001);
|
||||
PeerDHT[] peers = UtilsDHT2.createNodes(3, rnd, new Ports().tcpPort());
|
||||
PeerDHT master = peers[0];
|
||||
PeerDHT client = peers[1];
|
||||
PeerDHT otherPeer = peers[2];
|
||||
|
@ -66,12 +67,14 @@ public class P2PNodeTest
|
|||
assertTrue(futureDirect.isSuccess());
|
||||
// we return true from objectDataReply
|
||||
assertTrue((Boolean) futureDirect.object());
|
||||
|
||||
master.shutdown();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProtectedPutGet() throws Exception
|
||||
{
|
||||
PeerDHT[] peers = UtilsDHT2.createNodes(3, rnd, 41001);
|
||||
PeerDHT[] peers = UtilsDHT2.createNodes(3, rnd, new Ports().tcpPort());
|
||||
PeerDHT master = peers[0];
|
||||
PeerDHT client = peers[1];
|
||||
PeerDHT otherPeer = peers[2];
|
||||
|
@ -157,7 +160,7 @@ public class P2PNodeTest
|
|||
@Test
|
||||
public void testAddToListGetList() throws Exception
|
||||
{
|
||||
PeerDHT[] peers = UtilsDHT2.createNodes(3, rnd, 41001);
|
||||
PeerDHT[] peers = UtilsDHT2.createNodes(3, rnd, new Ports().tcpPort());
|
||||
PeerDHT master = peers[0];
|
||||
PeerDHT client = peers[1];
|
||||
PeerDHT otherPeer = peers[2];
|
||||
|
@ -367,7 +370,6 @@ public class P2PNodeTest
|
|||
assertTrue(foundData3);
|
||||
assertEquals(2, futureGet.dataMap().values().size());
|
||||
|
||||
|
||||
master.shutdown();
|
||||
}
|
||||
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
package lighthouse.threading;
|
||||
|
||||
import javafx.collections.FXCollections;
|
||||
import javafx.collections.ObservableList;
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
|
||||
public class ConcatenatingListTest
|
||||
{
|
||||
@Test
|
||||
public void basic() throws Exception
|
||||
{
|
||||
ObservableList<String> a = FXCollections.observableArrayList();
|
||||
ObservableList<String> b = FXCollections.observableArrayList();
|
||||
ConcatenatingList<String> concat = new ConcatenatingList<>(a, b);
|
||||
assertEquals(0, concat.size());
|
||||
a.add("1");
|
||||
assertEquals(1, concat.size());
|
||||
assertEquals("1", concat.get(0));
|
||||
b.add("2");
|
||||
assertEquals(2, concat.size());
|
||||
assertEquals("2", concat.get(1));
|
||||
}
|
||||
}
|
|
@ -1,91 +0,0 @@
|
|||
package lighthouse.threading;
|
||||
|
||||
import java.util.LinkedList;
|
||||
import java.util.Queue;
|
||||
import javafx.collections.FXCollections;
|
||||
import javafx.collections.ListChangeListener;
|
||||
import javafx.collections.ObservableList;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
public class MappedListTest
|
||||
{
|
||||
private ObservableList<String> inputs;
|
||||
private ObservableList<String> outputs;
|
||||
private Queue<ListChangeListener.Change<? extends String>> changes;
|
||||
|
||||
@Before
|
||||
public void setup()
|
||||
{
|
||||
inputs = FXCollections.observableArrayList();
|
||||
outputs = new MappedList<>(inputs, str -> "Hello " + str);
|
||||
changes = new LinkedList<>();
|
||||
outputs.addListener(changes::add);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void add() throws Exception
|
||||
{
|
||||
assertEquals(0, outputs.size());
|
||||
inputs.add("Mike");
|
||||
ListChangeListener.Change<? extends String> change = getChange();
|
||||
assertTrue(change.wasAdded());
|
||||
assertEquals("Hello Mike", change.getAddedSubList().get(0));
|
||||
assertEquals(1, outputs.size());
|
||||
assertEquals("Hello Mike", outputs.get(0));
|
||||
inputs.remove(0);
|
||||
assertEquals(0, outputs.size());
|
||||
}
|
||||
|
||||
private ListChangeListener.Change<? extends String> getChange()
|
||||
{
|
||||
ListChangeListener.Change<? extends String> change = changes.poll();
|
||||
change.next();
|
||||
return change;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void remove()
|
||||
{
|
||||
inputs.add("Mike");
|
||||
inputs.add("Dave");
|
||||
inputs.add("Katniss");
|
||||
getChange();
|
||||
getChange();
|
||||
getChange();
|
||||
assertEquals("Hello Mike", outputs.get(0));
|
||||
assertEquals("Hello Dave", outputs.get(1));
|
||||
assertEquals("Hello Katniss", outputs.get(2));
|
||||
inputs.remove(0);
|
||||
ListChangeListener.Change<? extends String> change = getChange();
|
||||
assertTrue(change.wasRemoved());
|
||||
assertEquals(2, outputs.size());
|
||||
assertEquals(1, change.getRemovedSize());
|
||||
assertEquals("Hello Mike", change.getRemoved().get(0));
|
||||
assertEquals("Hello Dave", outputs.get(0));
|
||||
|
||||
inputs.remove(1);
|
||||
assertEquals(1, outputs.size());
|
||||
assertEquals("Hello Dave", outputs.get(0));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void replace() throws Exception
|
||||
{
|
||||
inputs.add("Mike");
|
||||
inputs.add("Dave");
|
||||
getChange();
|
||||
getChange();
|
||||
inputs.set(0, "Bob");
|
||||
assertEquals("Hello Bob", outputs.get(0));
|
||||
ListChangeListener.Change<? extends String> change = getChange();
|
||||
assertTrue(change.wasReplaced());
|
||||
assertEquals("Hello Mike", change.getRemoved().get(0));
|
||||
assertEquals("Hello Bob", change.getAddedSubList().get(0));
|
||||
}
|
||||
|
||||
// Could also test permutation here if I could figure out how to actually apply one!
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue