Skip to content

Commit 764edee

Browse files
committed
add badge and remove comment from kics
1 parent b751543 commit 764edee

File tree

4 files changed

+40
-22
lines changed

4 files changed

+40
-22
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ jobs:
7676
COVERAGE_PERCENTAGE=$(echo "scale=2; $COVERED_LINES / $TOTAL_LINES * 100" | bc)
7777
echo "Total coverage percentage: $COVERAGE_PERCENTAGE%"
7878
79+
- name: Generate JaCoCo Badge
80+
uses: cicirello/jacoco-badge-generator@f33476a5a3fd5a4f77cb5eef2ebe728c1dd5b921 #v2.11.0
81+
with:
82+
jacoco-csv-file: target/site/jacoco/jacoco.csv
83+
7984
- name: Upload JaCoCo coverage report
8085
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 #v4
8186
with:

pom.xml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<version>0.8.8</version>
6868
<executions>
6969
<execution>
70+
<id>prepare-agent</id>
7071
<goals>
7172
<goal>prepare-agent</goal>
7273
</goals>
@@ -78,14 +79,26 @@
7879
<goal>report</goal>
7980
</goals>
8081
<configuration>
81-
<includes>
82-
<include>**/src/main/java/**</include>
83-
<!-- Add other patterns as needed -->
84-
</includes>
82+
<excludes>
83+
<exclude>**/com/checkmarx/ast/results/**</exclude>
84+
<exclude>**/com/checkmarx/ast/results/result/**</exclude>
85+
<exclude>**/com/checkmarx/ast/kicsRealtimeResults/**</exclude>
86+
<exclude>**/com/checkmarx/ast/kicsRealtimeResults/ast/kicsRealtimeResult/**</exclude>
87+
<exclude>**/com/checkmarx/ast/asca/**</exclude>
88+
<exclude>**/com/checkmarx/ast/learnMore/**</exclude>
89+
<exclude>**/com/checkmarx/ast/predicate/**</exclude>
90+
<exclude>**/com/checkmarx/ast/scan/**</exclude>
91+
<exclude>**/com/checkmarx/ast/codebashing/**</exclude>
92+
<exclude>**/com/checkmarx/ast/remediation/**</exclude>
93+
<exclude>**/com/checkmarx/ast/project/**</exclude>
94+
<exclude>**/com/checkmarx/ast/tenant/**</exclude>
95+
<exclude>**/com/checkmarx/ast/wrapper/Execution**</exclude>
96+
</excludes>
8597
</configuration>
8698
</execution>
8799
</executions>
88100
</plugin>
101+
89102
<plugin>
90103
<groupId>com.github.spotbugs</groupId>
91104
<artifactId>spotbugs-maven-plugin</artifactId>

src/test/java/com/checkmarx/ast/RemediationTest.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ class RemediationTest extends BaseTest {
1414
private static String QUERY_ID = "9574288c118e8c87eea31b6f0b011295a39ec5e70d83fb70e839b8db4a99eba8";
1515
private static String ENGINE = "docker";
1616

17-
// @Test
18-
// void testKicsRemediation() throws Exception {
19-
// KicsRemediation remediation = wrapper.kicsRemediate(RESULTS_FILE,KICS_FILE,"","");
20-
// Assertions.assertTrue(remediation.getAppliedRemediation() != "");
21-
// Assertions.assertTrue(remediation.getAvailableRemediation() != "");
22-
// }
23-
//
24-
// @Test
25-
// void testKicsRemediationSimilarityFilter() throws Exception {
26-
// KicsRemediation remediation = wrapper.kicsRemediate(RESULTS_FILE,KICS_FILE,ENGINE,QUERY_ID);
27-
// Assertions.assertTrue(remediation.getAppliedRemediation() != "");
28-
// Assertions.assertTrue(remediation.getAvailableRemediation() != "");
29-
// }
17+
@Test
18+
void testKicsRemediation() throws Exception {
19+
KicsRemediation remediation = wrapper.kicsRemediate(RESULTS_FILE,KICS_FILE,"","");
20+
Assertions.assertTrue(remediation.getAppliedRemediation() != "");
21+
Assertions.assertTrue(remediation.getAvailableRemediation() != "");
22+
}
23+
24+
@Test
25+
void testKicsRemediationSimilarityFilter() throws Exception {
26+
KicsRemediation remediation = wrapper.kicsRemediate(RESULTS_FILE,KICS_FILE,ENGINE,QUERY_ID);
27+
Assertions.assertTrue(remediation.getAppliedRemediation() != "");
28+
Assertions.assertTrue(remediation.getAvailableRemediation() != "");
29+
}
3030

3131
}

src/test/java/com/checkmarx/ast/ScanTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ void testScanCancel() throws Exception {
7979
Assertions.assertDoesNotThrow(() -> wrapper.scanCancel(scan.getId()));
8080
}
8181

82-
// @Test
83-
//// void testKicsRealtimeScan() throws Exception {
84-
//// KicsRealtimeResults scan = wrapper.kicsRealtimeScan("target/test-classes/Dockerfile","","v");
85-
//// Assertions.assertTrue(scan.getResults().size() >= 1);
86-
//// }
82+
@Test
83+
void testKicsRealtimeScan() throws Exception {
84+
KicsRealtimeResults scan = wrapper.kicsRealtimeScan("target/test-classes/Dockerfile","","v");
85+
Assertions.assertTrue(scan.getResults().size() >= 1);
86+
}
8787

8888
}

0 commit comments

Comments
 (0)