Skip to content

Commit

Permalink
[Unit Tests] Add JUnit and Mockito dependencies to testsupport plug-in
Browse files Browse the repository at this point in the history 
- The testsupport plug-in re-exports JUnit and Mockito dependencies so there's no need to add them in each test plug-in

- All test plug-ins will need to have a dependency on the testsupport plug-in

- This will help when we move to Java 21 and have to support javaagent for Mockito in Maven. We need all test plug-ins to have a dependency on Mockito.
  • Loading branch information
@Phillipus
Phillipus committed Nov 17, 2024
1 parent e9ddf2c commit 35d3b37
Show file tree
Hide file tree
Showing 15 changed files with 13 additions and 49 deletions.
7 changes: 2 additions & 5 deletions tests/com.archimatetool.canvas.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ Bundle-Name: JUnit Tests for Archi Canvas Editor
Bundle-SymbolicName: com.archimatetool.canvas.tests
Bundle-Version: 4.0.0
Fragment-Host: com.archimatetool.canvas
Import-Package: com.archimatetool.testingtools,
org.junit.jupiter.api,
org.junit.jupiter.params,
org.junit.jupiter.params.provider,
org.junit.platform.suite.api
Import-Package: com.archimatetool.testingtools
Require-Bundle: com.archimatetool.testsupport
Bundle-Vendor: Archi
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: com.archimatetool.canvas.tests
2 changes: 0 additions & 2 deletions tests/com.archimatetool.commandline.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ Bundle-Name: JUnit Tests for Command Line
Bundle-SymbolicName: com.archimatetool.commandline.tests
Bundle-Version: 4.0.0
Fragment-Host: com.archimatetool.commandline
Import-Package: org.junit.jupiter.api,
org.junit.platform.suite.api
Bundle-Vendor: Archi
Require-Bundle: com.archimatetool.testsupport
Bundle-RequiredExecutionEnvironment: JavaSE-17
Expand Down
3 changes: 0 additions & 3 deletions tests/com.archimatetool.csv.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ Bundle-Name: JUnit Tests for CSV Import/Export
Bundle-SymbolicName: com.archimatetool.csv.tests
Bundle-Version: 4.0.0
Fragment-Host: com.archimatetool.csv
Import-Package: org.junit.jupiter.api,
org.junit.jupiter.api.function,
org.junit.platform.suite.api
Bundle-Vendor: Archi
Require-Bundle: com.archimatetool.testsupport
Bundle-RequiredExecutionEnvironment: JavaSE-17
Expand Down
7 changes: 0 additions & 7 deletions tests/com.archimatetool.editor.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@ Bundle-Name: JUnit Tests for Archi Editor
Bundle-SymbolicName: com.archimatetool.editor.tests
Bundle-Version: 4.0.0
Fragment-Host: com.archimatetool.editor
Import-Package: org.junit.jupiter.api,
org.junit.jupiter.api.function,
org.junit.jupiter.params,
org.junit.jupiter.params.provider,
org.junit.platform.suite.api,
org.mockito,
org.mockito.stubbing
Bundle-Vendor: Archi
Require-Bundle: com.archimatetool.testsupport
Bundle-RequiredExecutionEnvironment: JavaSE-17
Expand Down
2 changes: 0 additions & 2 deletions tests/com.archimatetool.export.svg.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ Bundle-Name: JUnit Tests for SVG Export
Bundle-SymbolicName: com.archimatetool.export.svg.tests
Bundle-Version: 4.0.0
Fragment-Host: com.archimatetool.export.svg
Import-Package: org.junit.jupiter.api,
org.junit.platform.suite.api
Bundle-Vendor: Archi
Require-Bundle: com.archimatetool.testsupport
Bundle-RequiredExecutionEnvironment: JavaSE-17
Expand Down
4 changes: 1 addition & 3 deletions tests/com.archimatetool.hammer.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,5 @@ Fragment-Host: com.archimatetool.hammer
Bundle-Vendor: Archi
Require-Bundle: com.archimatetool.testsupport
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: com.archimatetool.testingtools,
org.junit.jupiter.api,
org.junit.platform.suite.api
Import-Package: com.archimatetool.testingtools
Automatic-Module-Name: com.archimatetool.hammer.tests
4 changes: 1 addition & 3 deletions tests/com.archimatetool.help.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,5 @@ Fragment-Host: com.archimatetool.help
Bundle-Vendor: Archi
Require-Bundle: com.archimatetool.testsupport
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: com.archimatetool.testingtools,
org.junit.jupiter.api,
org.junit.platform.suite.api
Import-Package: com.archimatetool.testingtools
Automatic-Module-Name: com.archimatetool.help.tests
6 changes: 1 addition & 5 deletions tests/com.archimatetool.jasperreports.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@ Fragment-Host: com.archimatetool.jasperreports
Bundle-Vendor: Archi
Require-Bundle: com.archimatetool.testsupport
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: com.archimatetool.testingtools,
org.junit.jupiter.api,
org.junit.platform.suite.api,
org.mockito,
org.mockito.stubbing
Import-Package: com.archimatetool.testingtools
Automatic-Module-Name: com.archimatetool.jasperreports.tests
2 changes: 0 additions & 2 deletions tests/com.archimatetool.jdom.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ Bundle-Name: JUnit Tests for Archi JDOM
Bundle-SymbolicName: com.archimatetool.jdom.tests
Bundle-Version: 4.0.0
Fragment-Host: com.archimatetool.jdom
Import-Package: org.junit.jupiter.api,
org.junit.platform.suite.api
Bundle-Vendor: Archi
Require-Bundle: com.archimatetool.testsupport
Bundle-RequiredExecutionEnvironment: JavaSE-17
Expand Down
5 changes: 0 additions & 5 deletions tests/com.archimatetool.model.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ Bundle-Name: JUnit Tests for Archi Model
Bundle-SymbolicName: com.archimatetool.model.tests
Bundle-Version: 4.0.0
Fragment-Host: com.archimatetool.model
Import-Package: org.junit.jupiter.api,
org.junit.jupiter.api.function,
org.junit.jupiter.params,
org.junit.jupiter.params.provider,
org.junit.platform.suite.api
Bundle-Vendor: Archi
Require-Bundle: com.archimatetool.testsupport
Bundle-RequiredExecutionEnvironment: JavaSE-17
Expand Down
4 changes: 1 addition & 3 deletions tests/com.archimatetool.modelimporter.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ Require-Bundle: com.archimatetool.testsupport
Bundle-RequiredExecutionEnvironment: JavaSE-17
Eclipse-BundleShape: dir
Automatic-Module-Name: com.archimatetool.modelimporter.tests
Import-Package: com.archimatetool.testingtools,
org.junit.jupiter.api,
org.junit.platform.suite.api
Import-Package: com.archimatetool.testingtools
4 changes: 1 addition & 3 deletions tests/com.archimatetool.reports.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,5 @@ Fragment-Host: com.archimatetool.reports
Bundle-Vendor: Archi
Require-Bundle: com.archimatetool.testsupport
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: com.archimatetool.testingtools,
org.junit.jupiter.api,
org.junit.platform.suite.api
Import-Package: com.archimatetool.testingtools
Automatic-Module-Name: com.archimatetool.reports.tests
6 changes: 5 additions & 1 deletion tests/com.archimatetool.testsupport/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
Eclipse-BundleShape: dir
Export-Package: com.archimatetool.tests
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui
org.eclipse.ui,
org.mockito.mockito-core;visibility:=reexport,
junit-jupiter-api;visibility:=reexport,
junit-jupiter-params;visibility:=reexport,
junit-platform-suite-api;visibility:=reexport
Bundle-ClassPath: .
Automatic-Module-Name: com.archimatetool.testsupport
4 changes: 1 addition & 3 deletions tests/com.archimatetool.zest.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,5 @@ Fragment-Host: com.archimatetool.zest
Bundle-Vendor: Archi
Require-Bundle: com.archimatetool.testsupport
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: com.archimatetool.testingtools,
org.junit.jupiter.api,
org.junit.platform.suite.api
Import-Package: com.archimatetool.testingtools
Automatic-Module-Name: com.archimatetool.zest.tests
2 changes: 0 additions & 2 deletions tests/org.opengroup.archimate.xmlexchange.tests/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ Bundle-Name: JUnit Tests for ArchiMate Open Exchange Plugin
Bundle-SymbolicName: org.opengroup.archimate.xmlexchange.tests
Bundle-Version: 4.0.0
Fragment-Host: org.opengroup.archimate.xmlexchange
Import-Package: org.junit.jupiter.api,
org.junit.platform.suite.api
Bundle-Vendor: Archi, The Open Group
Require-Bundle: com.archimatetool.testsupport,
com.archimatetool.canvas
Expand Down

0 comments on commit 35d3b37

Please sign in to comment.