| commit | 4889f6b0b4a1f85e2a086a42bd6902d035a5a10b | [log] [tgz] |
|---|---|---|
| author | Ian Maxon <ian@maxons.email> | Wed May 05 02:08:27 2021 -0700 |
| committer | Michael Blow <mblow@apache.org> | Thu Jun 03 13:35:49 2021 +0000 |
| tree | 9a41eeeaa5eb480305b855a93a3d25e1a9c22b7d | |
| parent | 2ff3036a79412117a8df050a57d94be4a690859c [diff] |
[ASTERIXDB-2890] Minimum Java version 8->11 - user model changes: no - storage format changes: no - interface changes: no Details: - Update Mockito to unbreak tests and put it under dependencyManagement. - Update HttpTestUtil to avoid inspecting fields that are usually invalid in JDK 11 - Enable parallel execution of surefire tests in asterix-om to make up for slowdown of ExceptionTest under Mockito 2+ Change-Id: Ib9aa81fa2e58954846218e9907562685c8cd09e3 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/5483 Reviewed-by: Ian Maxon <imaxon@uci.edu> Reviewed-by: Michael Blow <mblow@apache.org> Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Tested-by: Michael Blow <mblow@apache.org>
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml index c38ba3c..c9e4ba1 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/pom.xml
@@ -90,7 +90,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> </dependencies>
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/ConcurrentMergePolicyTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/ConcurrentMergePolicyTest.java index 098aa51..af0be25 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/ConcurrentMergePolicyTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/ConcurrentMergePolicyTest.java
@@ -166,7 +166,7 @@ Mockito.doAnswer(new Answer<Void>() { @Override public Void answer(InvocationOnMock invocation) throws Throwable { - List<ILSMDiskComponent> mergedComponents = invocation.getArgumentAt(0, List.class); + List<ILSMDiskComponent> mergedComponents = invocation.getArgument(0); mergedComponents.forEach(component -> { mergedSizes.add(component.getComponentSize()); });
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/PrefixMergePolicyTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/PrefixMergePolicyTest.java index 54fd3bb..2e7b4c6 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/PrefixMergePolicyTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/PrefixMergePolicyTest.java
@@ -196,7 +196,7 @@ Mockito.doAnswer(new Answer<Void>() { @Override public Void answer(InvocationOnMock invocation) throws Throwable { - List<ILSMDiskComponent> mergedComponents = invocation.getArgumentAt(0, List.class); + List<ILSMDiskComponent> mergedComponents = invocation.getArgument(0); if (mergedSizes != null) { mergedComponents.forEach(component -> { mergedSizes.add(component.getComponentSize());