This is an automated email from the ASF dual-hosted git repository. toulmean pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit dc0cb7af7cc6bfdb4417e323d1f3c53b4e60a4ba Author: Antoine Toulme <toulm...@apache.org> AuthorDate: Wed Apr 3 16:05:53 2019 -0700 Ensure build passes on local machine --- .../tuweni/eth/reference/BlockRLPTestSuite.java | 6 +++++- gradle/check-licenses.gradle | 2 +- .../test/java/org/apache/tuweni/io/ResourcesTest.java | 2 +- io/src/test/resources/resourceresolver-test.jar | Bin 2446 -> 2362 bytes 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/eth-reference-tests/src/test/java/org/apache/tuweni/eth/reference/BlockRLPTestSuite.java b/eth-reference-tests/src/test/java/org/apache/tuweni/eth/reference/BlockRLPTestSuite.java index 86798f8..5dad3d0 100644 --- a/eth-reference-tests/src/test/java/org/apache/tuweni/eth/reference/BlockRLPTestSuite.java +++ b/eth-reference-tests/src/test/java/org/apache/tuweni/eth/reference/BlockRLPTestSuite.java @@ -36,6 +36,7 @@ import java.time.Instant; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.IntStream; import java.util.stream.Stream; @@ -69,12 +70,15 @@ class BlockRLPTestSuite { } catch (IOException e) { throw new UncheckedIOException(e); } - }); + }).filter(Objects::nonNull); } @SuppressWarnings({"unchecked", "rawtypes"}) private static Stream<Arguments> readTestCase(InputStream is) throws IOException { Map<String, Map> test = mapper.readerFor(Map.class).readValue(is); + if (test.isEmpty()) { + return null; + } String name = test.keySet().iterator().next(); Map testData = test.get(name); List<Map> blocks = (List<Map>) testData.get("blocks"); diff --git a/gradle/check-licenses.gradle b/gradle/check-licenses.gradle index 5540a5d..78e02e1 100644 --- a/gradle/check-licenses.gradle +++ b/gradle/check-licenses.gradle @@ -118,7 +118,7 @@ downloadLicenses { ] licenses = [ - (group('cava')): apache2, + (group('tuweni')): apache2, (group('org.jboss.spec.javax.transaction')): cddl1, (group('org.rocksdb')): apache2, // https://checkerframework.org/manual/#license diff --git a/io/src/test/java/org/apache/tuweni/io/ResourcesTest.java b/io/src/test/java/org/apache/tuweni/io/ResourcesTest.java index 20b58ee..b0075d1 100644 --- a/io/src/test/java/org/apache/tuweni/io/ResourcesTest.java +++ b/io/src/test/java/org/apache/tuweni/io/ResourcesTest.java @@ -43,7 +43,7 @@ class ResourcesTest { List<URL> all = Resources.find("org/apache/tuweni/io/file/resourceresolver/**").collect(Collectors.toList()); assertEquals(12, all.size(), () -> describeExpectation(12, all)); - List<URL> txtFiles = Resources.find("net/**/test*.txt").collect(Collectors.toList()); + List<URL> txtFiles = Resources.find("org/**/test*.txt").collect(Collectors.toList()); assertEquals(6, txtFiles.size(), () -> describeExpectation(6, txtFiles)); List<URL> txtFilesFromRoot = Resources.find("/**/test?.txt").collect(Collectors.toList()); diff --git a/io/src/test/resources/resourceresolver-test.jar b/io/src/test/resources/resourceresolver-test.jar index 5eb17e2..b2226da 100644 Binary files a/io/src/test/resources/resourceresolver-test.jar and b/io/src/test/resources/resourceresolver-test.jar differ --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@tuweni.apache.org For additional commands, e-mail: commits-h...@tuweni.apache.org