Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add migration cleanup from junit 4 to junit 5 #110

Merged
merged 58 commits into from
Nov 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
be484be
add first implementations of some annotation processing
carstenartur Oct 12, 2024
db54002
RunWith implemented
carstenartur Oct 15, 2024
b6050e5
first implementation of Assertions
carstenartur Oct 16, 2024
5d7ce06
cover more assertions in the implementation
carstenartur Oct 17, 2024
48f903c
implement static imports of assertion methods
carstenartur Oct 18, 2024
3474f3d
fix bug in import that causes static and normal import to be added
carstenartur Oct 18, 2024
d032478
consider 4 parameter case
carstenartur Oct 19, 2024
5b74616
fix explicit static import case
carstenartur Oct 19, 2024
dde7e92
Update .classpath
carstenartur Oct 19, 2024
96c93fa
fill out preview
carstenartur Oct 19, 2024
c83be40
add skeleton for rule test
carstenartur Oct 19, 2024
28fb796
add stub
carstenartur Oct 19, 2024
0f3756e
implement Rule TemporaryFolder
carstenartur Oct 20, 2024
d572153
add some fixes but ExternalResource still not working
carstenartur Oct 20, 2024
3bf6e83
fix spotbugs issue
carstenartur Oct 20, 2024
31ab10d
add rtstubs18
carstenartur Oct 20, 2024
6a9cdd5
add ExtensionContext
carstenartur Oct 21, 2024
87f4535
more fixes to ExternalResource
carstenartur Oct 22, 2024
932d537
cleanup code
carstenartur Oct 23, 2024
94cda28
more cleanup
carstenartur Oct 23, 2024
1e76a03
only formatting
carstenartur Oct 23, 2024
71c7c9a
pull methods up
carstenartur Oct 23, 2024
859ecf6
use toString()
carstenartur Oct 23, 2024
7997928
add test for already junit5 case
carstenartur Oct 24, 2024
012362d
Add support for Assume
carstenartur Oct 25, 2024
279dd51
add support for super calls
carstenartur Oct 26, 2024
cf77987
add context to super call
carstenartur Oct 26, 2024
f37e285
mostly formatting and a test
carstenartur Oct 26, 2024
247222d
fix jface migration
carstenartur Oct 27, 2024
eaa7934
extract some constants, formatting
carstenartur Oct 27, 2024
bf29b38
aggregate on AbstractTool
carstenartur Oct 27, 2024
a13eb85
simplify junit test setup
carstenartur Oct 27, 2024
c98aee3
fix spotbugs error
carstenartur Oct 27, 2024
6d0cc66
refactor to use public instead of protected for before and after
carstenartur Oct 27, 2024
3323b50
Support for assertSame and assertNotSame
carstenartur Oct 28, 2024
9d827ef
fix length of preview issue
carstenartur Oct 29, 2024
a0b46dc
add more testcases
carstenartur Oct 30, 2024
e920086
Dont create change on empty ExternalResource derived class
carstenartur Oct 30, 2024
807417f
Add assumeThat support
carstenartur Oct 31, 2024
af3be13
Add Assert.assertThat support
carstenartur Oct 31, 2024
8736b4e
test updating orbit target
carstenartur Nov 1, 2024
9e07490
test changing junit dependency
carstenartur Nov 1, 2024
051e431
add junit to product
carstenartur Nov 1, 2024
45f8917
remove junit from xml feature
carstenartur Nov 1, 2024
55a3c32
remove junit
carstenartur Nov 1, 2024
4977482
remove junit
carstenartur Nov 1, 2024
037c104
add some features to target and jupiter features to test commons
carstenartur Nov 1, 2024
e91489d
update to 2024-09
carstenartur Nov 1, 2024
50172b7
add more plugins to target
carstenartur Nov 1, 2024
f230011
test
carstenartur Nov 1, 2024
29c0c60
extend list of features in target and product
carstenartur Nov 3, 2024
ad23fab
add separate constants for each migration piece
carstenartur Nov 3, 2024
f7b69a9
test update 21
carstenartur Nov 4, 2024
8ddac4c
update target and switch on all cleanup parts in tests
carstenartur Nov 17, 2024
ba2a5ba
test with base instead of full jre
carstenartur Nov 17, 2024
6c2218d
test remove justj
carstenartur Nov 17, 2024
2b13c7b
test remove justj complete
carstenartur Nov 17, 2024
0805dab
use Java21
carstenartur Nov 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/codacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ jobs:
name: Codacy Security Scan
runs-on: ubuntu-latest
steps:
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
cache: maven
- name: Set up Maven
uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
with:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ jobs:
- name: Setup Java JDK
uses: actions/setup-java@v4
with:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'
java-version: '21'
distribution: 'temurin'
cache: maven

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
28 changes: 23 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.sandbox</groupId>
<artifactId>central</artifactId>
<name>Sandbox central</name>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<tycho-version>4.0.9</tycho-version>
Expand Down Expand Up @@ -44,6 +44,9 @@
<module>sandbox_jface_cleanup</module>
<module>sandbox_jface_cleanup_feature</module>
<module>sandbox_jface_cleanup_test</module>
<module>sandbox_junit_cleanup</module>
<module>sandbox_junit_cleanup_feature</module>
<module>sandbox_junit_cleanup_test</module>
<module>sandbox_usage_view</module>
<module>sandbox_usage_view_feature</module>
<module>sandbox_product</module>
Expand All @@ -57,7 +60,7 @@
<repository>
<id>eclipse</id>
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2024-06</url>
<url>https://download.eclipse.org/releases/2024-09</url>
</repository>
<repository>
<id>babel</id>
Expand All @@ -67,13 +70,13 @@
<repository>
<id>orbit</id>
<layout>p2</layout>
<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/</url>
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09/</url>
</repository>
<repository>
<!--<repository>
<id>swtbot</id>
<layout>p2</layout>
<url>https://download.eclipse.org/technology/swtbot/releases/latest/</url>
</repository>
</repository>-->
</repositories>
<build>
<plugins>
Expand Down Expand Up @@ -322,6 +325,21 @@
<artifactId>sandbox_jface_cleanup_test</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.sandbox</groupId>
<artifactId>sandbox_junit_cleanup</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.sandbox</groupId>
<artifactId>sandbox_junit_cleanup_feature</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.sandbox</groupId>
<artifactId>sandbox_junit_cleanup_test</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.sandbox</groupId>
<artifactId>sandbox_usage_view</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions sandbox_cleanup_application/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2
Bundle-Name: sandbox_cleanup_application
Bundle-SymbolicName: sandbox_cleanup_application;singleton:=true
Bundle-Vendor: sandbox
Bundle-Version: 1.1.0.qualifier
Bundle-Version: 1.2.0.qualifier
Automatic-Module-Name: ui.sandbox.fragment
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-ActivationPolicy: lazy
Eclipse-BuddyPolicy: global
Require-Bundle: org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion sandbox_cleanup_application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.sandbox</groupId>
<artifactId>central</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>sandbox_cleanup_application</artifactId>
<name>Sandbox cleanup application</name>
Expand Down
2 changes: 1 addition & 1 deletion sandbox_cleanup_application_feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="sandbox_cleanup_application_feature"
label="Sandbox Cleanup application feature"
version="1.1.0.qualifier"
version="1.2.0.qualifier"
provider-name="sandbox">

<description>
Expand Down
2 changes: 1 addition & 1 deletion sandbox_cleanup_application_feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.sandbox</groupId>
<artifactId>central</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>sandbox_cleanup_application_feature</artifactId>
<name>Sandbox cleanup application Feature</name>
Expand Down
4 changes: 2 additions & 2 deletions sandbox_common/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: sandbox_common
Bundle-SymbolicName: sandbox_common;singleton:=true
Bundle-Vendor: sandbox
Bundle-Version: 1.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Version: 1.2.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-21
Bundle-ActivationPolicy: lazy
Eclipse-BuddyPolicy: global
Require-Bundle: org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion sandbox_common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.sandbox</groupId>
<artifactId>central</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
</parent>
<artifactId>sandbox_common</artifactId>
<name>Sandbox common</name>
Expand Down
Loading
Loading