Fix tests

Author: Artem Labazin

client/src/main/java/io/appulse/epmd/java/client/Connection.java

@@ -67,24 +67,32 @@ class Connection implements Closeable {
 
   Socket socket = new Socket();
 
-  @SneakyThrows
-  public void send (@NonNull Object request) {
+  public void send (@NonNull Object request) throws EpmdConnectionException {
     log.debug("Sending: {}", request);
 
     val bytes = SERIALIZER.serialize(request);
 
     connect();
 
-    socket.getOutputStream().write(bytes);
-    socket.getOutputStream().flush();
+    try {
+      socket.getOutputStream().write(bytes);
+      socket.getOutputStream().flush();
+    } catch (IOException ex) {
+      throw new EpmdConnectionException(ex);
+    }
 
     log.debug("Message {} was sent", request);
   }
 
-  public <T> T send (@NonNull Object request, @NonNull Class<T> responseType) throws IOException {
+  public <T> T send (@NonNull Object request, @NonNull Class<T> responseType) throws EpmdConnectionException {
     send(request);
 
-    val messageBytes = read(responseType);
+    byte[] messageBytes;
+    try {
+      messageBytes = read(responseType);
+    } catch (IOException ex) {
+      throw new EpmdConnectionException(ex);
+    }
 
     log.debug("Received bytes:\n{}", messageBytes);
     val result = DESERIALIZER.deserialize(messageBytes, responseType);

client/src/main/java/io/appulse/epmd/java/client/EpmdClient.java

@@ -20,7 +20,6 @@
 import static lombok.AccessLevel.PRIVATE;
 
 import java.io.Closeable;
-import java.io.IOException;
 import java.net.InetAddress;
 import java.util.List;
 
@@ -100,7 +99,6 @@ public int register (String name, int nodePort, NodeType type, Protocol protocol
     return register(request);
   }
 
-  @SneakyThrows
   public int register (@NonNull Registration request) {
     log.debug("Registering: {}", request.getName());
     val connection = getLocalConnection();
@@ -122,7 +120,6 @@ public int register (@NonNull Registration request) {
     return response.getCreation();
   }
 
-  @SneakyThrows
   public List<EpmdDump.NodeDump> dumpAll () {
     try (val connection = new Connection(address, port)) {
       val dump = connection.send(new GetEpmdDump(), EpmdDump.class);
@@ -139,7 +136,7 @@ public boolean kill () {
     try (val connection = new Connection(address, port)) {
       val result = connection.send(new Kill(), KillResult.class);
       return result == OK;
-    } catch (IOException ex) {
+    } catch (RuntimeException ex) {
       return false;
     } finally {
       close();
@@ -162,6 +159,10 @@ public void close () {
     }
   }
 
+  public void clearCaches () {
+    lookupService.clearCache();
+  }
+
   @Override
   protected void finalize () throws Throwable {
     close();

client/src/main/java/io/appulse/epmd/java/client/LookupService.java

@@ -19,7 +19,6 @@
 import static java.util.Optional.ofNullable;
 import static lombok.AccessLevel.PRIVATE;
 
-import java.io.IOException;
 import java.net.InetAddress;
 import java.util.Map;
 import java.util.Optional;
@@ -62,8 +61,6 @@ class LookupService {
       val request = new GetNodeInfo(key.getNode());
       try (val connection = new Connection(key.getAddress(), key.getPort())) {
         return connection.send(request, NodeInfo.class);
-      } catch (IOException ex) {
-        return null;
       }
     };
   }
@@ -96,13 +93,17 @@ public Optional<NodeInfo> lookup (@NonNull String node, @NonNull InetAddress add
     val tokens = node.split("@", 2);
     val shortName = tokens[0];
 
-    log.debug("Looking up node {} at {}", shortName, address);
+    log.debug("Looking up node '{}' at '{}'", shortName, address);
 
     val descriptor = new NodeDescriptor(shortName, address, port);
     val nodeInfo = CACHE.compute(descriptor, COMPUTE);
     return ofNullable(nodeInfo);
   }
 
+  void clearCache () {
+    CACHE.clear();
+  }
+
   @Value
   private static class NodeDescriptor {
 

client/src/test/java/io/appulse/epmd/java/client/LocalEpmdClientTest.java

@@ -22,6 +22,7 @@
 import static io.appulse.epmd.java.core.model.response.EpmdDump.NodeDump.Status.ACTIVE;
 import static lombok.AccessLevel.PRIVATE;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import io.appulse.epmd.java.client.exception.EpmdConnectionException;
 import io.appulse.epmd.java.client.util.CheckLocalEpmdExists;
@@ -63,6 +64,7 @@ public void before () {
   @After
   public void after () {
     if (client != null) {
+      client.clearCaches();
       client.close();
       client = null;
     }
@@ -101,14 +103,18 @@ public void register () throws Exception {
     });
   }
 
-  @Test(expected = EpmdConnectionException.class)
-  public void registerBroken () {
+  @Test
+  public void connectionBroken () {
     val creation = client.register("register", 8971, R3_ERLANG, TCP, R6, R6);
     assertThat(creation).isNotEqualTo(0);
 
     LocalEpmdHelper.kill();
 
-    client.lookup("register");
+    assertThat(LocalEpmdHelper.isRunning())
+        .isFalse();
+
+    assertThatExceptionOfType(EpmdConnectionException.class)
+        .isThrownBy(() -> client.lookup("register"));
   }
 
   @Test

client/src/test/java/io/appulse/epmd/java/client/util/LocalEpmdHelper.java

@@ -25,12 +25,14 @@
 
 import lombok.SneakyThrows;
 import lombok.val;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  *
  * @author Artem Labazin
  * @since 0.2.1
  */
+@Slf4j
 public final class LocalEpmdHelper {
 
   @SneakyThrows
@@ -80,15 +82,15 @@ public static void kill () {
       process.destroy();
       throw new RuntimeException("Killing local EPMD is too long, pid: " + pids);
     }
-    // if (process.exitValue() != 0) {
-    //   process.destroy();
-    //   throw new RuntimeException("Couldn't kill local EPMD with PID " + pids);
-    // }
+    if (process.exitValue() != 0) {
+      process.destroy();
+      throw new RuntimeException("Couldn't kill local EPMD with PID " + pids);
+    }
   }
 
   @SneakyThrows
   public static boolean isRunning () {
-    val builder = new ProcessBuilder("pgrep", "-f", "epmd");
+    val builder = new ProcessBuilder("epmd", "-names");
     val process = builder.start();
     if (!process.waitFor(1, MINUTES)) {
       process.destroy();