From 73d1703a3f799c6c87392606ac66daa7f79592bd Mon Sep 17 00:00:00 2001 From: Romain Brenguier Date: Mon, 17 Feb 2025 12:12:52 +0100 Subject: [PATCH] Fix quality flows --- .../src/test/java/org/sonar/java/CheckListGeneratorTest.java | 2 +- .../test/java/org/sonar/java/checks/helpers/JavadocTest.java | 2 +- .../java/org/sonar/java/filters/AnyRuleIssueFilterTest.java | 2 +- .../sonar/java/filters/BaseTreeVisitorIssueFilterTest.java | 2 +- .../org/sonar/java/filters/PostAnalysisIssueFilterTest.java | 2 +- .../java/org/sonar/java/DefaultJavaResourceLocatorTest.java | 2 +- .../src/test/java/org/sonar/java/ast/JavaAstScannerTest.java | 2 +- .../sonar/java/ast/visitors/SonarSymbolTableVisitorTest.java | 2 +- .../sonar/java/ast/visitors/SyntaxHighlighterVisitorTest.java | 2 +- .../java/org/sonar/java/classpath/ClasspathForTestTest.java | 2 +- .../sonar/java/model/DefaultInputFileScannerContextTest.java | 2 +- .../src/test/java/org/sonar/java/model/GeneratedFileTest.java | 2 +- .../sonar/java/reporting/InternalJavaIssueBuilderTest.java | 4 ++-- .../org/sonar/plugins/surefire/SurefireJavaParserTest.java | 2 +- .../java/org/sonar/plugins/surefire/SurefireSensorTest.java | 2 +- .../sonar/plugins/surefire/data/SurefireStaxHandlerTest.java | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/check-list/src/test/java/org/sonar/java/CheckListGeneratorTest.java b/check-list/src/test/java/org/sonar/java/CheckListGeneratorTest.java index 9b5fd06f000..b7048199cc9 100644 --- a/check-list/src/test/java/org/sonar/java/CheckListGeneratorTest.java +++ b/check-list/src/test/java/org/sonar/java/CheckListGeneratorTest.java @@ -40,7 +40,7 @@ class CheckListGeneratorTest { private final String directory = System.getProperty("user.dir").replace("check-list", ""); @BeforeEach - public void setUp() throws IOException { + void setUp() throws IOException { Gson gson = new Gson(); generator = new CheckListGenerator(gson, Path.of(directory, "java-checks/src/main/java"), diff --git a/java-checks/src/test/java/org/sonar/java/checks/helpers/JavadocTest.java b/java-checks/src/test/java/org/sonar/java/checks/helpers/JavadocTest.java index 2acfed98715..a5cf81c2d42 100644 --- a/java-checks/src/test/java/org/sonar/java/checks/helpers/JavadocTest.java +++ b/java-checks/src/test/java/org/sonar/java/checks/helpers/JavadocTest.java @@ -43,7 +43,7 @@ class JavadocTest { private static Javadoc invalidThrownExceptionUndocumented; @BeforeAll - public static void setup() { + static void setup() { File file = new File("src/test/files/checks/helpers/JavadocTest.java"); tree = JParserTestUtils.parse(file); diff --git a/java-checks/src/test/java/org/sonar/java/filters/AnyRuleIssueFilterTest.java b/java-checks/src/test/java/org/sonar/java/filters/AnyRuleIssueFilterTest.java index 8363a9f67a2..35278d922c9 100644 --- a/java-checks/src/test/java/org/sonar/java/filters/AnyRuleIssueFilterTest.java +++ b/java-checks/src/test/java/org/sonar/java/filters/AnyRuleIssueFilterTest.java @@ -48,7 +48,7 @@ class AnyRuleIssueFilterTest { private FilterableIssue issue; @BeforeEach - public void setup() { + void setup() { issue = mock(FilterableIssue.class); when(issue.componentKey()).thenReturn(INPUT_FILE.key()); when(issue.ruleKey()).thenReturn(RuleKey.of(REPOSITORY_KEY, RULE_KEY)); diff --git a/java-checks/src/test/java/org/sonar/java/filters/BaseTreeVisitorIssueFilterTest.java b/java-checks/src/test/java/org/sonar/java/filters/BaseTreeVisitorIssueFilterTest.java index 329bace3022..3788b7c70ae 100644 --- a/java-checks/src/test/java/org/sonar/java/filters/BaseTreeVisitorIssueFilterTest.java +++ b/java-checks/src/test/java/org/sonar/java/filters/BaseTreeVisitorIssueFilterTest.java @@ -50,7 +50,7 @@ class BaseTreeVisitorIssueFilterTest { private FilterableIssue issue; @BeforeEach - public void setup() { + void setup() { issue = mock(FilterableIssue.class); when(issue.componentKey()).thenReturn(INPUT_FILE.key()); when(issue.ruleKey()).thenReturn(RuleKey.of(REPOSITORY_KEY, RULE_KEY)); diff --git a/java-checks/src/test/java/org/sonar/java/filters/PostAnalysisIssueFilterTest.java b/java-checks/src/test/java/org/sonar/java/filters/PostAnalysisIssueFilterTest.java index cd0bced0b38..9978f8cda98 100644 --- a/java-checks/src/test/java/org/sonar/java/filters/PostAnalysisIssueFilterTest.java +++ b/java-checks/src/test/java/org/sonar/java/filters/PostAnalysisIssueFilterTest.java @@ -44,7 +44,7 @@ class PostAnalysisIssueFilterTest { private FilterableIssue fakeIssue; @BeforeEach - public void setUp() { + void setUp() { postAnalysisIssueFilter = new PostAnalysisIssueFilter(); context = mock(JavaFileScannerContext.class); diff --git a/java-frontend/src/test/java/org/sonar/java/DefaultJavaResourceLocatorTest.java b/java-frontend/src/test/java/org/sonar/java/DefaultJavaResourceLocatorTest.java index c54938427d9..f3b39cd1985 100644 --- a/java-frontend/src/test/java/org/sonar/java/DefaultJavaResourceLocatorTest.java +++ b/java-frontend/src/test/java/org/sonar/java/DefaultJavaResourceLocatorTest.java @@ -40,7 +40,7 @@ class DefaultJavaResourceLocatorTest { private static final String TEST_BINARY_DIRS = "target/test/test-classes"; @BeforeAll - public static void setup() { + static void setup() { ClasspathForMain javaClasspath = mock(ClasspathForMain.class); when(javaClasspath.getBinaryDirs()).thenReturn(Collections.singletonList(new File(BINARY_DIRS))); when(javaClasspath.getElements()).thenReturn(Collections.singletonList(new File(BINARY_DIRS))); diff --git a/java-frontend/src/test/java/org/sonar/java/ast/JavaAstScannerTest.java b/java-frontend/src/test/java/org/sonar/java/ast/JavaAstScannerTest.java index ceb063a8bc7..a7a6ef48564 100644 --- a/java-frontend/src/test/java/org/sonar/java/ast/JavaAstScannerTest.java +++ b/java-frontend/src/test/java/org/sonar/java/ast/JavaAstScannerTest.java @@ -81,7 +81,7 @@ class JavaAstScannerTest { private SensorContextTester context; @BeforeEach - public void setUp() { + void setUp() { context = SensorContextTester.create(new File("")); } diff --git a/java-frontend/src/test/java/org/sonar/java/ast/visitors/SonarSymbolTableVisitorTest.java b/java-frontend/src/test/java/org/sonar/java/ast/visitors/SonarSymbolTableVisitorTest.java index 779afebf52f..9af120fd936 100644 --- a/java-frontend/src/test/java/org/sonar/java/ast/visitors/SonarSymbolTableVisitorTest.java +++ b/java-frontend/src/test/java/org/sonar/java/ast/visitors/SonarSymbolTableVisitorTest.java @@ -51,7 +51,7 @@ class SonarSymbolTableVisitorTest { private SonarComponents sonarComponents; @BeforeEach - public void setUp() { + void setUp() { context = SensorContextTester.create(temp.getRoot()); sonarComponents = new SonarComponents(mock(FileLinesContextFactory.class), context.fileSystem(), mock(ClasspathForMain.class), mock(ClasspathForTest.class), mock(CheckFactory.class), mock(ActiveRules.class)); diff --git a/java-frontend/src/test/java/org/sonar/java/ast/visitors/SyntaxHighlighterVisitorTest.java b/java-frontend/src/test/java/org/sonar/java/ast/visitors/SyntaxHighlighterVisitorTest.java index 6efeefbed8b..31bbc65813a 100644 --- a/java-frontend/src/test/java/org/sonar/java/ast/visitors/SyntaxHighlighterVisitorTest.java +++ b/java-frontend/src/test/java/org/sonar/java/ast/visitors/SyntaxHighlighterVisitorTest.java @@ -59,7 +59,7 @@ class SyntaxHighlighterVisitorTest { private SyntaxHighlighterVisitor syntaxHighlighterVisitor; @BeforeEach - public void setUp() { + void setUp() { context = SensorContextTester.create(temp.getRoot()); sonarComponents = new SonarComponents(mock(FileLinesContextFactory.class), context.fileSystem(), mock(ClasspathForMain.class), mock(ClasspathForTest.class), mock(CheckFactory.class), mock(ActiveRules.class)); diff --git a/java-frontend/src/test/java/org/sonar/java/classpath/ClasspathForTestTest.java b/java-frontend/src/test/java/org/sonar/java/classpath/ClasspathForTestTest.java index 50a26deccd7..5ea6e2c65a6 100644 --- a/java-frontend/src/test/java/org/sonar/java/classpath/ClasspathForTestTest.java +++ b/java-frontend/src/test/java/org/sonar/java/classpath/ClasspathForTestTest.java @@ -41,7 +41,7 @@ class ClasspathForTestTest { public ThreadLocalLogTester logTester = new ThreadLocalLogTester().setLevel(Level.DEBUG); @BeforeEach - public void setUp() { + void setUp() { fs = new DefaultFileSystem(new File("src/test/files/classpath/")); fs.add(TestUtils.emptyInputFile("foo.java", InputFile.Type.TEST)); settings = new MapSettings(); diff --git a/java-frontend/src/test/java/org/sonar/java/model/DefaultInputFileScannerContextTest.java b/java-frontend/src/test/java/org/sonar/java/model/DefaultInputFileScannerContextTest.java index 6a1e86ff0b7..efcaaf089ec 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/DefaultInputFileScannerContextTest.java +++ b/java-frontend/src/test/java/org/sonar/java/model/DefaultInputFileScannerContextTest.java @@ -63,7 +63,7 @@ public void endOfAnalysis(ModuleScannerContext context) { } @BeforeEach - public void setup() { + void setup() { sonarComponents = createSonarComponentsMock(); compilationUnitTree = JParserTestUtils.parse(JAVA_FILE); context = new DefaultJavaFileScannerContext(compilationUnitTree, JAVA_INPUT_FILE, null, sonarComponents, new JavaVersionImpl(), true, false); diff --git a/java-frontend/src/test/java/org/sonar/java/model/GeneratedFileTest.java b/java-frontend/src/test/java/org/sonar/java/model/GeneratedFileTest.java index 38fbf57a6a1..c0c82f8b44e 100644 --- a/java-frontend/src/test/java/org/sonar/java/model/GeneratedFileTest.java +++ b/java-frontend/src/test/java/org/sonar/java/model/GeneratedFileTest.java @@ -53,7 +53,7 @@ class GeneratedFileTest { private DefaultFileSystem fs; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { expected = tmp.resolve("file.jsp"); Files.write(expected, "content".getBytes(UTF_8)); fs = new DefaultFileSystem(tmp); diff --git a/java-frontend/src/test/java/org/sonar/java/reporting/InternalJavaIssueBuilderTest.java b/java-frontend/src/test/java/org/sonar/java/reporting/InternalJavaIssueBuilderTest.java index 579591766d9..b16d2e42076 100644 --- a/java-frontend/src/test/java/org/sonar/java/reporting/InternalJavaIssueBuilderTest.java +++ b/java-frontend/src/test/java/org/sonar/java/reporting/InternalJavaIssueBuilderTest.java @@ -93,7 +93,7 @@ class InternalJavaIssueBuilderTest { private InputFile inputFile; @BeforeEach - public void setup() { + void setup() { SonarComponents sonarComponents = mock(SonarComponents.class); sensorContextTester = SensorContextTester.create(new File("")); when(sonarComponents.context()).thenReturn(sensorContextTester); @@ -370,7 +370,7 @@ class QuickFixes { private CompilationUnitTree cut = JParserTestUtils.parse(JAVA_FILE); @BeforeEach - public void setup() { + void setup() { sct = Mockito.spy(SensorContextTester.create(new File(""))); when(sct.newIssue()).thenReturn(new MockSonarLintIssue(sct)); diff --git a/java-surefire/src/test/java/org/sonar/plugins/surefire/SurefireJavaParserTest.java b/java-surefire/src/test/java/org/sonar/plugins/surefire/SurefireJavaParserTest.java index a9c0a48cb2c..78ac45b4bb1 100644 --- a/java-surefire/src/test/java/org/sonar/plugins/surefire/SurefireJavaParserTest.java +++ b/java-surefire/src/test/java/org/sonar/plugins/surefire/SurefireJavaParserTest.java @@ -46,7 +46,7 @@ class SurefireJavaParserTest { public LogTesterJUnit5 logTester = new LogTesterJUnit5().setLevel(Level.DEBUG); @BeforeEach - public void before() { + void before() { javaResourceLocator = mock(JavaResourceLocator.class); when(javaResourceLocator.findResourceByClassName(anyString())).thenAnswer(invocation -> new TestInputFileBuilder("", (String) invocation.getArguments()[0]).build()); diff --git a/java-surefire/src/test/java/org/sonar/plugins/surefire/SurefireSensorTest.java b/java-surefire/src/test/java/org/sonar/plugins/surefire/SurefireSensorTest.java index 99cb43efdd8..97bbd1a3fea 100644 --- a/java-surefire/src/test/java/org/sonar/plugins/surefire/SurefireSensorTest.java +++ b/java-surefire/src/test/java/org/sonar/plugins/surefire/SurefireSensorTest.java @@ -48,7 +48,7 @@ class SurefireSensorTest { private PathResolver pathResolver = new PathResolver(); @BeforeEach - public void before() { + void before() { fs = new DefaultFileSystem(new File("src/test/resources")); DefaultInputFile javaFile = new TestInputFileBuilder("", "src/org/foo/java").setLanguage("java").build(); fs.add(javaFile); diff --git a/java-surefire/src/test/java/org/sonar/plugins/surefire/data/SurefireStaxHandlerTest.java b/java-surefire/src/test/java/org/sonar/plugins/surefire/data/SurefireStaxHandlerTest.java index 394f936ba41..03317c3733c 100644 --- a/java-surefire/src/test/java/org/sonar/plugins/surefire/data/SurefireStaxHandlerTest.java +++ b/java-surefire/src/test/java/org/sonar/plugins/surefire/data/SurefireStaxHandlerTest.java @@ -33,7 +33,7 @@ class SurefireStaxHandlerTest { private UnitTestIndex index; @BeforeEach - public void setUp() { + void setUp() { index = new UnitTestIndex(); }