Skip to content

Commit 728ca1e

Browse files
Fix bugs and code smells
1 parent 22cdf3f commit 728ca1e

File tree

3 files changed

+12
-20
lines changed

3 files changed

+12
-20
lines changed

src/main/java/fr/cnes/sonar/plugins/icode/languages/ICodeQualityProfiles.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public final class ICodeQualityProfiles implements BuiltInQualityProfilesDefinit
4242
*/
4343
@Override
4444
public void define(final Context context) {
45-
createBuiltInProfile(context, ICodeRulesDefinition.FORTRAN77_REPOSITORY, Fortran77Language.KEY, ICodeRulesDefinition.getF77Rules());
46-
createBuiltInProfile(context, ICodeRulesDefinition.FORTRAN90_REPOSITORY, Fortran90Language.KEY, ICodeRulesDefinition.getF90Rules());
45+
createBuiltInProfile(context, ICodeRulesDefinition.FORTRAN77_REPOSITORY, Fortran77Language.KEY, ICodeRulesDefinition.f77Rules);
46+
createBuiltInProfile(context, ICodeRulesDefinition.FORTRAN90_REPOSITORY, Fortran90Language.KEY, ICodeRulesDefinition.f90Rules);
4747
}
4848

4949
/**

src/main/java/fr/cnes/sonar/plugins/icode/rules/ICodeRulesDefinition.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ public class ICodeRulesDefinition implements RulesDefinition {
6161
/** Path to xml file in resources tree (fortran 90 rules). **/
6262
public static final String PATH_TO_F90_RULES_XML = "/rules/icode-f90-rules.xml";
6363

64-
private static List<NewRule> f77Rules;
65-
private static List<NewRule> f90Rules;
64+
public static List<NewRule> f77Rules;
65+
public static List<NewRule> f90Rules;
6666

6767
/**
6868
* Define i-Code rules in SonarQube thanks to xml configuration files.
@@ -151,12 +151,4 @@ protected List<NewRule> createFortranRepository(final Context context, final Str
151151
public static String getRepositoryKeyForLanguage(final String language) {
152152
return language + REPO_KEY_SUFFIX;
153153
}
154-
155-
public static List<NewRule> getF77Rules() {
156-
return f77Rules;
157-
}
158-
159-
public static List<NewRule> getF90Rules() {
160-
return f90Rules;
161-
}
162154
}

src/test/java/fr/cnes/sonar/plugins/icode/measures/ICodeMetricsProcessorTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import fr.cnes.sonar.plugins.icode.model.AnalysisRule;
2222
import fr.cnes.sonar.plugins.icode.model.Result;
2323
import org.junit.Assert;
24-
import org.junit.Before;
24+
import org.junit.jupiter.api.BeforeEach;
2525
import org.junit.jupiter.api.Test;
2626
import org.junit.jupiter.params.ParameterizedTest;
2727
import org.junit.jupiter.params.provider.MethodSource;
@@ -43,7 +43,7 @@
4343
import java.util.List;
4444
import java.util.Map;
4545

46-
public class ICodeMetricsProcessorTest {
46+
class ICodeMetricsProcessorTest {
4747

4848
private DefaultFileSystem fs;
4949
private SensorContextTester context;
@@ -53,7 +53,7 @@ public class ICodeMetricsProcessorTest {
5353
private DefaultInputFile clanhb_f;
5454
private DefaultInputFile clanhb_f90;
5555

56-
@Before
56+
@BeforeEach
5757
public void prepare() throws URISyntaxException {
5858
final URI projectPath = ICodeMetricsProcessor.class.getResource("/project").toURI();
5959
fs = new DefaultFileSystem(new File(projectPath));
@@ -92,7 +92,7 @@ private static Stream<Arguments> testData() {
9292

9393
@ParameterizedTest
9494
@MethodSource("testData")
95-
public void test_compute_metrics(AnalysisRuleTestData testData) {
95+
void test_compute_metrics(AnalysisRuleTestData testData) {
9696
final AnalysisProject project = new AnalysisProject();
9797
final String key = clanhb_f.key();
9898

@@ -112,17 +112,17 @@ public void test_compute_metrics(AnalysisRuleTestData testData) {
112112
}
113113

114114
@Test
115-
public void test_is_metric_true() {
115+
void test_is_metric_true() {
116116
Assert.assertTrue(ICodeMetricsProcessor.isMetric("SH.MET.COCO"));
117117
}
118118

119119
@Test
120-
public void test_is_metric_false() {
120+
void test_is_metric_false() {
121121
Assert.assertFalse(ICodeMetricsProcessor.isMetric("COCO"));
122122
}
123123

124124
@Test
125-
public void test_save_extra_measure_with_null_location() {
125+
void test_save_extra_measure_with_null_location() {
126126
// If we upgrade to Junit5, we may check @ParametrizedTest annotation
127127
String[] locations = {null, "", "method"};
128128
int[] expectedResults = {0, 0, 1};
@@ -143,7 +143,7 @@ public void test_save_extra_measure_with_null_location() {
143143
}
144144

145145
@Test
146-
public void test_save_nominal_measures() {
146+
void test_save_nominal_measures() {
147147

148148
final String key = clanhb_f.key();
149149
rule.setResult(new Result());

0 commit comments

Comments
 (0)