From 3f682d7b00c5f04be3375e0c87826e40847e04e4 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Mon, 14 Nov 2022 09:13:28 -0500 Subject: [PATCH] Update to latest Orbit which means new mockito version Note that FileBasedErrorParserTests had to change because of some Tycho incompatibility with JUnit's ParameterizedTest. It works in the IDE, but not in maven. The correct fix is to resolve the tycho settings, see Bug 569949 for a previous example. It may also be simply resolved by updating to Tycho 3.0.0. However I want to get this change in as at the moment CDT.setup is broken and that is impeding developers. --- .../META-INF/MANIFEST.MF | 2 +- .../tests/FileBasedErrorParserTests.java | 14 ++++++-------- core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF | 2 +- .../debug.product | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../core/internal/LaunchBarManager2Test.java | 4 ++-- releng/org.eclipse.cdt.target/cdt.target | 10 +++++++--- 8 files changed, 21 insertions(+), 19 deletions(-) diff --git a/codan/org.eclipse.cdt.codan.checkers.ui.tests/META-INF/MANIFEST.MF b/codan/org.eclipse.cdt.codan.checkers.ui.tests/META-INF/MANIFEST.MF index 120cbd30380..602791811c4 100644 --- a/codan/org.eclipse.cdt.codan.checkers.ui.tests/META-INF/MANIFEST.MF +++ b/codan/org.eclipse.cdt.codan.checkers.ui.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.cdt.codan.ui.cxx, org.junit, - org.mockito, + org.mockito.mockito-core, org.eclipse.cdt.core Fragment-Host: org.eclipse.cdt.codan.checkers.ui Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/FileBasedErrorParserTests.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/FileBasedErrorParserTests.java index bc1bea37b5b..81592b0d10c 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/FileBasedErrorParserTests.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/FileBasedErrorParserTests.java @@ -17,17 +17,12 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.util.stream.Stream; import org.eclipse.cdt.core.testplugin.CTestPlugin; import org.eclipse.core.runtime.Path; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; +import org.junit.jupiter.api.Test; public class FileBasedErrorParserTests extends GenericErrorParserTests { - @ParameterizedTest - @MethodSource("provideFilenames") public void testErrorsInFiles(File errorFile) throws IOException { InputStream stream = new FileInputStream(errorFile); @@ -35,9 +30,12 @@ public class FileBasedErrorParserTests extends GenericErrorParserTests { stream.close(); } - public static Stream provideFilenames() { + @Test + public void test() throws IOException { File dir = CTestPlugin.getDefault().getFileInPlugin(new Path("resources/errortests/")); File[] testsfiles = dir.listFiles(); - return Stream.of(testsfiles).map(Arguments::of); + for (File file : testsfiles) { + testErrorsInFiles(file); + } } } diff --git a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF index 7e2fca10d61..0ec28e7d4a8 100644 --- a/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF @@ -39,7 +39,7 @@ Require-Bundle: org.eclipse.jface.text, org.eclipse.ltk.ui.refactoring, org.eclipse.osgi, org.eclipse.e4.core.contexts;bundle-version="[1.8.300,2.0.0)", - org.mockito, + org.mockito.mockito-core, org.hamcrest.core, org.hamcrest.library Bundle-ActivationPolicy: lazy diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product index f328556af25..5fbaeb91b83 100644 --- a/debug/org.eclipse.cdt.debug.application.product/debug.product +++ b/debug/org.eclipse.cdt.debug.application.product/debug.product @@ -215,8 +215,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U - - + + diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF index e0b6ce066d3..ecf43f95ba0 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.cdt.gdb, org.eclipse.cdt.dsf.gdb, org.eclipse.core.variables, - org.mockito, + org.mockito.mockito-core, org.hamcrest.library Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/launchbar/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF b/launchbar/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF index 03fd7304373..e6a01765f37 100644 --- a/launchbar/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF +++ b/launchbar/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.0.100.qualifier Fragment-Host: org.eclipse.launchbar.core;bundle-version="1.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="4.12.0", - org.mockito;bundle-version="2.23.0" + org.mockito.mockito-core Automatic-Module-Name: org.eclipse.launchbar.core.tests Bundle-Localization: fragment Bundle-Vendor: %providerName diff --git a/launchbar/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/internal/LaunchBarManager2Test.java b/launchbar/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/internal/LaunchBarManager2Test.java index a214309bc32..7a52880f1a5 100644 --- a/launchbar/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/internal/LaunchBarManager2Test.java +++ b/launchbar/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/internal/LaunchBarManager2Test.java @@ -28,7 +28,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; import java.util.ArrayList; @@ -885,7 +885,7 @@ public class LaunchBarManager2Test { ILaunchBarListener lis = mock(ILaunchBarListener.class); manager.addListener(lis); manager.removeListener(lis); - verifyZeroInteractions(lis); + verifyNoInteractions(lis); } @Test diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target index 3302dc30b07..e72309a55ab 100644 --- a/releng/org.eclipse.cdt.target/cdt.target +++ b/releng/org.eclipse.cdt.target/cdt.target @@ -1,6 +1,6 @@ - + @@ -50,7 +50,7 @@ - + @@ -64,12 +64,16 @@ - + + + + +