mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2024-10-28 03:59:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to latest Orbit which means new mockito version

Browse source 
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.
This commit is contained in:
Jonah Graham 2022-11-14 09:13:28 -05:00
parent 1d0c77de2c
commit 3f682d7b00
8 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
codan/org.eclipse.cdt.codan.checkers.ui.tests/META-INF/MANIFEST.MF
View file

@ -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

14
core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/FileBasedErrorParserTests.java
View file

@ -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<Arguments> 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);
}
}
}

2
core/org.eclipse.cdt.ui.tests/META-INF/MANIFEST.MF
View file

@ -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

4
debug/org.eclipse.cdt.debug.application.product/debug.product
View file

@ -215,8 +215,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<plugin id="org.apache.lucene.analyzers-smartcn"/>
<plugin id="org.apache.lucene.core"/>
<plugin id="org.apache.xmlgraphics"/>
<plugin id="org.bouncycastle.bcpg"/>
<plugin id="org.bouncycastle.bcprov"/>
<plugin id="org.bouncycastle.bcpg" version="1.72.0.v20221013-1810"/>
<plugin id="org.bouncycastle.bcprov" version="1.72.0.v20221013-1810"/>
<plugin id="org.eclipse.cdt.core"/>
<plugin id="org.eclipse.cdt.core.linux" fragment="true"/>
<plugin id="org.eclipse.cdt.core.linux.aarch64" fragment="true"/>

2
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF
View file

@ -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

2
launchbar/org.eclipse.launchbar.core.tests/META-INF/MANIFEST.MF
View file

@ -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

4
launchbar/org.eclipse.launchbar.core.tests/src/org/eclipse/launchbar/core/internal/LaunchBarManager2Test.java
View file

@ -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

10
releng/org.eclipse.cdt.target/cdt.target
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="cdt" sequenceNumber="124">
<target name="cdt" sequenceNumber="125">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/cbi/updates/license/"/>
@ -50,7 +50,7 @@
<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20220927175816/repository/"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20221109014815/repository/"/>
<unit id="com.google.gson" version="0.0.0"/>
<unit id="com.sun.xml.bind" version="2.3.3.v20201118-1818"/>
<unit id="javax.activation" version="1.2.2.v20201119-1642"/>
@ -64,12 +64,16 @@
<unit id="org.hamcrest.core" version="0.0.0"/>
<unit id="org.junit" version="0.0.0"/>
<unit id="org.junit.jupiter.api" version="0.0.0"/>
<unit id="org.mockito" version="0.0.0"/>
<unit id="org.mockito.mockito-core" version="0.0.0"/>
<unit id="org.yaml.snakeyaml" version="0.0.0"/>
<unit id="com.sun.jna" version="5.8.0.v20210503-0343"/>
<unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/>
<unit id="javax.activation" version="2.0.0.v20201118-1818"/>
<unit id="javax.xml" version="1.4.1.v20220503-2331"/>
<unit id="org.bouncycastle.bcpg" version="1.72.0.v20221013-1810"/>
<unit id="org.bouncycastle.bcpkix" version="1.72.0.v20221013-1810"/>
<unit id="org.bouncycastle.bcprov" version="1.72.0.v20221013-1810"/>
<unit id="org.bouncycastle.bcutil" version="1.72.0.v20221013-1810"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201118194144/repository/"/>