Skip to content

Commit 4765a65

Browse files
SONARJAVA-5534 Remove SE engine and unused duplicated check test sources (#5176)
Co-authored-by: Leonardo Pilastri <leonardo.pilastri@sonarsource.com>
1 parent 2249ea0 commit 4765a65

609 files changed

Lines changed: 15 additions & 66082 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ test_analyze_task:
9595
- *log_develocity_url_script
9696
- source cirrus-env BUILD
9797
# ignore duplications in the SE engine plugin, as it will be moved away from sonar-java at some point
98-
- PULL_REQUEST_SHA=$GIT_SHA1 regular_mvn_build_deploy_analyze -P-deploy-sonarsource,-release,-sign -Dmaven.deploy.skip=true -Dsonar.analysisCache.enabled=true -Dsonar.cpd.exclusions=java-symbolic-execution/** -Dsonar.sca.exclusions="**/test/files/**, **/test/resources/**, its/plugin/projects/**, java-checks-test-sources/**, its/sources/**,"
98+
- PULL_REQUEST_SHA=$GIT_SHA1 regular_mvn_build_deploy_analyze -P-deploy-sonarsource,-release,-sign -Dmaven.deploy.skip=true -Dsonar.analysisCache.enabled=true -Dsonar.sca.exclusions="**/test/files/**, **/test/resources/**, its/plugin/projects/**, java-checks-test-sources/**, its/sources/**,"
9999
- cd docs/java-custom-rules-example
100100
- mvn clean package -f pom_SQ_10_6_LATEST.xml --batch-mode
101101
- cd "${CIRRUS_WORKING_DIR}"

.github/workflows/UpdateRuleMetadata.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ jobs:
4242
run: |
4343
java -jar "/tmp/rule-api.jar" update
4444
sed --in-place='' -e 's/rule:java:S3649/rule:javasecurity:S3649/g' 'sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2077.html'
45-
cd java-symbolic-execution
46-
java -jar "/tmp/rule-api.jar" update
4745
4846
- name: Create PR
4947
env:

check-list/src/main/java/org/sonar/java/CheckListGenerator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ public final class ${className} {
175175
.collect(Collectors.toList());
176176
177177
private static final Set<Class<? extends JavaCheck>> JAVA_CHECKS_NOT_WORKING_FOR_AUTOSCAN = Set.of(
178-
// Symbolic executions rules are not in this list because they are dynamically excluded
179178
// Rules relying on correct setup of jdk.home
180179
CallToDeprecatedCodeMarkedForRemovalCheck.class,
181180
CallToDeprecatedMethodCheck.class,

its/autoscan/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,6 @@
8181
<version>${project.version}</version>
8282
<scope>test</scope>
8383
</dependency>
84-
<dependency>
85-
<groupId>org.sonarsource.java</groupId>
86-
<artifactId>sonar-java-symbolic-execution-plugin</artifactId>
87-
<version>${project.version}</version>
88-
<scope>test</scope>
89-
</dependency>
9084
</dependencies>
9185

9286
<profiles>

its/autoscan/src/test/java/org/sonar/java/it/AutoScanTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public class AutoScanTest {
6666
.useDefaultAdminCredentialsForBuilds(true)
6767
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
6868
.addPlugin(FileLocation.of(TestClasspathUtils.findModuleJarPath("../../sonar-java-plugin").toFile()))
69-
.addPlugin(FileLocation.of(TestClasspathUtils.findModuleJarPath("../../java-symbolic-execution/java-symbolic-execution-plugin").toFile()))
7069
.addPlugin(MavenLocation.of("org.sonarsource.sonar-lits-plugin", "sonar-lits-plugin", "0.11.0.2659"))
7170
.build();
7271

@@ -196,7 +195,7 @@ public void javaCheckTestSources() throws Exception {
196195
softly.assertThat(newDiffs).containsExactlyInAnyOrderElementsOf(knownDiffs.values());
197196
softly.assertThat(newTotal).isEqualTo(knownTotal);
198197
softly.assertThat(rulesCausingFPs).hasSize(9);
199-
softly.assertThat(rulesNotReporting).hasSize(10);
198+
softly.assertThat(rulesNotReporting).hasSize(12);
200199

201200
/**
202201
* 4. Check total number of differences (FPs + FNs)

its/autoscan/src/test/resources/autoscan/autoscan-diff-by-rules.json

Lines changed: 0 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -803,12 +803,6 @@
803803
"falseNegatives": 0,
804804
"falsePositives": 0
805805
},
806-
{
807-
"ruleKey": "S2095",
808-
"hasTruePositives": true,
809-
"falseNegatives": 67,
810-
"falsePositives": 0
811-
},
812806
{
813807
"ruleKey": "S2097",
814808
"hasTruePositives": true,
@@ -1055,12 +1049,6 @@
10551049
"falseNegatives": 2,
10561050
"falsePositives": 0
10571051
},
1058-
{
1059-
"ruleKey": "S2189",
1060-
"hasTruePositives": true,
1061-
"falseNegatives": 0,
1062-
"falsePositives": 0
1063-
},
10641052
{
10651053
"ruleKey": "S2200",
10661054
"hasTruePositives": true,
@@ -1085,12 +1073,6 @@
10851073
"falseNegatives": 17,
10861074
"falsePositives": 0
10871075
},
1088-
{
1089-
"ruleKey": "S2222",
1090-
"hasTruePositives": true,
1091-
"falseNegatives": 0,
1092-
"falsePositives": 0
1093-
},
10941076
{
10951077
"ruleKey": "S2225",
10961078
"hasTruePositives": true,
@@ -1169,12 +1151,6 @@
11691151
"falseNegatives": 0,
11701152
"falsePositives": 0
11711153
},
1172-
{
1173-
"ruleKey": "S2259",
1174-
"hasTruePositives": true,
1175-
"falseNegatives": 4,
1176-
"falsePositives": 0
1177-
},
11781154
{
11791155
"ruleKey": "S2272",
11801156
"hasTruePositives": true,
@@ -1295,18 +1271,6 @@
12951271
"falseNegatives": 0,
12961272
"falsePositives": 0
12971273
},
1298-
{
1299-
"ruleKey": "S2583",
1300-
"hasTruePositives": true,
1301-
"falseNegatives": 20,
1302-
"falsePositives": 0
1303-
},
1304-
{
1305-
"ruleKey": "S2589",
1306-
"hasTruePositives": true,
1307-
"falseNegatives": 6,
1308-
"falsePositives": 0
1309-
},
13101274
{
13111275
"ruleKey": "S2612",
13121276
"hasTruePositives": true,
@@ -1319,12 +1283,6 @@
13191283
"falseNegatives": 60,
13201284
"falsePositives": 0
13211285
},
1322-
{
1323-
"ruleKey": "S2637",
1324-
"hasTruePositives": true,
1325-
"falseNegatives": 87,
1326-
"falsePositives": 0
1327-
},
13281286
{
13291287
"ruleKey": "S2638",
13301288
"hasTruePositives": true,
@@ -1373,12 +1331,6 @@
13731331
"falseNegatives": 0,
13741332
"falsePositives": 0
13751333
},
1376-
{
1377-
"ruleKey": "S2689",
1378-
"hasTruePositives": true,
1379-
"falseNegatives": 0,
1380-
"falsePositives": 0
1381-
},
13821334
{
13831335
"ruleKey": "S2692",
13841336
"hasTruePositives": true,
@@ -1415,12 +1367,6 @@
14151367
"falseNegatives": 0,
14161368
"falsePositives": 0
14171369
},
1418-
{
1419-
"ruleKey": "S2755",
1420-
"hasTruePositives": false,
1421-
"falseNegatives": 100,
1422-
"falsePositives": 0
1423-
},
14241370
{
14251371
"ruleKey": "S2757",
14261372
"hasTruePositives": true,
@@ -1559,12 +1505,6 @@
15591505
"falseNegatives": 0,
15601506
"falsePositives": 0
15611507
},
1562-
{
1563-
"ruleKey": "S3065",
1564-
"hasTruePositives": true,
1565-
"falseNegatives": 0,
1566-
"falsePositives": 0
1567-
},
15681508
{
15691509
"ruleKey": "S3066",
15701510
"hasTruePositives": true,
@@ -1661,18 +1601,6 @@
16611601
"falseNegatives": 150,
16621602
"falsePositives": 0
16631603
},
1664-
{
1665-
"ruleKey": "S3516",
1666-
"hasTruePositives": true,
1667-
"falseNegatives": 8,
1668-
"falsePositives": 0
1669-
},
1670-
{
1671-
"ruleKey": "S3518",
1672-
"hasTruePositives": true,
1673-
"falseNegatives": 7,
1674-
"falsePositives": 0
1675-
},
16761604
{
16771605
"ruleKey": "S3551",
16781606
"hasTruePositives": true,
@@ -1703,12 +1631,6 @@
17031631
"falseNegatives": 0,
17041632
"falsePositives": 0
17051633
},
1706-
{
1707-
"ruleKey": "S3655",
1708-
"hasTruePositives": true,
1709-
"falseNegatives": 8,
1710-
"falsePositives": 0
1711-
},
17121634
{
17131635
"ruleKey": "S3740",
17141636
"hasTruePositives": true,
@@ -1739,12 +1661,6 @@
17391661
"falseNegatives": 0,
17401662
"falsePositives": 0
17411663
},
1742-
{
1743-
"ruleKey": "S3824",
1744-
"hasTruePositives": true,
1745-
"falseNegatives": 0,
1746-
"falsePositives": 0
1747-
},
17481664
{
17491665
"ruleKey": "S3864",
17501666
"hasTruePositives": true,
@@ -1763,18 +1679,6 @@
17631679
"falseNegatives": 0,
17641680
"falsePositives": 0
17651681
},
1766-
{
1767-
"ruleKey": "S3958",
1768-
"hasTruePositives": true,
1769-
"falseNegatives": 4,
1770-
"falsePositives": 0
1771-
},
1772-
{
1773-
"ruleKey": "S3959",
1774-
"hasTruePositives": true,
1775-
"falseNegatives": 0,
1776-
"falsePositives": 0
1777-
},
17781682
{
17791683
"ruleKey": "S3972",
17801684
"hasTruePositives": true,
@@ -1859,12 +1763,6 @@
18591763
"falseNegatives": 3,
18601764
"falsePositives": 7
18611765
},
1862-
{
1863-
"ruleKey": "S4165",
1864-
"hasTruePositives": true,
1865-
"falseNegatives": 1,
1866-
"falsePositives": 0
1867-
},
18681766
{
18691767
"ruleKey": "S4201",
18701768
"hasTruePositives": true,
@@ -1943,12 +1841,6 @@
19431841
"falseNegatives": 0,
19441842
"falsePositives": 0
19451843
},
1946-
{
1947-
"ruleKey": "S4449",
1948-
"hasTruePositives": false,
1949-
"falseNegatives": 27,
1950-
"falsePositives": 0
1951-
},
19521844
{
19531845
"ruleKey": "S4454",
19541846
"hasTruePositives": true,
@@ -2783,24 +2675,6 @@
27832675
"falseNegatives": 0,
27842676
"falsePositives": 0
27852677
},
2786-
{
2787-
"ruleKey": "S6373",
2788-
"hasTruePositives": false,
2789-
"falseNegatives": 15,
2790-
"falsePositives": 0
2791-
},
2792-
{
2793-
"ruleKey": "S6376",
2794-
"hasTruePositives": false,
2795-
"falseNegatives": 15,
2796-
"falsePositives": 0
2797-
},
2798-
{
2799-
"ruleKey": "S6377",
2800-
"hasTruePositives": false,
2801-
"falseNegatives": 6,
2802-
"falsePositives": 0
2803-
},
28042678
{
28052679
"ruleKey": "S6395",
28062680
"hasTruePositives": true,
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"ruleKey": "S1128",
33
"hasTruePositives": true,
4-
"falseNegatives": 33,
4+
"falseNegatives": 32,
55
"falsePositives": 0
6-
}
6+
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"ruleKey": "S1130",
33
"hasTruePositives": true,
4-
"falseNegatives": 25,
4+
"falseNegatives": 11,
55
"falsePositives": 0
6-
}
6+
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"ruleKey": "S1172",
33
"hasTruePositives": true,
4-
"falseNegatives": 25,
4+
"falseNegatives": 23,
55
"falsePositives": 0
6-
}
6+
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"ruleKey": "S1874",
33
"hasTruePositives": true,
4-
"falseNegatives": 258,
4+
"falseNegatives": 249,
55
"falsePositives": 0
6-
}
6+
}

0 commit comments

Comments
 (0)