Skip to content

Commit 5ccdc6a

Browse files
resolved tests failing
1 parent 2138205 commit 5ccdc6a

3 files changed

Lines changed: 27 additions & 54 deletions

File tree

checkmarx-ast-eclipse-plugin-tests/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Require-Bundle: org.eclipse.swtbot.swt.finder,
77
org.eclipse.swtbot.eclipse.finder,
88
org.eclipse.swtbot.junit5_x,
99
org.eclipse.swt,
10-
org.junit,
10+
org.eclipse.jdt.junit5.runtime,
1111
junit-jupiter-api
1212
Bundle-RequiredExecutionEnvironment: JavaSE-17
13-
Bundle-ClassPath: ., lib/mockito-core-5.14.2.jar, lib/objenesis-2.2.jar, lib/junit-jupiter-5.11.4.jar
13+
Bundle-ClassPath: ., lib/mockito-core-5.14.2.jar, lib/objenesis-2.2.jar
1414
Fragment-Host: com.checkmarx.eclipse.plugin;bundle-version=0.0.0
Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
<groupId>com.checkmarx.ast.eclipse.tests</groupId>
6-
<artifactId>com.checkmarx.ast.eclipse.tests</artifactId>
7-
<description>Checkmarx Eclipse Plugin Integration Tests Project</description>
8-
<packaging>eclipse-test-plugin</packaging>
9-
<parent>
10-
<groupId>com.checkmarx.ast.eclipse</groupId>
11-
<artifactId>checkmarx-eclipse-plugin</artifactId>
12-
<version>1.0.0-SNAPSHOT</version>
13-
</parent>
14-
<dependencies>
15-
<dependency>
16-
<groupId>org.junit.jupiter</groupId>
17-
<artifactId>junit-jupiter</artifactId>
18-
<version>5.11.4</version>
19-
<scope>test</scope>
20-
</dependency>
21-
<dependency>
22-
<groupId>org.mockito</groupId>
23-
<artifactId>mockito-core</artifactId>
24-
<version>5.14.2</version>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>com.checkmarx.ast.eclipse.tests</groupId>
7+
<artifactId>com.checkmarx.ast.eclipse.tests</artifactId>
8+
<description>Checkmarx Eclipse Plugin Integration Tests Project</description>
9+
<packaging>eclipse-test-plugin</packaging>
10+
<parent>
11+
<groupId>com.checkmarx.ast.eclipse</groupId>
12+
<artifactId>checkmarx-eclipse-plugin</artifactId>
13+
<version>1.0.0-SNAPSHOT</version>
14+
</parent>
15+
<dependencies>
16+
<dependency>
17+
<groupId>org.mockito</groupId>
18+
<artifactId>mockito-core</artifactId>
19+
<version>5.14.2</version>
2520
<scope>test</scope>
2621
</dependency>
2722
</dependencies>
@@ -34,13 +29,10 @@
3429
<configuration>
3530
<useUIHarness>true</useUIHarness>
3631
<useUIThread>false</useUIThread>
37-
<failIfNoTests>false</failIfNoTests>
38-
<includes>
39-
<include>**/*Test.java</include>
40-
</includes>
32+
<providerHint>junit5</providerHint>
33+
<failIfNoTests>true</failIfNoTests>
4134
</configuration>
4235
</plugin>
43-
4436
</plugins>
45-
</build>
37+
</build>
4638
</project>

pom.xml

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -90,19 +90,6 @@
9090
<artifactId>tycho-versions-plugin</artifactId>
9191
<version>${tycho.version}</version>
9292
</plugin>
93-
94-
<plugin>
95-
<groupId>org.eclipse.tycho</groupId>
96-
<artifactId>tycho-surefire-plugin</artifactId>
97-
<version>${tycho.version}</version>
98-
<configuration>
99-
<useUIHarness>true</useUIHarness>
100-
<useUIThread>false</useUIThread>
101-
<product>org.eclipse.sdk.ide</product>
102-
<application>org.eclipse.ui.ide.workbench</application>
103-
</configuration>
104-
</plugin>
105-
10693
<plugin>
10794
<groupId>org.eclipse.tycho</groupId>
10895
<artifactId>tycho-compiler-plugin</artifactId>
@@ -140,7 +127,7 @@
140127
<version>${tycho.version}</version>
141128
<configuration>
142129
<executionEnvironment>JavaSE-17</executionEnvironment>
143-
<pomDependencies>consider</pomDependencies>
130+
<pomDependencies>ignore</pomDependencies>
144131
<environments>
145132
<environment>
146133
<os>linux</os>
@@ -177,9 +164,9 @@
177164
<url>https://download.eclipse.org/technology/swtbot/releases/latest</url>
178165
</repository>
179166
<repository>
180-
<id>orbit</id>
181-
<layout>p2</layout>
182-
<url>https://download.eclipse.org/tools/orbit/downloads/latest-R/</url>
167+
<id>orbit-4.32</id>
168+
<layout>p2</layout>
169+
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.32.0</url>
183170
</repository>
184171
<repository>
185172
<id>mylyn</id>
@@ -200,11 +187,5 @@
200187
<artifactId>org.osgi.service.event</artifactId>
201188
<version>1.4.1</version>
202189
</dependency>
203-
<dependency>
204-
<groupId>org.junit.jupiter</groupId>
205-
<artifactId>junit-jupiter</artifactId>
206-
<version>RELEASE</version>
207-
<scope>compile</scope>
208-
</dependency>
209190
</dependencies>
210191
</project>

0 commit comments

Comments
 (0)