Fix some windows test failures (#1305)

Author: dbwiddis

contrib/platform/test/com/sun/jna/platform/win32/Advapi32Test.java

@@ -143,15 +143,19 @@ public void testLookupAccountName() {
         String accountName = "Administrator";
         assertFalse(Advapi32.INSTANCE.LookupAccountName(
                 null, accountName, null, pSid, null, pDomain, peUse));
-        assertEquals(W32Errors.ERROR_INSUFFICIENT_BUFFER, Kernel32.INSTANCE.GetLastError());
-        assertTrue(pSid.getValue() > 0);
-        Memory sidMemory = new Memory(pSid.getValue());
-        PSID pSidMemory = new PSID(sidMemory);
-        char[] referencedDomainName = new char[pDomain.getValue() + 1];
-        assertTrue(Advapi32.INSTANCE.LookupAccountName(
-                null, accountName, pSidMemory, pSid, referencedDomainName, pDomain, peUse));
-        assertEquals(SID_NAME_USE.SidTypeUser, peUse.getPointer().getInt(0));
-        assertTrue(Native.toString(referencedDomainName).length() > 0);
+        int lastError = Kernel32.INSTANCE.GetLastError();
+        // The Administrator account may not exist
+        if (lastError != W32Errors.ERROR_NONE_MAPPED) {
+            assertEquals(W32Errors.ERROR_INSUFFICIENT_BUFFER, lastError);
+            assertTrue(pSid.getValue() > 0);
+            Memory sidMemory = new Memory(pSid.getValue());
+            PSID pSidMemory = new PSID(sidMemory);
+            char[] referencedDomainName = new char[pDomain.getValue() + 1];
+            assertTrue(Advapi32.INSTANCE.LookupAccountName(null, accountName, pSidMemory, pSid, referencedDomainName,
+                    pDomain, peUse));
+            assertEquals(SID_NAME_USE.SidTypeUser, peUse.getPointer().getInt(0));
+            assertTrue(Native.toString(referencedDomainName).length() > 0);
+        }
     }
 
     public void testIsValidSid() {

contrib/platform/test/com/sun/jna/platform/win32/IPHlpAPITest.java

@@ -26,6 +26,7 @@
 import static com.sun.jna.platform.win32.IPHlpAPI.AF_INET;
 import static com.sun.jna.platform.win32.IPHlpAPI.AF_INET6;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.math.BigInteger;
@@ -66,25 +67,18 @@ public void testGetIfEntry() throws SocketException {
                 MIB_IFROW ifRow = new MIB_IFROW();
                 ifRow.dwIndex = netint.getIndex();
                 assertEquals(WinError.NO_ERROR, IPHLP.GetIfEntry(ifRow));
-                // Bytes should exceed packets
                 // These originate from unsigned ints. Use standard Java
                 // widening conversion to long which does sign-extension,
                 // then drop any copies of the sign bit, to prevent the value
                 // being considered a negative one by Java if it is set
-                long bytesSent = (ifRow.dwOutOctets) & 0xffffffffL;
-                long packetsSent = (ifRow.dwOutUcastPkts) & 0xffffffffL;
-                if (packetsSent > 0) {
-                    assertTrue(bytesSent > packetsSent);
-                } else {
-                    assertEquals(0, bytesSent);
-                }
-                long bytesRecv = (ifRow.dwInOctets) & 0xffffffffL;
-                long packetsRecv = (ifRow.dwInUcastPkts) & 0xffffffffL;
-                if (packetsRecv > 0) {
-                    assertTrue(bytesRecv > packetsRecv);
-                } else {
-                    assertEquals(0, bytesRecv);
-                }
+                long bytesSent = ifRow.dwOutOctets & 0xffffffffL;
+                long packetsSent = ifRow.dwOutUcastPkts & 0xffffffffL;
+                long bytesRecv = ifRow.dwInOctets & 0xffffffffL;
+                long packetsRecv = ifRow.dwInUcastPkts & 0xffffffffL;
+                // Bytes should match or exceed minimum packet size of 20.
+                // It is possible to have bytes not part of a packet but not vice versa.
+                assertTrue(bytesSent >= packetsSent * 20L);
+                assertTrue(bytesRecv >= packetsRecv * 20L);
             }
         }
 
@@ -105,18 +99,11 @@ public void testGetIfEntry2() throws SocketException {
                     // These originate from unsigned longs.
                     BigInteger bytesSent = new BigInteger(Long.toHexString(ifRow.OutOctets), 16);
                     BigInteger packetsSent = new BigInteger(Long.toHexString(ifRow.OutUcastPkts), 16);
-                    if (packetsSent.longValue() > 0) {
-                        assertEquals(1, bytesSent.compareTo(packetsSent));
-                    } else {
-                        assertEquals(0, bytesSent.compareTo(packetsSent));
-                    }
                     BigInteger bytesRecv = new BigInteger(Long.toHexString(ifRow.InOctets), 16);
                     BigInteger packetsRecv = new BigInteger(Long.toHexString(ifRow.InUcastPkts), 16);
-                    if (packetsRecv.longValue() > 0) {
-                        assertEquals(1, bytesRecv.compareTo(packetsRecv));
-                    } else {
-                        assertEquals(0, bytesRecv.compareTo(packetsRecv));
-                    }
+                    BigInteger minPacketSize = BigInteger.valueOf(20);
+                    assertNotEquals(-1, bytesSent.compareTo(packetsSent.multiply(minPacketSize)));
+                    assertNotEquals(-1, bytesRecv.compareTo(packetsRecv.multiply(minPacketSize)));
                 }
             }
         } else {

contrib/platform/test/com/sun/jna/platform/win32/SAFEARRAYTest.java

@@ -198,11 +198,11 @@ private Object[] toArrayGetElement(SAFEARRAY wrap) {
         wrap.lock();
         int rowMax = wrap.getUBound(2);
         int columnMax = wrap.getUBound(1);
-        Object[][] result = new Object[(int) (rowMax + 1)][(int) (columnMax + 1)];
+        Object[][] result = new Object[rowMax + 1][columnMax + 1];
         for(int i = 0; i <= rowMax; i++) {
             for(int j = 0; j <= columnMax; j++) {
                 VARIANT cell = (VARIANT) wrap.getElement(i, j);
-                result[(int)i][(int) j] = cell.getValue();
+                result[i][j] = cell.getValue();
                 OleAuto.INSTANCE.VariantClear(cell);
             }
         }
@@ -214,11 +214,11 @@ private Object[] toArrayPtrToElement(SAFEARRAY wrap) {
         wrap.lock();
         int rowMax = wrap.getUBound(2);
         int columnMax = wrap.getUBound(1);
-        Object[][] result = new Object[(int) (rowMax + 1)][(int) (columnMax + 1)];
+        Object[][] result = new Object[rowMax + 1][columnMax + 1];
         for(int i = 0; i <= rowMax; i++) {
             for(int j = 0; j <= columnMax; j++) {
                 VARIANT cell = new VARIANT(wrap.ptrOfIndex(i, j));
-                result[(int)i][(int) j] = cell.getValue();
+                result[i][j] = cell.getValue();
             }
         }
         wrap.unlock();
@@ -498,6 +498,7 @@ public void testDataTypes() {
      * Test assumption: The windows search provider is present and holds at least
      * five entries. If this assumption is not met, this test fails.
      */
+    @Ignore("Assumes windows search provider present with five entries")
     @Test
     public void testADODB() {
         ObjectFactory fact = new ObjectFactory();
@@ -770,6 +771,7 @@ private CursorTypeEnum(long value) {
         }
         private long value;
 
+        @Override
         public long getValue() {
             return this.value;
         }
@@ -791,6 +793,7 @@ private LockTypeEnum(long value) {
         }
         private long value;
 
+        @Override
         public long getValue() {
             return this.value;
         }