aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJacek <jacek.poreda@sonarsource.com>2022-06-01 13:18:19 +0200
committersonartech <sonartech@sonarsource.com>2022-06-02 20:03:17 +0000
commit0c7693290580e96972ad95068ba03c9ec82a145f (patch)
tree4203bc487fa80b0f3b9cb891d66bcc71f78c00d2 /server
parent78fda912bd3c41634a52eb15234dd69abfab2829 (diff)
downloadsonarqube-0c7693290580e96972ad95068ba03c9ec82a145f.tar.gz
sonarqube-0c7693290580e96972ad95068ba03c9ec82a145f.zip
SONAR-16316 Minor fixes to regulatory report
- Rename files from 'issues' to 'findings' - Fix label on files included in zip file in regulatory template - Exclude CODE_SMELLS from findings CSVs
Diffstat (limited to 'server')
-rw-r--r--server/sonar-db-dao/src/main/resources/org/sonar/db/report/RegulatoryReportMapper.xml2
-rw-r--r--server/sonar-db-dao/src/test/java/org/sonar/db/report/RegulatoryReportDaoTest.java10
2 files changed, 9 insertions, 3 deletions
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/report/RegulatoryReportMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/report/RegulatoryReportMapper.xml
index dc8be684288..dc9cb020b2e 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/report/RegulatoryReportMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/report/RegulatoryReportMapper.xml
@@ -61,6 +61,8 @@
left join new_code_reference_issues n on i.kee = n.issue_key
where i.project_uuid=#{branchUuid,jdbcType=VARCHAR}
and i.status !='CLOSED'
+ <!--BUG, VULNERABILITY, SECURITY_HOTSPOT -->
+ and i.issue_type in (2, 3, 4)
order by i.kee, ic.issue_change_creation_date
</select>
</mapper>
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/report/RegulatoryReportDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/report/RegulatoryReportDaoTest.java
index ca2d6391b50..30b3152793f 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/report/RegulatoryReportDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/report/RegulatoryReportDaoTest.java
@@ -24,6 +24,7 @@ import java.util.List;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.sonar.api.rules.RuleType;
import org.sonar.api.utils.System2;
import org.sonar.db.DbTester;
import org.sonar.db.component.ComponentDto;
@@ -48,20 +49,23 @@ public class RegulatoryReportDaoTest {
private final RegulatoryReportDao underTest = db.getDbClient().regulatoryReportDao();
private ComponentDto project;
private RuleDto rule;
+ private RuleDto hotspotRule;
private ComponentDto file;
@Before
public void prepare() {
rule = db.rules().insertRule();
+ hotspotRule = db.rules().insertHotspotRule();
project = db.components().insertPrivateProject(t -> t.setProjectUuid(PROJECT_UUID).setUuid(PROJECT_UUID).setDbKey(PROJECT_KEY));
file = db.components().insertComponent(newFileDto(project).setUuid(FILE_UUID).setDbKey(FILE_KEY));
}
@Test
public void scrollIssues_returns_all_non_closed_issues_for_project() {
- IssueDto issue1 = db.issues().insertIssue(rule, project, file, i -> i.setStatus("OPEN").setResolution(null));
- IssueDto issue2 = db.issues().insertIssue(rule, project, file, i -> i.setStatus("CONFIRMED").setResolution(null));
- IssueDto issue3 = db.issues().insertIssue(rule, project, file, i -> i.setStatus("RESOLVED").setResolution(RESOLUTION_WONT_FIX));
+ IssueDto issue1 = db.issues().insertIssue(rule, project, file, i -> i.setType(RuleType.BUG).setStatus("OPEN").setResolution(null));
+ IssueDto issue2 = db.issues().insertIssue(rule, project, file, i -> i.setType(RuleType.VULNERABILITY).setStatus("CONFIRMED").setResolution(null));
+ IssueDto issue3 = db.issues().insertHotspot(hotspotRule, project, file, i -> i.setStatus("RESOLVED").setResolution(RESOLUTION_WONT_FIX));
+ IssueDto issueCodeSmell = db.issues().insertIssue(rule, project, file, i -> i.setType(RuleType.CODE_SMELL).setStatus("RESOLVED").setResolution(RESOLUTION_WONT_FIX));
// comments
db.issues().insertChange(issue1, ic -> ic.setChangeData("c1").setIssueChangeCreationDate(1000L).setChangeType("comment"));