Skip to content

Fix quality flaws in tests #197

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.

Sign up for GitHub

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

Merged
alban-auzeill merged 1 commit into from
Jan 31, 2019
Merged

Fix quality flaws in tests #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions its/plugin/src/test/java/com/sonar/python/it/plugin/NoSonarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,22 @@
public class NoSonarTest {

private static final String PROJECT_KEY = "nosonar";
private static final String PROFILE_NAME = "nosonar";

@ClassRule
public static Orchestrator orchestrator = Tests.ORCHESTRATOR;
public static final Orchestrator ORCHESTRATOR = Tests.ORCHESTRATOR;

@BeforeClass
public static void startServer() {
orchestrator.getServer().provisionProject(PROJECT_KEY, PROJECT_KEY);
orchestrator.getServer().associateProjectToQualityProfile(PROJECT_KEY, "py", "nosonar");
ORCHESTRATOR.getServer().provisionProject(PROJECT_KEY, PROJECT_KEY);
ORCHESTRATOR.getServer().associateProjectToQualityProfile(PROJECT_KEY, "py", PROFILE_NAME);
SonarScanner build = SonarScanner.create()
.setProjectDir(new File("projects", PROJECT_KEY))
.setProjectKey(PROJECT_KEY)
.setProjectName(PROJECT_KEY)
.setProjectVersion("1.0-SNAPSHOT")
.setSourceDirs(".");
orchestrator.executeBuild(build);
ORCHESTRATOR.executeBuild(build);
}

@Test
Expand Down
45 changes: 23 additions & 22 deletions python-checks/src/test/java/org/sonar/python/checks/utils/PythonCheckVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,33 +132,34 @@ public void visitToken(Token token) {
if (text.startsWith(marker)) {
int issueLine = trivia.getToken().getLine();
String paramsAndMessage = text.substring(marker.length()).trim();
expectedIssues.add(createIssue(issueLine, paramsAndMessage));
} else if (text.startsWith("^")) {
addPreciseLocation(trivia);
}
}
}

if (paramsAndMessage.startsWith("@")) {
String[] spaceSplit = paramsAndMessage.split("[\\s\\[{]", 2);
issueLine += Integer.valueOf(spaceSplit[0].substring(1));
paramsAndMessage = spaceSplit.length > 1 ? spaceSplit[1] : "";
}

TestIssue issue = TestIssue.create(null, issueLine);

if (paramsAndMessage.startsWith("[[")) {
int endIndex = paramsAndMessage.indexOf("]]");
addParams(issue, paramsAndMessage.substring(2, endIndex));
paramsAndMessage = paramsAndMessage.substring(endIndex + 2).trim();
}
private static TestIssue createIssue(int issueLine, String paramsAndMessage) {
if (paramsAndMessage.startsWith("@")) {
String[] spaceSplit = paramsAndMessage.split("[\\s\\[{]", 2);
issueLine += Integer.valueOf(spaceSplit[0].substring(1));
paramsAndMessage = spaceSplit.length > 1 ? spaceSplit[1] : "";
}

if (paramsAndMessage.startsWith("{{")) {
int endIndex = paramsAndMessage.indexOf("}}");
String message = paramsAndMessage.substring(2, endIndex);
issue.message(message);
}
TestIssue issue = TestIssue.create(null, issueLine);

expectedIssues.add(issue);
if (paramsAndMessage.startsWith("[[")) {
int endIndex = paramsAndMessage.indexOf("]]");
addParams(issue, paramsAndMessage.substring(2, endIndex));
paramsAndMessage = paramsAndMessage.substring(endIndex + 2).trim();
}

} else if (text.startsWith("^")) {
addPreciseLocation(trivia);
}
if (paramsAndMessage.startsWith("{{")) {
int endIndex = paramsAndMessage.indexOf("}}");
String message = paramsAndMessage.substring(2, endIndex);
issue.message(message);
}
return issue;
}

private static void addParams(TestIssue issue, String params) {
Expand Down
10 changes: 5 additions & 5 deletions sonar-python-plugin/src/main/java/org/sonar/plugins/python/Python.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.sonar.api.config.Settings;
import org.sonar.api.config.Configuration;
import org.sonar.api.resources.AbstractLanguage;

public class Python extends AbstractLanguage {
Expand All @@ -31,16 +31,16 @@ public class Python extends AbstractLanguage {

private static final String[] DEFAULT_FILE_SUFFIXES = { "py" };

private Settings settings;
private Configuration configuration;

public Python(Settings settings) {
public Python(Configuration configuration) {
super(KEY, "Python");
this.settings = settings;
this.configuration = configuration;
}

@Override
public String[] getFileSuffixes() {
String[] suffixes = filterEmptyStrings(settings.getStringArray(PythonPlugin.FILE_SUFFIXES_KEY));
String[] suffixes = filterEmptyStrings(configuration.getStringArray(PythonPlugin.FILE_SUFFIXES_KEY));
return suffixes.length == 0 ? Python.DEFAULT_FILE_SUFFIXES : suffixes;
}

Expand Down
2 changes: 1 addition & 1 deletion sonar-python-plugin/src/main/java/org/sonar/plugins/python/pylint/PylintImportSensor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void describe(SensorDescriptor descriptor) {
super.describe(descriptor);
descriptor
.createIssuesForRuleRepository(PylintRuleRepository.REPOSITORY_KEY)
.requireProperty(REPORT_PATH_KEY);
.onlyWhenConfiguration(conf -> conf.hasKey(REPORT_PATH_KEY));
}

@Override
Expand Down
15 changes: 5 additions & 10 deletions sonar-python-plugin/src/test/java/org/sonar/plugins/python/PythonTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@
*/
package org.sonar.plugins.python;

import com.google.common.collect.Maps;
import java.util.Map;
import org.junit.Test;
import org.sonar.api.config.Settings;
import org.sonar.api.config.internal.ConfigurationBridge;
import org.sonar.api.config.internal.MapSettings;

import static org.assertj.core.api.Assertions.assertThat;
Expand All @@ -31,21 +29,18 @@ public class PythonTest {

@Test
public void test() {
Python language = new Python(new MapSettings());
Python language = new Python(new ConfigurationBridge(new MapSettings()));
assertThat(language.getKey()).isEqualTo("py");
assertThat(language.getName()).isEqualTo("Python");
assertThat(language.getFileSuffixes()).hasSize(1).contains("py");
}

@Test
public void custom_file_suffixes() {
Map<String, String> props = Maps.newHashMap();
props.put(PythonPlugin.FILE_SUFFIXES_KEY, "py,python");
MapSettings settings = new MapSettings();
settings.setProperty(PythonPlugin.FILE_SUFFIXES_KEY, "py,python");

Settings settings = new MapSettings();
settings.addProperties(props);

Python language = new Python(settings);
Python language = new Python(new ConfigurationBridge(settings));
assertThat(language.getFileSuffixes()).hasSize(2).contains("python");
}
}
3 changes: 1 addition & 2 deletions ...thon-plugin/src/test/java/org/sonar/plugins/python/coverage/PythonCoverageSensorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.sonar.api.batch.fs.internal.DefaultInputFile;
import org.sonar.api.batch.fs.internal.TestInputFileBuilder;
import org.sonar.api.batch.sensor.internal.SensorContextTester;
import org.sonar.api.config.Settings;
import org.sonar.api.config.internal.MapSettings;
import org.sonar.api.utils.log.LogTester;
import org.sonar.api.utils.log.LoggerLevel;
Expand All @@ -53,7 +52,7 @@ public class PythonCoverageSensorTest {
private static final String FILE3_KEY = "moduleKey:sources/file3.py";
private static final String FILE4_KEY = "moduleKey:sources/file4.py";
private SensorContextTester context;
private Settings settings;
private MapSettings settings;

private PythonCoverageSensor coverageSensor = new PythonCoverageSensor();
private File moduleBaseDir = new File("src/test/resources/org/sonar/plugins/python/coverage-reports").getAbsoluteFile();
Expand Down
9 changes: 5 additions & 4 deletions sonar-python-plugin/src/test/java/org/sonar/plugins/python/xunit/PythonXUnitSensorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
import org.sonar.api.batch.fs.internal.DefaultInputFile;
import org.sonar.api.batch.fs.internal.TestInputFileBuilder;
import org.sonar.api.batch.sensor.internal.SensorContextTester;
import org.sonar.api.config.Settings;
import org.sonar.api.config.internal.ConfigurationBridge;
import org.sonar.api.config.internal.MapSettings;
import org.sonar.api.measures.CoreMetrics;
import org.sonar.api.measures.Metric;

Expand All @@ -39,16 +40,16 @@ public class PythonXUnitSensorTest {
private static final String FILE_SAMPLE2 = "tests/dir/test_sample2.py";

private File baseDir = new File("src/test/resources/org/sonar/plugins/python");
Settings settings;
MapSettings settings = new MapSettings();
PythonXUnitSensor sensor;
SensorContextTester context = SensorContextTester.create(baseDir);
DefaultFileSystem fs;

@Before
public void setUp() {
settings = context.settings();
context.setSettings(settings);
fs = new DefaultFileSystem(baseDir);
sensor = new PythonXUnitSensor(context.config(), fs);
sensor = new PythonXUnitSensor(new ConfigurationBridge(settings), fs);
}

@Test
Expand Down