Skip to content

Fix Sonar coverage of monitor-commons #6

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.

Sign up for GitHub

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

Open
antoinebhs wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Fix Sonar coverage of monitor-commons #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1fb743f
Fix Sonar coverage of monitor-commons
antoinebhs Jan 14, 2026
5c5ee80
Fix Sonar coverage of monitor-commons
antoinebhs Jan 14, 2026
9bf2122
Fix Sonar coverage of monitor-commons
antoinebhs Jan 14, 2026
90bb375
Fix Sonar coverage of monitor-commons
antoinebhs Jan 14, 2026
44845ea
Fix Sonar coverage of monitor-commons
antoinebhs Jan 14, 2026
b1edfa2
Fix Sonar coverage of monitor-commons
antoinebhs Jan 14, 2026
591ba99
Fix Sonar coverage of monitor-commons
antoinebhs Jan 14, 2026
ee2767d
Fix Sonar coverage of monitor-commons
antoinebhs Jan 14, 2026
4657882
Improve tests for jackson customization in config
antoinebhs Jan 14, 2026
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
33 changes: 33 additions & 0 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: CI

on:
push:
branches:
- 'main'
- 'branch-test'

jobs:
build:

runs-on: ubuntu-latest

steps:
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 21

- name: Checkout sources
uses: actions/checkout@v1

- name: Build with Maven
run: mvn --batch-mode -P jacoco install

- name: Run SonarCloud analysis
run: >
mvn --batch-mode -DskipTests sonar:sonar
-Dsonar.host.url=https://sonarcloud.io
-Dsonar.organization=gridsuite
env:
GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
25 changes: 24 additions & 1 deletion monitor-commons/src/main/java/org/gridsuite/monitor/commons/ProcessStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,28 @@ public enum ProcessStatus {
SCHEDULED,
RUNNING,
COMPLETED,
FAILED
FAILED,
TEST1,
TEST2,
TEST3,
TEST4,
TEST5,
TEST6,
TEST7,
TEST8,
TEST9,
TEST10,
TEST11,
TEST12,
TEST13,
TEST14,
TEST15,
TEST16,
TEST17,
TEST18,
TEST19,
TEST20,
TEST21,
TEST22,
TEST23,
}
45 changes: 45 additions & 0 deletions monitor-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,23 @@
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>report</id>
<goals>
<goal>report</goal>
</goals>
<configuration>
<!-- Include monitor-commons classes in coverage report -->
<additionalClassDirs>${project.basedir}/../monitor-commons/target/classes</additionalClassDirs>
<additionalSourceDirs>${project.basedir}/../monitor-commons/src/main/java</additionalSourceDirs>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
Expand Down Expand Up @@ -150,4 +167,32 @@
<scope>test</scope>
</dependency>
</dependencies>

<!-- The report-aggregate goal collects coverage data from this module and all its dependencies,
including monitor-commons DTOs, to generate a unified coverage report. -->
<profiles>
<profile>
<id>jacoco</id>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>report-aggregate</id>
<phase>verify</phase>
<goals>
<goal>report-aggregate</goal>
</goals>
<configuration>
<title>${project.parent.name}</title>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
46 changes: 45 additions & 1 deletion monitor-worker-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,23 @@
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>report</id>
<goals>
<goal>report</goal>
</goals>
<configuration>
<!-- Include monitor-commons classes in coverage report -->
<additionalClassDirs>${project.basedir}/../monitor-commons/target/classes</additionalClassDirs>
<additionalSourceDirs>${project.basedir}/../monitor-commons/src/main/java</additionalSourceDirs>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
Expand Down Expand Up @@ -143,6 +160,33 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<!-- The report-aggregate goal collects coverage data from this module and all its dependencies,
including monitor-commons DTOs, to generate a unified coverage report. -->
<profiles>
<profile>
<id>jacoco</id>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>report-aggregate</id>
<phase>verify</phase>
<goals>
<goal>report-aggregate</goal>
</goals>
<configuration>
<title>${project.parent.name}</title>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
4 changes: 4 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@
<gridsuite-dependencies.version>46.0.0</gridsuite-dependencies.version>
<sonar.organization>gridsuite</sonar.organization>
<sonar.projectKey>org.gridsuite:monitor-core</sonar.projectKey>
<sonar.coverage.jacoco.xmlReportPaths>
${maven.multiModuleProjectDirectory}/monitor-server/target/site/jacoco/jacoco.xml,
${maven.multiModuleProjectDirectory}/monitor-worker-server/target/site/jacoco/jacoco.xml,
</sonar.coverage.jacoco.xmlReportPaths>
</properties>

<dependencyManagement>
Expand Down