Skip to content

Commit ccdbfeb

Browse files
Hélios GILLESRoiSoleil
Hélios GILLES
authored and
RoiSoleil
committed
MoreUnit fails to create new test under Eclipse 25.03
Fix #226
1 parent 2cfca39 commit ccdbfeb

80 files changed

Lines changed: 221 additions & 545 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/maven.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,8 @@ jobs:
3434
with:
3535
maven-version: 3.9.4
3636

37-
- name: Build and verify for eclipse-4.25 (ignoring test results)
38-
run: mvn -file org.moreunit.build/pom.xml clean verify "-Dtarget.platform.classifier=eclipse-4.25" "-Dmaven.test.failure.ignore=true" "-Dmaven.test.error.ignore=true" --fail-at-end "-Dtycho.disableP2Mirrors=true" --batch-mode --strict-checksums --update-snapshots "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
39-
40-
- name: Build and verify for eclipse-4.30
41-
run: mvn -file org.moreunit.build/pom.xml clean install "-Dtarget.platform.classifier=eclipse-4.30" --fail-at-end "-Dtycho.disableP2Mirrors=true" --batch-mode --strict-checksums --update-snapshots "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
37+
- name: Build and verify
38+
run: mvn -file org.moreunit.build/pom.xml clean install "-Dtarget.platform.classifier=eclipse-latest" --fail-at-end --batch-mode --strict-checksums --update-snapshots "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
4239

4340
- name: Publish Surefire Test Results for 🖨
4441
if: ${{ always() }}

‎org.moreunit.build/eclipse-4.25.target‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

org.moreunit.build/eclipse-4.30.target renamed to org.moreunit.build/eclipse-latest.target

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,29 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde version="3.8"?>
3-
<target name="eclipse-4.30" sequenceNumber="9">
3+
<target name="eclipse-latest" sequenceNumber="9">
44
<locations>
55
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
6-
<unit id="org.eclipse.sdk.ide" version="4.30.0.I20231201-0110"/>
6+
<unit id="org.eclipse.sdk.ide"/>
77
<repository location="https://download.eclipse.org/eclipse/updates/latest"/>
88
</location>
99
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
1010
<repository location="https://testng.org/testng-eclipse-update-site"/>
11-
<unit id="org.testng.eclipse.feature.group" version="7.8.0.202308061717"/>
11+
<unit id="org.testng.eclipse.feature.group"/>
1212
</location>
1313
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
1414
<repository location="https://download.eclipse.org/technology/swtbot/releases/latest/"/>
15-
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="4.1.0.202306071420"/>
16-
<unit id="org.eclipse.swtbot.feature.group" version="4.1.0.202306071420"/>
15+
<unit id="org.eclipse.swtbot.eclipse.feature.group"/>
16+
<unit id="org.eclipse.swtbot.feature.group"/>
1717
</location>
1818
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
1919
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/>
20-
<unit id="org.glassfish.hk2.osgi-resource-locator" version="2.5.0.v20161103-1916"/>
21-
</location>
22-
<location includeDependencyDepth="direct" includeDependencyScopes="compile" includeSource="true" label="AssertJ" missingManifest="generate" type="Maven">
23-
<dependencies>
24-
<dependency>
25-
<groupId>org.assertj</groupId>
26-
<artifactId>assertj-core</artifactId>
27-
<version>3.24.2</version>
28-
<type>jar</type>
29-
</dependency>
30-
</dependencies>
20+
<unit id="org.glassfish.hk2.osgi-resource-locator"/>
3121
</location>
22+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
23+
<repository location="https://download.eclipse.org/oomph/simrel-orbit/release/latest/"/>
24+
<unit id="org.assertj"/>
25+
<unit id="org.mockito.mockito-core"/>
26+
</location>
3227
</locations>
33-
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
28+
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
3429
</target>

‎org.moreunit.build/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
</modules>
2424

2525
<properties>
26-
<tycho-version>4.0.4</tycho-version>
27-
<exec-maven-version>3.1.1</exec-maven-version>
28-
<surefire-version>3.2.2</surefire-version>
26+
<tycho-version>4.0.12</tycho-version>
27+
<exec-maven-version>3.5.0</exec-maven-version>
28+
<surefire-version>3.5.3</surefire-version>
2929

3030
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3131
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3232

3333
<tests.use.ui>false</tests.use.ui>
3434

35-
<target.platform.classifier>eclipse-4.30</target.platform.classifier>
35+
<target.platform.classifier>eclipse-latest</target.platform.classifier>
3636

3737
</properties>
3838
<build>

‎org.moreunit.core.test/.classpath‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
44
<attributes>
5-
<attribute name="module" value="true"/>
65
<attribute name="maven.pomderived" value="true"/>
76
</attributes>
87
</classpathentry>
98
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
109
<classpathentry kind="src" output="classes" path="test">
1110
<attributes>
12-
<attribute name="test" value="true"/>
1311
<attribute name="optional" value="true"/>
1412
<attribute name="maven.pomderived" value="true"/>
1513
</attributes>

‎org.moreunit.core.test/META-INF/MANIFEST.MF‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ Require-Bundle: org.moreunit.core,
1010
org.eclipse.core.runtime,
1111
org.eclipse.ui,
1212
org.eclipse.ui.ide,
13-
org.junit;bundle-version="4.8.2",
14-
org.moreunit.test.dependencies;bundle-version="0.0.0",
15-
assertj-core;bundle-version="3.24.2",
16-
net.bytebuddy.byte-buddy;bundle-version="1.12.21"
13+
org.junit,
14+
org.moreunit.test.dependencies,
15+
org.assertj,
16+
org.mockito.mockito-core
1717
Bundle-Activator: org.moreunit.core.MoreUnitCoreTest
1818
Bundle-ActivationPolicy: lazy
1919
Bundle-Vendor: MoreUnit.org

‎org.moreunit.core.test/test/org/moreunit/core/decorators/TestedFileDecoratorTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static org.mockito.BDDMockito.given;
44
import static org.mockito.Mockito.mock;
55
import static org.mockito.Mockito.verify;
6-
import static org.mockito.Mockito.verifyZeroInteractions;
6+
import static org.mockito.Mockito.verifyNoInteractions;
77
import static org.mockito.Mockito.when;
88

99
import org.eclipse.jface.resource.ImageDescriptor;
@@ -40,7 +40,7 @@ public void should_not_decorate_files_which_language_is_handled_by_another_plugi
4040
decorator.decorate(fileToDecorate, decoration);
4141

4242
// then
43-
verifyZeroInteractions(decoration);
43+
verifyNoInteractions(decoration);
4444
}
4545

4646
@Test
@@ -54,7 +54,7 @@ public void should_not_decorate_test_files() throws Exception
5454
decorator.decorate(fileToDecorate, decoration);
5555

5656
// then
57-
verifyZeroInteractions(decoration);
57+
verifyNoInteractions(decoration);
5858
}
5959

6060
@Test
@@ -69,7 +69,7 @@ public void should_not_decorate_untested_files() throws Exception
6969
decorator.decorate(fileToDecorate, decoration);
7070

7171
// then
72-
verifyZeroInteractions(decoration);
72+
verifyNoInteractions(decoration);
7373
}
7474

7575
@Test
@@ -99,7 +99,7 @@ public void should_ignore_configuration_error() throws Exception
9999
decorator.decorate(fileToDecorate, decoration);
100100

101101
// then no exception is thrown, no window opens, and:
102-
verifyZeroInteractions(decoration);
102+
verifyNoInteractions(decoration);
103103
}
104104

105105
@Test
@@ -113,6 +113,6 @@ public void should_ignore_all_exceptions() throws Exception
113113
decorator.decorate(fileToDecorate, decoration);
114114

115115
// then no exception is thrown, no window opens, and:
116-
verifyZeroInteractions(decoration);
116+
verifyNoInteractions(decoration);
117117
}
118118
}

‎org.moreunit.core.test/test/org/moreunit/core/languages/MainLanguageRepositoryTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package org.moreunit.core.languages;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.mockito.Mockito.verify;
5-
import static org.mockito.Mockito.when;
4+
import static org.mockito.Mockito.*;
65

76
import org.junit.Test;
87
import org.junit.runner.RunWith;
98
import org.mockito.InjectMocks;
109
import org.mockito.Mock;
11-
import org.mockito.runners.MockitoJUnitRunner;
10+
import org.mockito.junit.MockitoJUnitRunner;
1211
import org.moreunit.core.extension.LanguageExtensionManager;
1312

1413
@RunWith(MockitoJUnitRunner.class)
@@ -31,7 +30,6 @@ public void should_contain_language_when_defined_by_user() throws Exception
3130
{
3231
// given
3332
when(userDefinedLanguagesRepo.contains("vb")).thenReturn(true);
34-
when(extensionManager.extensionExistsForLanguage("vb")).thenReturn(false);
3533

3634
// then
3735
assertThat(mainRepo.contains("vb")).isTrue();

‎org.moreunit.core.test/test/org/moreunit/core/matching/CamelCaseNameTokenizerTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.moreunit.core.matching;
22

3-
import static java.util.Arrays.asList;
43
import static org.assertj.core.api.Assertions.assertThat;
54

65
import org.junit.Test;

‎org.moreunit.core.test/test/org/moreunit/core/matching/FileNameEvaluationTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.moreunit.core.matching;
22

33
import static java.util.Arrays.asList;
4+
45
import static org.assertj.core.api.Assertions.assertThat;
56

67
import java.util.ArrayList;

0 commit comments

Comments
 (0)