Improve testing for windows.

peter-lawrey · peter-lawrey · commit 8b22685a0026 · 2012-04-28T11:50:12.000+01:00
diff --git a/src/main/java/vanilla/java/affinity/AffinityLock.java b/src/main/java/vanilla/java/affinity/AffinityLock.java
@@ -350,7 +350,24 @@ protected void finalize() throws Throwable {
         super.finalize();
     }
 
+    /**
+     * @return unique id for this CPI or -1 if not allocated.
+     */
     public int cpuId() {
         return cpuId;
     }
+
+    /**
+     * @return Was a cpu found to bind this lock to.
+     */
+    public boolean isAllocated() {
+        return cpuId >= 0;
+    }
+
+    /**
+     * @return Has this AffinityLock been bound?
+     */
+    public boolean isBound() {
+        return bound;
+    }
 }
diff --git a/src/main/java/vanilla/java/affinity/impl/NativeAffinity.java b/src/main/java/vanilla/java/affinity/impl/NativeAffinity.java
@@ -36,7 +36,7 @@ public enum NativeAffinity implements IAffinity {
             System.loadLibrary("affinity");
             loaded = true;
         } catch (UnsatisfiedLinkError ule) {
-            if (LOGGER.isLoggable(Level.INFO))
+            if (LOGGER.isLoggable(Level.INFO) && System.getProperty("os.name").equalsIgnoreCase("Linux"))
                 LOGGER.info("Unable to find libaffinity in " + System.getProperty("java.library.path") + " " + ule);
             loaded = false;
         }
diff --git a/src/test/java/vanilla/java/affinity/AffinityLockTest.java b/src/test/java/vanilla/java/affinity/AffinityLockTest.java
@@ -135,15 +135,21 @@ public void assignReleaseThread() throws IOException {
     public void testIssue21() {
         AffinityLock al = AffinityLock.acquireLock();
         AffinityLock alForAnotherThread = al.acquireLock(AffinityStrategies.ANY);
-        AffinityLock alForAnotherThread2 = al.acquireLock(AffinityStrategies.ANY);
-        assertNotSame(alForAnotherThread, alForAnotherThread2);
-        assertNotSame(alForAnotherThread.cpuId(), alForAnotherThread2.cpuId());
-
-        al.release();
+        if (Runtime.getRuntime().availableProcessors() > 2) {
+            AffinityLock alForAnotherThread2 = al.acquireLock(AffinityStrategies.ANY);
+            assertNotSame(alForAnotherThread, alForAnotherThread2);
+            assertNotSame(alForAnotherThread.cpuId(), alForAnotherThread2.cpuId());
+
+            alForAnotherThread2.release();
+        } else {
+            assertNotSame(alForAnotherThread, al);
+            assertNotSame(alForAnotherThread.cpuId(), al.cpuId());
+        }
         alForAnotherThread.release();
-        alForAnotherThread2.release();
+        al.release();
     }
 
+
     @Test
     public void testIssue19() {
         AffinityLock al = AffinityLock.acquireLock();

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public enum NativeAffinity implements IAffinity {`
`36`	`36`	`System.loadLibrary("affinity");`
`37`	`37`	`loaded = true;`
`38`	`38`	`} catch (UnsatisfiedLinkError ule) {`
`39`		`- if (LOGGER.isLoggable(Level.INFO))`
	`39`	`+ if (LOGGER.isLoggable(Level.INFO) && System.getProperty("os.name").equalsIgnoreCase("Linux"))`
`40`	`40`	`LOGGER.info("Unable to find libaffinity in " + System.getProperty("java.library.path") + " " + ule);`
`41`	`41`	`loaded = false;`
`42`	`42`	`}`