clean up and de-deprecate

Author: JerryShea

affinity/src/test/java/net/openhft/affinity/impl/NativeAffinityImpTest.java

@@ -17,7 +17,7 @@
 
 package net.openhft.affinity.impl;
 
-import net.openhft.affinity.AffinitySupport;
+import net.openhft.affinity.Affinity;
 import net.openhft.affinity.IAffinity;
 import org.junit.Assume;
 import org.junit.BeforeClass;
@@ -45,7 +45,7 @@ public IAffinity getImpl() {
     public void testGettid() {
         System.out.println("pid=" + getImpl().getProcessId());
         System.out.println("tid=" + getImpl().getThreadId());
-        AffinitySupport.setThreadId();
+        Affinity.setThreadId();
 
         for (int j = 0; j < 3; j++) {
             final int runs = 100000;

affinity/src/test/java/net/openhft/affinity/impl/PosixJNAAffinityTest.java

@@ -18,7 +18,6 @@
 package net.openhft.affinity.impl;
 
 import net.openhft.affinity.Affinity;
-import net.openhft.affinity.AffinitySupport;
 import net.openhft.affinity.IAffinity;
 import org.junit.Assume;
 import org.junit.BeforeClass;
@@ -44,7 +43,7 @@ public IAffinity getImpl() {
     public void testGettid() {
         System.out.println("pid=" + getImpl().getProcessId());
         System.out.println("tid=" + getImpl().getThreadId());
-        AffinitySupport.setThreadId();
+        Affinity.setThreadId();
 
         for (int j = 0; j < 3; j++) {
             final int runs = 100000;

affinity/src/test/java/net/openhft/affinity/impl/VanillaCpuLayoutTest.java

@@ -22,7 +22,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author peter.lawrey