-
Notifications
You must be signed in to change notification settings - Fork 726
SONARJAVA-5698 Report Eclipse parser type errors #5261
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,18 +25,21 @@ public enum TelemetryKey { | |
| JAVA_IS_AUTOSCAN("java.is_autoscan"), | ||
| JAVA_ANALYSIS_MAIN_SUCCESS_SIZE_CHARS("java.analysis.main.success.size_chars"), | ||
| JAVA_ANALYSIS_MAIN_SUCCESS_TIME_MS("java.analysis.main.success.time_ms"), | ||
| JAVA_ANALYSIS_MAIN_SUCCESS_TYPE_ERROR_COUNT("java.analysis.main.success.type_error_count"), | ||
| JAVA_ANALYSIS_MAIN_PARSE_ERRORS_SIZE_CHARS("java.analysis.main.parse_errors.size_chars"), | ||
| JAVA_ANALYSIS_MAIN_PARSE_ERRORS_TIME_MS("java.analysis.main.parse_errors.time_ms"), | ||
| JAVA_ANALYSIS_MAIN_EXCEPTIONS_SIZE_CHARS("java.analysis.main.exceptions.size_chars"), | ||
| JAVA_ANALYSIS_MAIN_EXCEPTIONS_TIME_MS("java.analysis.main.exceptions.time_ms"), | ||
| JAVA_ANALYSIS_TEST_SUCCESS_SIZE_CHARS("java.analysis.test.success.size_chars"), | ||
| JAVA_ANALYSIS_TEST_SUCCESS_TIME_MS("java.analysis.test.success.time_ms"), | ||
| JAVA_ANALYSIS_TEST_SUCCESS_TYPE_ERROR_COUNT("java.analysis.test.success.type_error_count"), | ||
| JAVA_ANALYSIS_TEST_PARSE_ERRORS_SIZE_CHARS("java.analysis.test.parse_errors.size_chars"), | ||
| JAVA_ANALYSIS_TEST_PARSE_ERRORS_TIME_MS("java.analysis.test.parse_errors.time_ms"), | ||
| JAVA_ANALYSIS_TEST_EXCEPTIONS_SIZE_CHARS("java.analysis.test.exceptions.size_chars"), | ||
| JAVA_ANALYSIS_TEST_EXCEPTIONS_TIME_MS("java.analysis.test.exceptions.time_ms"), | ||
| JAVA_ANALYSIS_GENERATED_SUCCESS_SIZE_CHARS("java.analysis.generated.success.size_chars"), | ||
| JAVA_ANALYSIS_GENERATED_SUCCESS_TIME_MS("java.analysis.generated.success.time_ms"), | ||
| JAVA_ANALYSIS_GENERATED_SUCCESS_TYPE_ERROR_COUNT("java.analysis.generated.success.type_error_count"), | ||
| JAVA_ANALYSIS_GENERATED_PARSE_ERRORS_SIZE_CHARS("java.analysis.generated.parse_errors.size_chars"), | ||
| JAVA_ANALYSIS_GENERATED_PARSE_ERRORS_TIME_MS("java.analysis.generated.parse_errors.time_ms"), | ||
| JAVA_ANALYSIS_GENERATED_EXCEPTIONS_SIZE_CHARS("java.analysis.generated.exceptions.size_chars"), | ||
|
|
@@ -48,26 +51,38 @@ public enum TelemetryKey { | |
| JAVA_DEPENDENCY_SPRING_BOOT("java.dependency.spring-boot"), | ||
| JAVA_DEPENDENCY_SPRING_WEB("java.dependency.spring-web"); | ||
|
|
||
| public record SpeedKeys(TelemetryKey sizeCharsKey, TelemetryKey timeMsKey) { | ||
| public interface SpeedKeys { | ||
| TelemetryKey sizeCharsKey(); | ||
|
|
||
| TelemetryKey timeMsKey(); | ||
| } | ||
|
|
||
| public record SizeAndTimeKeys(TelemetryKey sizeCharsKey, TelemetryKey timeMsKey) implements SpeedKeys { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I prefer |
||
| } | ||
|
|
||
| public record SizeTimeAndTypeErrorKeys(TelemetryKey sizeCharsKey, TelemetryKey timeMsKey, TelemetryKey typeErrorCountKey) implements SpeedKeys { | ||
| } | ||
|
|
||
| public record JavaAnalysisKeys(SpeedKeys success, SpeedKeys parseErrors, SpeedKeys exceptions) { | ||
| public record JavaAnalysisKeys(SizeTimeAndTypeErrorKeys success, SpeedKeys parseErrors, SpeedKeys exceptions) { | ||
| } | ||
|
|
||
| public static final JavaAnalysisKeys JAVA_ANALYSIS_MAIN = new JavaAnalysisKeys( | ||
| new SpeedKeys(JAVA_ANALYSIS_MAIN_SUCCESS_SIZE_CHARS, JAVA_ANALYSIS_MAIN_SUCCESS_TIME_MS), | ||
| new SpeedKeys(JAVA_ANALYSIS_MAIN_PARSE_ERRORS_SIZE_CHARS, JAVA_ANALYSIS_MAIN_PARSE_ERRORS_TIME_MS), | ||
| new SpeedKeys(JAVA_ANALYSIS_MAIN_EXCEPTIONS_SIZE_CHARS, JAVA_ANALYSIS_MAIN_EXCEPTIONS_TIME_MS)); | ||
| new SizeTimeAndTypeErrorKeys(JAVA_ANALYSIS_MAIN_SUCCESS_SIZE_CHARS, JAVA_ANALYSIS_MAIN_SUCCESS_TIME_MS, | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's update the unit test for these data structures. |
||
| JAVA_ANALYSIS_MAIN_SUCCESS_TYPE_ERROR_COUNT), | ||
| new SizeAndTimeKeys(JAVA_ANALYSIS_MAIN_PARSE_ERRORS_SIZE_CHARS, JAVA_ANALYSIS_MAIN_PARSE_ERRORS_TIME_MS), | ||
| new SizeAndTimeKeys(JAVA_ANALYSIS_MAIN_EXCEPTIONS_SIZE_CHARS, JAVA_ANALYSIS_MAIN_EXCEPTIONS_TIME_MS)); | ||
|
|
||
| public static final JavaAnalysisKeys JAVA_ANALYSIS_TEST = new JavaAnalysisKeys( | ||
| new SpeedKeys(JAVA_ANALYSIS_TEST_SUCCESS_SIZE_CHARS, JAVA_ANALYSIS_TEST_SUCCESS_TIME_MS), | ||
| new SpeedKeys(JAVA_ANALYSIS_TEST_PARSE_ERRORS_SIZE_CHARS, JAVA_ANALYSIS_TEST_PARSE_ERRORS_TIME_MS), | ||
| new SpeedKeys(JAVA_ANALYSIS_TEST_EXCEPTIONS_SIZE_CHARS, JAVA_ANALYSIS_TEST_EXCEPTIONS_TIME_MS)); | ||
| new SizeTimeAndTypeErrorKeys(JAVA_ANALYSIS_TEST_SUCCESS_SIZE_CHARS, JAVA_ANALYSIS_TEST_SUCCESS_TIME_MS, | ||
| JAVA_ANALYSIS_TEST_SUCCESS_TYPE_ERROR_COUNT), | ||
| new SizeAndTimeKeys(JAVA_ANALYSIS_TEST_PARSE_ERRORS_SIZE_CHARS, JAVA_ANALYSIS_TEST_PARSE_ERRORS_TIME_MS), | ||
| new SizeAndTimeKeys(JAVA_ANALYSIS_TEST_EXCEPTIONS_SIZE_CHARS, JAVA_ANALYSIS_TEST_EXCEPTIONS_TIME_MS)); | ||
|
|
||
| public static final JavaAnalysisKeys JAVA_ANALYSIS_GENERATED = new JavaAnalysisKeys( | ||
| new SpeedKeys(JAVA_ANALYSIS_GENERATED_SUCCESS_SIZE_CHARS, JAVA_ANALYSIS_GENERATED_SUCCESS_TIME_MS), | ||
| new SpeedKeys(JAVA_ANALYSIS_GENERATED_PARSE_ERRORS_SIZE_CHARS, JAVA_ANALYSIS_GENERATED_PARSE_ERRORS_TIME_MS), | ||
| new SpeedKeys(JAVA_ANALYSIS_GENERATED_EXCEPTIONS_SIZE_CHARS, JAVA_ANALYSIS_GENERATED_EXCEPTIONS_TIME_MS)); | ||
| new SizeTimeAndTypeErrorKeys(JAVA_ANALYSIS_GENERATED_SUCCESS_SIZE_CHARS, JAVA_ANALYSIS_GENERATED_SUCCESS_TIME_MS, | ||
| JAVA_ANALYSIS_GENERATED_SUCCESS_TYPE_ERROR_COUNT), | ||
| new SizeAndTimeKeys(JAVA_ANALYSIS_GENERATED_PARSE_ERRORS_SIZE_CHARS, JAVA_ANALYSIS_GENERATED_PARSE_ERRORS_TIME_MS), | ||
| new SizeAndTimeKeys(JAVA_ANALYSIS_GENERATED_EXCEPTIONS_SIZE_CHARS, JAVA_ANALYSIS_GENERATED_EXCEPTIONS_TIME_MS)); | ||
|
|
||
| private final String key; | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,6 +33,7 @@ | |
| import org.slf4j.event.Level; | ||
| import org.sonar.api.SonarEdition; | ||
| import org.sonar.api.SonarQubeSide; | ||
| import org.sonar.api.batch.fs.FileSystem; | ||
| import org.sonar.api.batch.fs.InputFile; | ||
| import org.sonar.api.batch.fs.internal.DefaultFileSystem; | ||
| import org.sonar.api.batch.fs.internal.DefaultInputFile; | ||
|
|
@@ -123,6 +124,7 @@ void test_issues_creation_on_main_file() throws IOException { | |
| assertThat(telemetryMap).containsOnlyKeys( | ||
| "java.analysis.main.success.size_chars", | ||
| "java.analysis.main.success.time_ms", | ||
| "java.analysis.main.success.type_error_count", | ||
| "java.dependency.lombok", | ||
| "java.dependency.spring-boot", | ||
| "java.dependency.spring-web", | ||
|
|
@@ -132,16 +134,19 @@ void test_issues_creation_on_main_file() throws IOException { | |
| "java.scanner_app"); | ||
| assertThat(telemetryMap.get("java.analysis.main.success.size_chars")).matches("\\d{5}"); | ||
| assertThat(telemetryMap.get("java.analysis.main.success.time_ms")).matches("\\d+"); | ||
| assertThat(telemetryMap).containsEntry("java.analysis.main.success.type_error_count", "199"); | ||
| } | ||
|
|
||
| @Test | ||
| // Renaming this method will break lineNumberOfTheMethodWithNoSonar(fs). The name is used to locate the line number. | ||
| void test_issues_creation_on_test_file() throws IOException { // NOSONAR required to test NOSONAR reporting on test files | ||
| testIssueCreation(InputFile.Type.TEST, 0); | ||
|
|
||
| Map<String, String> telemetryMap = telemetry.toMap(); | ||
| assertThat(telemetryMap).containsOnlyKeys( | ||
| "java.analysis.test.success.size_chars", | ||
| "java.analysis.test.success.time_ms", | ||
| "java.analysis.test.success.type_error_count", | ||
| "java.dependency.lombok", | ||
| "java.dependency.spring-boot", | ||
| "java.dependency.spring-web", | ||
|
|
@@ -151,6 +156,15 @@ void test_issues_creation_on_test_file() throws IOException { // NOSONAR require | |
| "java.scanner_app"); | ||
| assertThat(telemetryMap.get("java.analysis.test.success.size_chars")).matches("\\d{5}"); | ||
| assertThat(telemetryMap.get("java.analysis.test.success.time_ms")).matches("\\d+"); | ||
| assertThat(telemetryMap).containsEntry("java.analysis.test.success.type_error_count", "199"); | ||
| } | ||
|
|
||
| private static int lineNumberOfTheMethodWithNoSonar(FileSystem fs) throws IOException { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thank you for fixing this! To avoid problems caused by refactoring. let's add the following comment on the test |
||
| String[] lines = fs.inputFile(fs.predicates().hasPath("org/sonar/plugins/java/JavaSensorTest.java")).contents().split("\n"); | ||
| int zeroBasedLineIndex = (int) Stream.of(lines) | ||
| .takeWhile(line -> !line.contains("test_issues_creation_on_test_file")) | ||
| .count(); | ||
| return zeroBasedLineIndex + 1; | ||
| } | ||
|
|
||
| private void testIssueCreation(InputFile.Type onType, int expectedIssues) throws IOException { | ||
|
|
@@ -169,8 +183,8 @@ private void testIssueCreation(InputFile.Type onType, int expectedIssues) throws | |
| JavaSensor jss = new JavaSensor(sonarComponents, fs, javaResourceLocator, settings.asConfig(), noSonarFilter, null, telemetry); | ||
|
|
||
| jss.execute(context); | ||
| // argument 138 refers to the comment on line #138 in this file, each time this file changes, this argument should be updated | ||
| verify(noSonarFilter, times(1)).noSonarInFile(fs.inputFiles().iterator().next(), Collections.singleton(138)); | ||
| int expectedNoSonarLine = lineNumberOfTheMethodWithNoSonar(fs); | ||
| verify(noSonarFilter, times(1)).noSonarInFile(fs.inputFiles().iterator().next(), Collections.singleton(expectedNoSonarLine)); | ||
| verify(sonarComponents, times(expectedIssues)).reportIssue(any(AnalyzerMessage.class)); | ||
|
|
||
| // There are additional entries, but we do not test them. | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lets change
TelemetryKeyTestso that it makes sure alljava.analysiskeys are tested. This would involve extracting the lists intestCompoundKeysand validating and the product of their lengths is equal to the number ofjava.analysiskeys.