From a9df47ad72a0b549a71774734a26a8ad95d503d9 Mon Sep 17 00:00:00 2001 From: Andrew Yefanov <1134togo@gmail.com> Date: Fri, 25 Aug 2017 23:29:25 +0300 Subject: [PATCH 1/3] Fix InterfaceScannerTest The was always ignored --- src/test/java/jnr/ffi/provider/InterfaceScannerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/jnr/ffi/provider/InterfaceScannerTest.java b/src/test/java/jnr/ffi/provider/InterfaceScannerTest.java index 6d8b021c3..19d1b5513 100644 --- a/src/test/java/jnr/ffi/provider/InterfaceScannerTest.java +++ b/src/test/java/jnr/ffi/provider/InterfaceScannerTest.java @@ -14,7 +14,7 @@ public class InterfaceScannerTest { static { Method s = null; try { - Collection.class.getMethod("spliterator"); + s = Collection.class.getMethod("spliterator"); } catch (Exception e) { // leave null, tests will be skipped } From 6da58a401d095b93e87a1d2bbfce8a6b1dfd9037 Mon Sep 17 00:00:00 2001 From: Andrew Yefanov <1134togo@gmail.com> Date: Sat, 26 Aug 2017 00:01:46 +0300 Subject: [PATCH 2/3] Fix default method test for #66 --- src/test/java/jnr/ffi/provider/InterfaceScannerTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/java/jnr/ffi/provider/InterfaceScannerTest.java b/src/test/java/jnr/ffi/provider/InterfaceScannerTest.java index 19d1b5513..d2345224a 100644 --- a/src/test/java/jnr/ffi/provider/InterfaceScannerTest.java +++ b/src/test/java/jnr/ffi/provider/InterfaceScannerTest.java @@ -11,6 +11,8 @@ public class InterfaceScannerTest { private static final Method SPLITERATOR; + public interface Collection extends java.util.Collection{} + static { Method s = null; try { @@ -31,6 +33,6 @@ public class InterfaceScannerTest { Object spliterator = SPLITERATOR.invoke(lib); Assert.assertNotNull(spliterator); - Assert.assertEquals("java.util.Spliterator", spliterator.getClass().getName()); + Assert.assertEquals("java.util.Spliterators$IteratorSpliterator", spliterator.getClass().getName()); } } From 2d5cc03a90764fcc0ecf32ab37d939796939cafc Mon Sep 17 00:00:00 2001 From: Andrew Yefanov <1134togo@gmail.com> Date: Sat, 26 Aug 2017 00:15:40 +0300 Subject: [PATCH 3/3] Remove java.util.Collection import --- src/test/java/jnr/ffi/provider/InterfaceScannerTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/jnr/ffi/provider/InterfaceScannerTest.java b/src/test/java/jnr/ffi/provider/InterfaceScannerTest.java index d2345224a..4b5eb7946 100644 --- a/src/test/java/jnr/ffi/provider/InterfaceScannerTest.java +++ b/src/test/java/jnr/ffi/provider/InterfaceScannerTest.java @@ -6,7 +6,6 @@ import org.junit.Test; import java.lang.reflect.Method; -import java.util.Collection; public class InterfaceScannerTest { private static final Method SPLITERATOR;