cleanup tests and added LockCheck and test cases

Rob Austin · Rob Austin · commit 4628217f19b5 · 2016-07-28T19:36:59.000+01:00
diff --git a/affinity/src/main/java/net/openhft/affinity/LockCheck.java b/affinity/src/main/java/net/openhft/affinity/LockCheck.java
@@ -5,24 +5,24 @@
 import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.function.Supplier;
 
 
 /**
  * @author Rob Austin.
  */
-public class LockCheck {
+class LockCheck {
 
     static final String TMP = System.getProperty("java.io.tmpdir");
-    public static final String TARGET = System.getProperty("project.build.directory", findTarget());
     private static final String OS = System.getProperty("os.name").toLowerCase();
     static final boolean IS_LINUX = OS.startsWith("linux");
-    private ThreadLocal<SimpleDateFormat> df = ThreadLocal.withInitial(new Supplier() {
+
+    private ThreadLocal<SimpleDateFormat> df = new ThreadLocal() {
+
         @Override
-        public Object get() {
+        protected Object initialValue() {
             return new SimpleDateFormat("yyyy.MM" + ".dd 'at' HH:mm:ss z");
         }
-    });
+    };
 
     private static String findTarget() {
         for (File dir = new File(System.getProperty("user.dir")); dir != null; dir = dir.getParentFile()) {
@@ -41,10 +41,10 @@ private static String findTarget() {
      * @return
      * @throws IOException
      */
-    public boolean isCoreAlreadyAssigned(int core, long processID) throws IOException {
+    boolean isCoreAlreadyAssigned(int core, long processID) throws IOException {
 
-        File file = new File(tmpDir(), "core-" + core);
-        boolean exists = file.exists();
+        final File file = new File(tmpDir(), "core-" + core + ".lock");
+        final boolean exists = file.exists();
 
         if (!exists) {
             // create a lock file
@@ -58,7 +58,6 @@ public boolean isCoreAlreadyAssigned(int core, long processID) throws IOExceptio
             }
             return false;
         }
-
     }
 
     private void replacePid(long processID, File file) throws IOException {
@@ -90,7 +89,7 @@ private void storePid(long processID, File coreFile) throws IOException {
     }
 
     int getPid(int core) throws IOException {
-        return getPid(new File(tmpDir(), "core-" + core));
+        return getPid(new File(tmpDir(), "core-" + core + ".lock"));
     }
 
     private int getPid(@NotNull File coreFile) throws IOException {
@@ -112,5 +111,4 @@ private File tmpDir() {
         return tempDir;
     }
 
-
 }
