import org.slf4j.LoggerFactory;
import org.sonar.api.CoreProperties;
import org.sonar.api.batch.AnalysisMode;
+import org.sonar.batch.mediumtest.BatchMediumTester;
import java.text.MessageFormat;
LOG.warn(MessageFormat.format("Property {0} is deprecated. Please use {1} instead.", CoreProperties.DRY_RUN, CoreProperties.ANALYSIS_MODE));
preview = "true".equals(bootstrapProps.property(CoreProperties.DRY_RUN));
incremental = false;
- mediumTestMode = false;
} else {
String mode = bootstrapProps.property(CoreProperties.ANALYSIS_MODE);
preview = CoreProperties.ANALYSIS_MODE_PREVIEW.equals(mode);
incremental = CoreProperties.ANALYSIS_MODE_INCREMENTAL.equals(mode);
- mediumTestMode = CoreProperties.ANALYSIS_MODE_MEDIUM_TEST.equals(mode);
}
+ mediumTestMode = "true".equals(bootstrapProps.property(BatchMediumTester.MEDIUM_TEST_ENABLED));
if (incremental) {
LOG.info("Incremental mode");
} else if (preview) {
LOG.info("Preview mode");
- } else if (mediumTestMode) {
+ }
+ if (mediumTestMode) {
LOG.info("Medium test mode");
}
// To stay compatible with plugins that use the old property to check mode
*/
package org.sonar.batch.deprecated;
-import org.sonar.api.batch.sensor.internal.SensorStorage;
-
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonar.api.batch.fs.InputFile;
import org.sonar.api.batch.fs.InputPath;
import org.sonar.api.batch.rule.ActiveRules;
+import org.sonar.api.batch.sensor.internal.SensorStorage;
import org.sonar.api.config.Settings;
import org.sonar.api.design.Dependency;
import org.sonar.api.measures.Measure;
import org.sonar.api.measures.MeasuresFilter;
import org.sonar.api.measures.Metric;
-import org.sonar.api.resources.*;
+import org.sonar.api.resources.Directory;
+import org.sonar.api.resources.File;
+import org.sonar.api.resources.Project;
+import org.sonar.api.resources.ProjectLink;
+import org.sonar.api.resources.Qualifiers;
+import org.sonar.api.resources.Resource;
import org.sonar.api.rules.Violation;
import org.sonar.api.utils.SonarException;
-import org.sonar.batch.index.ComponentDataCache;
import org.sonar.batch.sensor.DefaultSensorContext;
import org.sonar.batch.sensor.coverage.CoverageExclusions;
private final CoverageExclusions coverageFilter;
public DeprecatedSensorContext(SonarIndex index, Project project, Settings settings, FileSystem fs, ActiveRules activeRules,
- AnalysisMode analysisMode, ComponentDataCache componentDataCache, CoverageExclusions coverageFilter,
+ AnalysisMode analysisMode, CoverageExclusions coverageFilter,
SensorStorage sensorStorage) {
- super(settings, fs, activeRules, analysisMode, componentDataCache, sensorStorage);
+ super(settings, fs, activeRules, analysisMode, sensorStorage);
this.index = index;
this.project = project;
this.coverageFilter = coverageFilter;
--- /dev/null
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+@ParametersAreNonnullByDefault
+package org.sonar.batch.deprecated.decorator;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+++ /dev/null
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * SonarQube is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * SonarQube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.batch.duplication;
-
-import com.persistit.Value;
-import com.persistit.encoding.CoderContext;
-import com.persistit.encoding.ValueCoder;
-import org.sonar.duplications.block.Block;
-import org.sonar.duplications.block.ByteArray;
-import org.sonar.duplications.block.FileBlocks;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class FileBlocksValueCoder implements ValueCoder {
-
- @Override
- public void put(Value value, Object object, CoderContext context) {
- FileBlocks blocks = (FileBlocks) object;
- value.putUTF(blocks.resourceId());
- value.put(blocks.blocks().size());
- for (Block b : blocks.blocks()) {
- value.putByteArray(b.getBlockHash().getBytes());
- value.put(b.getIndexInFile());
- value.put(b.getStartLine());
- value.put(b.getEndLine());
- value.put(b.getStartUnit());
- value.put(b.getEndUnit());
- }
- }
-
- @Override
- public Object get(Value value, Class clazz, CoderContext context) {
- String resourceId = value.getString();
- int count = value.getInt();
- List<Block> blocks = new ArrayList<Block>(count);
- for (int i = 0; i < count; i++) {
- Block.Builder b = Block.builder();
- b.setResourceId(resourceId);
- b.setBlockHash(new ByteArray(value.getByteArray()));
- b.setIndexInFile(value.getInt());
- int startLine = value.getInt();
- int endLine = value.getInt();
- b.setLines(startLine, endLine);
- int startUnit = value.getInt();
- int endUnit = value.getInt();
- b.setUnit(startUnit, endUnit);
- blocks.add(b.build());
- }
- return new FileBlocks(resourceId, blocks);
- }
-}
*/
public class BatchMediumTester {
+ public static final String MEDIUM_TEST_ENABLED = "sonar.mediumTest.enabled";
private Batch batch;
public static BatchMediumTesterBuilder builder() {
BatchMediumTesterBuilder builder = new BatchMediumTesterBuilder().registerCoreMetrics();
- builder.bootstrapProperties.put(CoreProperties.ANALYSIS_MODE, CoreProperties.ANALYSIS_MODE_MEDIUM_TEST);
+ builder.bootstrapProperties.put(MEDIUM_TEST_ENABLED, "true");
builder.bootstrapProperties.put(CoreProperties.WORKING_DIRECTORY, Files.createTempDir().getAbsolutePath());
return builder;
}
return this;
}
+ public BatchMediumTesterBuilder setPreviousAnalysisDate(Date previousAnalysis) {
+ projectRefProvider.ref.setLastAnalysisDate(previousAnalysis);
+ return this;
+ }
+
public BatchMediumTesterBuilder bootstrapProperties(Map<String, String> props) {
bootstrapProperties.putAll(props);
return this;
if (line != null) {
builder.setLine(line);
}
- builder.setMsg(issue.message());
+ String message = issue.message();
+ if (message != null) {
+ builder.setMsg(message);
+ }
if (issue.effortToFix() != null) {
builder.setEffortToFix(issue.effortToFix());
}
private static class FileHashComputer extends CharHandler {
private MessageDigest globalMd5Digest = DigestUtils.getMd5Digest();
- private StringBuffer sb = new StringBuffer();
+ private StringBuilder sb = new StringBuilder();
@Override
void handleIgnoreEoL(char c) {
import org.sonar.api.batch.sensor.measure.NewMeasure;
import org.sonar.api.batch.sensor.measure.internal.DefaultMeasure;
import org.sonar.api.config.Settings;
-import org.sonar.batch.index.ComponentDataCache;
import java.io.Serializable;
private final Settings settings;
private final FileSystem fs;
private final ActiveRules activeRules;
- private final ComponentDataCache componentDataCache;
private final SensorStorage sensorStorage;
private final AnalysisMode analysisMode;
- public DefaultSensorContext(Settings settings, FileSystem fs, ActiveRules activeRules, AnalysisMode analysisMode, ComponentDataCache componentDataCache,
- SensorStorage sensorStorage) {
+ public DefaultSensorContext(Settings settings, FileSystem fs, ActiveRules activeRules, AnalysisMode analysisMode, SensorStorage sensorStorage) {
this.settings = settings;
this.fs = fs;
this.activeRules = activeRules;
this.analysisMode = analysisMode;
- this.componentDataCache = componentDataCache;
this.sensorStorage = sensorStorage;
}
@Override
public int compare(Integer left, Integer right) {
int result;
- if (left != null & right != null) {
+ if (left != null && right != null) {
result = left - right;
} else {
result = left == null ? -1 : 1;
--- /dev/null
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.sonar.batch.mediumtest.preview;
+
+import com.google.common.collect.ImmutableMap;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.sonar.api.CoreProperties;
+import org.sonar.api.issue.Issue;
+import org.sonar.batch.mediumtest.BatchMediumTester;
+import org.sonar.batch.mediumtest.TaskResult;
+import org.sonar.batch.protocol.input.ActiveRule;
+import org.sonar.batch.protocol.input.issues.PreviousIssue;
+import org.sonar.xoo.XooPlugin;
+
+import java.io.File;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class PreviewAndReportsMediumTest {
+
+ @org.junit.Rule
+ public TemporaryFolder temp = new TemporaryFolder();
+
+ private static SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+
+ private static Date date(String date) {
+ try {
+ return sdf.parse(date);
+ } catch (ParseException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+
+ public BatchMediumTester tester = BatchMediumTester.builder()
+ .bootstrapProperties(ImmutableMap.of(CoreProperties.ANALYSIS_MODE, CoreProperties.ANALYSIS_MODE_PREVIEW))
+ .registerPlugin("xoo", new XooPlugin())
+ .addDefaultQProfile("xoo", "Sonar Way")
+ .activateRule(new ActiveRule("xoo", "OneIssuePerLine", null, "One issue per line", "MAJOR", null, "xoo"))
+ .activateRule(new ActiveRule("manual", "MyManualIssue", null, "My manual issue", "MAJOR", null, null))
+ .setPreviousAnalysisDate(new Date())
+ // Existing issue
+ .addPreviousIssue(new PreviousIssue().setKey("xyz")
+ .setComponentKey("sample:xources/hello/HelloJava.xoo")
+ .setRuleKey("xoo", "OneIssuePerLine")
+ .setLine(1)
+ .setSeverity("MAJOR")
+ .setCreationDate(date("14/03/2004"))
+ .setChecksum(DigestUtils.md5Hex("packagehello;"))
+ .setStatus("OPEN"))
+ // Resolved issue
+ .addPreviousIssue(new PreviousIssue().setKey("resolved")
+ .setComponentKey("sample:xources/hello/HelloJava.xoo")
+ .setRuleKey("xoo", "OneIssuePerLine")
+ .setLine(1)
+ .setSeverity("MAJOR")
+ .setCreationDate(date("14/03/2004"))
+ .setChecksum(DigestUtils.md5Hex("dontexist"))
+ .setStatus("OPEN"))
+ // Manual issue
+ .addPreviousIssue(new PreviousIssue().setKey("manual")
+ .setComponentKey("sample:xources/hello/HelloJava.xoo")
+ .setRuleKey("manual", "MyManualIssue")
+ .setLine(1)
+ .setSeverity("MAJOR")
+ .setCreationDate(date("14/03/2004"))
+ .setChecksum(DigestUtils.md5Hex("packagehello;"))
+ .setStatus("OPEN"))
+ .build();
+
+ @Before
+ public void prepare() {
+ tester.start();
+ }
+
+ @After
+ public void stop() {
+ tester.stop();
+ }
+
+ @Test
+ public void testIssueTracking() throws Exception {
+ File projectDir = new File(PreviewAndReportsMediumTest.class.getResource("/mediumtest/xoo/sample").toURI());
+
+ TaskResult result = tester
+ .newScanTask(new File(projectDir, "sonar-project.properties"))
+ .start();
+
+ int newIssues = 0;
+ int openIssues = 0;
+ int resolvedIssue = 0;
+ for (Issue issue : result.issues()) {
+ if (issue.isNew()) {
+ newIssues++;
+ } else if (issue.resolution() != null) {
+ resolvedIssue++;
+ } else {
+ openIssues++;
+ }
+ }
+ assertThat(newIssues).isEqualTo(13);
+ assertThat(openIssues).isEqualTo(2);
+ assertThat(resolvedIssue).isEqualTo(1);
+ }
+
+ @Test
+ public void testConsoleReport() throws Exception {
+ File projectDir = new File(PreviewAndReportsMediumTest.class.getResource("/mediumtest/xoo/sample").toURI());
+
+ TaskResult result = tester
+ .newScanTask(new File(projectDir, "sonar-project.properties"))
+ .property("sonar.issuesReport.console.enable", "true")
+ .start();
+
+ // TODO wait for ability to assert on logs
+ }
+
+ @Test
+ public void testHtmlReport() throws Exception {
+ File projectDir = new File(PreviewAndReportsMediumTest.class.getResource("/mediumtest/xoo/sample").toURI());
+
+ TaskResult result = tester
+ .newScanTask(new File(projectDir, "sonar-project.properties"))
+ .property("sonar.issuesReport.html.enable", "true")
+ .start();
+
+ assertThat(new File(projectDir, ".sonar/issues-report/issues-report.html")).exists();
+ assertThat(new File(projectDir, ".sonar/issues-report/issues-report-light.html")).exists();
+ }
+
+}
+++ /dev/null
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * SonarQube is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * SonarQube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.sonar.batch.mediumtest.preview;
-
-import com.google.common.collect.ImmutableMap;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.sonar.api.CoreProperties;
-import org.sonar.batch.mediumtest.BatchMediumTester;
-import org.sonar.batch.mediumtest.TaskResult;
-import org.sonar.batch.protocol.input.ActiveRule;
-import org.sonar.batch.protocol.input.issues.PreviousIssue;
-import org.sonar.xoo.XooPlugin;
-
-import java.io.File;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class ReportsMediumTest {
-
- @org.junit.Rule
- public TemporaryFolder temp = new TemporaryFolder();
-
- private static SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
-
- private static Date date(String date) {
- try {
- return sdf.parse(date);
- } catch (ParseException e) {
- throw new IllegalStateException(e);
- }
- }
-
- public BatchMediumTester tester = BatchMediumTester.builder()
- .bootstrapProperties(ImmutableMap.of(CoreProperties.ANALYSIS_MODE, CoreProperties.ANALYSIS_MODE_PREVIEW))
- .registerPlugin("xoo", new XooPlugin())
- .addDefaultQProfile("xoo", "Sonar Way")
- .activateRule(new ActiveRule("xoo", "OneIssuePerLine", null, "One issue per line", "MAJOR", "OneIssuePerLine.internal", "xoo"))
- // Existing issue
- .addPreviousIssue(new PreviousIssue().setKey("xyz")
- .setComponentKey("sample:xources/hello/HelloJava.xoo")
- .setRuleKey("xoo", "OneIssuePerLine")
- .setLine(1)
- .setSeverity("MAJOR")
- .setCreationDate(date("14/03/2004"))
- .setChecksum(DigestUtils.md5Hex("packagehello;"))
- .setStatus("OPEN"))
- // Resolved issue
- .addPreviousIssue(new PreviousIssue().setKey("resolved")
- .setComponentKey("sample:xources/hello/HelloJava.xoo")
- .setRuleKey("xoo", "OneIssuePerLine")
- .setLine(1)
- .setSeverity("MAJOR")
- .setCreationDate(date("14/03/2004"))
- .setChecksum(DigestUtils.md5Hex("dontexist"))
- .setStatus("OPEN"))
- .build();
-
- @Before
- public void prepare() {
- tester.start();
- }
-
- @After
- public void stop() {
- tester.stop();
- }
-
- @Test
- public void testConsoleReport() throws Exception {
- File projectDir = new File(ReportsMediumTest.class.getResource("/mediumtest/xoo/sample").toURI());
-
- TaskResult result = tester
- .newScanTask(new File(projectDir, "sonar-project.properties"))
- .property("sonar.issuesReport.console.enable", "true")
- .start();
-
- }
-
- @Test
- public void testHtmlReport() throws Exception {
- File projectDir = new File(ReportsMediumTest.class.getResource("/mediumtest/xoo/sample").toURI());
-
- TaskResult result = tester
- .newScanTask(new File(projectDir, "sonar-project.properties"))
- .property("sonar.issuesReport.html.enable", "true")
- .start();
-
- }
-
-}
*/
package org.sonar.batch.sensor;
-import org.sonar.api.batch.sensor.internal.SensorStorage;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.sonar.api.batch.measure.MetricFinder;
import org.sonar.api.batch.rule.ActiveRules;
import org.sonar.api.batch.rule.internal.ActiveRulesBuilder;
+import org.sonar.api.batch.sensor.internal.SensorStorage;
import org.sonar.api.config.Settings;
import org.sonar.api.measures.CoreMetrics;
-import org.sonar.batch.index.ComponentDataCache;
+
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
when(metricFinder.findByKey(CoreMetrics.NCLOC_KEY)).thenReturn(CoreMetrics.NCLOC);
when(metricFinder.findByKey(CoreMetrics.FUNCTION_COMPLEXITY_DISTRIBUTION_KEY)).thenReturn(CoreMetrics.FUNCTION_COMPLEXITY_DISTRIBUTION);
settings = new Settings();
- ComponentDataCache componentDataCache = mock(ComponentDataCache.class);
sensorStorage = mock(SensorStorage.class);
analysisMode = mock(AnalysisMode.class);
- adaptor = new DefaultSensorContext(settings, fs, activeRules, analysisMode, componentDataCache, sensorStorage);
+ adaptor = new DefaultSensorContext(settings, fs, activeRules, analysisMode, sensorStorage);
}
@Test
*/
String ANALYSIS_MODE_INCREMENTAL = "incremental";
- /**
- * @since 5.1
- */
- String ANALYSIS_MODE_MEDIUM_TEST = "mediumtest";
-
/**
* @since 4.0
*/
/**
* @deprecated since 5.1 Sensors should not read but only save data
*/
+ @Deprecated
<G extends Serializable> Measure<G> getMeasure(Metric<G> metric);
/**
* @deprecated since 5.1 Sensors should not read but only save data
*/
+ @Deprecated
<M> M getMeasures(MeasuresFilter<M> filter);
/**
/**
* @deprecated since 5.1 Sensors should not read but only save data
*/
+ @Deprecated
<G extends Serializable> Measure<G> getMeasure(Resource resource, Metric<G> metric);
/**
/**
* @deprecated since 5.1 Sensors should not read but only save data
*/
+ @Deprecated
<M> M getMeasures(Resource resource, MeasuresFilter<M> filter);
/**
/**
* @deprecated since 5.1 Sensors should not read but only save data
*/
+ @Deprecated
Set<Dependency> getDependencies();
/**
* @deprecated since 5.1 Sensors should not read but only save data
*/
+ @Deprecated
Collection<Dependency> getIncomingDependencies(Resource to);
/**
* @deprecated since 5.1 Sensors should not read but only save data
*/
+ @Deprecated
Collection<Dependency> getOutgoingDependencies(Resource from);
// ----------- FILE SOURCES --------------
}
inputFile.setModuleBaseDir(this.baseDir);
cache.add(inputFile);
- if (inputFile.language() != null) {
- languages.add(inputFile.language());
+ String language = inputFile.language();
+ if (language != null) {
+ languages.add(language);
}
return this;
}
import org.sonar.api.utils.PathUtils;
import java.io.File;
-import java.io.Serializable;
import java.nio.file.Path;
/**
* @since 4.5
*/
-public class DefaultInputDir implements InputDir, Serializable {
+public class DefaultInputDir implements InputDir {
private final String relativePath;
private final String moduleKey;
import javax.annotation.Nullable;
import java.io.File;
-import java.io.Serializable;
import java.nio.charset.Charset;
import java.nio.file.Path;
/**
* @since 4.2
*/
-public class DefaultInputFile implements InputFile, Serializable {
+public class DefaultInputFile implements InputFile {
private final String relativePath;
private final String moduleKey;
projects / sonarqube.git / commitdiff