From 53f6038b6066829105c2bad489fcf0099c673d68 Mon Sep 17 00:00:00 2001 From: Rob Austin Date: Fri, 3 Oct 2014 18:21:05 +0100 Subject: [PATCH] HCOLL-134 refactored and renamed to NodeDiscovery --- .../map/{NodeDescovery.java => NodeDiscovery.java} | 2 +- .../map/NodeDiscoveryBroadcasterTest.java | 9 ++------- .../openhft/chronicle/map/NodeDiscoveryTest.java | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 8 deletions(-) rename src/main/java/net/openhft/chronicle/map/{NodeDescovery.java => NodeDiscovery.java} (99%) create mode 100644 src/test/java/net/openhft/chronicle/map/NodeDiscoveryTest.java diff --git a/src/main/java/net/openhft/chronicle/map/NodeDescovery.java b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java similarity index 99% rename from src/main/java/net/openhft/chronicle/map/NodeDescovery.java rename to src/main/java/net/openhft/chronicle/map/NodeDiscovery.java index 22c812261..3136552e2 100644 --- a/src/main/java/net/openhft/chronicle/map/NodeDescovery.java +++ b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java @@ -31,7 +31,7 @@ import static net.openhft.chronicle.map.Replicators.tcp; /** * @author Rob Austin. */ -public class NodeDescovery { +public class NodeDiscovery { public ChronicleMap discoverMap(int udpBroadcastPort, final int tcpPort) throws IOException, InterruptedException { diff --git a/src/test/java/net/openhft/chronicle/map/NodeDiscoveryBroadcasterTest.java b/src/test/java/net/openhft/chronicle/map/NodeDiscoveryBroadcasterTest.java index faf8065e8..9d35c921f 100644 --- a/src/test/java/net/openhft/chronicle/map/NodeDiscoveryBroadcasterTest.java +++ b/src/test/java/net/openhft/chronicle/map/NodeDiscoveryBroadcasterTest.java @@ -22,12 +22,10 @@ public class NodeDiscoveryBroadcasterTest extends TestCase { byte[] server1Address = Inet4Address.getLocalHost().getAddress(); AddressAndPort server1AddressAndPort = new AddressAndPort(server1Address, (short) 1234); - // write broadcast our address on the bootstrap method byte[] server2Address = Inet4Address.getByName("129.168.0.2").getAddress(); AddressAndPort server2AddressAndPort = new AddressAndPort(server1Address, (short) 1234); - KnownNodes server1KnownNodes = new KnownNodes(); DiscoveryNodeBytesMarshallable server1BytesExternalizable = new DiscoveryNodeBytesMarshallable(server1KnownNodes, null); @@ -38,13 +36,10 @@ public class NodeDiscoveryBroadcasterTest extends TestCase { // SERER1 - is the new node join the cluster // we will first send the boostrap along with our host and port { - - DiscoveryNodeBytesMarshallable.ProposedNodes proposedNodes = new DiscoveryNodeBytesMarshallable.ProposedNodes(server1AddressAndPort, (byte) -1); - + final DiscoveryNodeBytesMarshallable.ProposedNodes proposedNodes = new + DiscoveryNodeBytesMarshallable.ProposedNodes(server1AddressAndPort, (byte) -1); server1BytesExternalizable.sendBootStrap(proposedNodes); - server1BytesExternalizable.writeMarshallable(udpData); - } KnownNodes server2KnownNodes = new KnownNodes(); diff --git a/src/test/java/net/openhft/chronicle/map/NodeDiscoveryTest.java b/src/test/java/net/openhft/chronicle/map/NodeDiscoveryTest.java new file mode 100644 index 000000000..1349dd667 --- /dev/null +++ b/src/test/java/net/openhft/chronicle/map/NodeDiscoveryTest.java @@ -0,0 +1,14 @@ +package net.openhft.chronicle.map; + +import org.junit.Test; + +public class NodeDiscoveryTest { + + @Test + public void testDiscoverMap() throws Exception { + final NodeDiscovery nodeDiscovery = new NodeDiscovery(); + final ChronicleMap map = nodeDiscovery.discoverMap(1235, 1236); + + // Thread.sleep(10000); + } +} \ No newline at end of file