--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.sonarqube.tests.source;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+public class LineData {
+
+ private static final SimpleDateFormat DATETIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
+
+ final String revision;
+ final Date date;
+ final String author;
+
+ public LineData(String revision, String datetime, String author) throws ParseException {
+ this.revision = revision;
+ this.date = DATETIME_FORMAT.parse(datetime);
+ this.author = author;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return EqualsBuilder.reflectionEquals(this, obj);
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder().append(revision).append(date).append(author).toHashCode();
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE);
+ }
+}
\ No newline at end of file
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.sonarqube.tests.source;
+
+import com.sonar.orchestrator.Orchestrator;
+import com.sonar.orchestrator.build.SonarScanner;
+import java.io.File;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.Map;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.sonarqube.qa.util.Tester;
+
+import static org.apache.commons.io.FileUtils.copyDirectory;
+import static org.apache.commons.io.FileUtils.moveFile;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonarqube.tests.source.SourceSuite.ORCHESTRATOR;
+import static util.ItUtils.projectDir;
+
+public class NoScmTest {
+
+ private final String PROJECT_DIRECTORY = "xoo-sample-without-scm";
+ private final String PROJECT_NAME = "sample-without-scm";
+ private final String PATH_TO_SAMPLE = "src/main/xoo/sample/Sample.xoo";
+ private final String FILE_TO_ANALYSE = PROJECT_NAME + ":" + PATH_TO_SAMPLE;
+ private final String PATH_TO_INACTIVATED_SAMPLE = "src/main/xoo/sample/Sample.xoo.new";
+
+ @ClassRule
+ public static Orchestrator orchestrator = ORCHESTRATOR;
+
+ private SourceScmWS ws = new SourceScmWS(orchestrator);
+
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+ @Rule
+ public Tester tester = new Tester(orchestrator);
+
+ @Test
+ public void two_analysis_without_scm_on_same_file() throws ParseException, IOException {
+
+ File source = disposableWorkspaceFor(PROJECT_DIRECTORY);
+
+ // First run
+ SonarScanner scanner = SonarScanner.create(source);
+
+ orchestrator.executeBuild(scanner);
+ Map<Integer, LineData> scmData1 = ws.getScmData(FILE_TO_ANALYSE);
+
+ assertThat(scmData1.size()).isEqualTo(1);
+ assertThat(scmData1.get(1).revision).isEmpty();
+ assertThat(scmData1.get(1).author).isEmpty();
+ assertThat(scmData1.get(1).date).isInSameMinuteWindowAs(new Date());
+
+ // 2nd run
+ scanner = SonarScanner.create(source);
+
+ orchestrator.executeBuild(scanner);
+ Map<Integer, LineData> scmData2 = ws.getScmData(FILE_TO_ANALYSE);
+
+ assertThat(scmData2.size()).isEqualTo(1);
+ assertThat(scmData2.get(1).revision).isEmpty();
+ assertThat(scmData2.get(1).author).isEmpty();
+ assertThat(scmData2.get(1).date).isEqualTo(scmData1.get(1).date);
+
+ }
+
+ @Test
+ public void two_analysis_without_scm_on_modified_file() throws ParseException, IOException {
+
+ File source = disposableWorkspaceFor(PROJECT_DIRECTORY);
+
+ // First run
+ SonarScanner scanner = SonarScanner.create(source);
+
+ orchestrator.executeBuild(scanner);
+ Map<Integer, LineData> scmData = ws.getScmData(FILE_TO_ANALYSE);
+
+ assertThat(scmData.size()).isEqualTo(1);
+ assertThat(scmData.get(1).revision).isEmpty();
+ assertThat(scmData.get(1).author).isEmpty();
+ assertThat(scmData.get(1).date).isInSameMinuteWindowAs(new Date());
+
+ // Swap analysed fo to a modified one
+ File sample = new File(source, PATH_TO_SAMPLE);
+ sample.delete();
+ moveFile(new File(source, PATH_TO_INACTIVATED_SAMPLE), sample);
+
+ // 2nd run
+ scanner = SonarScanner.create(source);
+
+ orchestrator.executeBuild(scanner);
+ scmData = ws.getScmData(FILE_TO_ANALYSE);
+
+ assertThat(scmData.size()).isEqualTo(4);
+ assertThat(scmData.get(1).revision).isEmpty();
+ assertThat(scmData.get(1).author).isEmpty();
+ assertThat(scmData.get(1).date).isInSameMinuteWindowAs(new Date());
+
+ assertThat(scmData.get(5).revision).isEmpty();
+ assertThat(scmData.get(5).author).isEmpty();
+ assertThat(scmData.get(5).date).isAfter(scmData.get(1).date);
+
+ }
+
+ private File disposableWorkspaceFor(String project) throws IOException {
+ File origin = projectDir("scm/" + project);
+ copyDirectory(origin.getParentFile(), temporaryFolder.getRoot());
+ return new File(temporaryFolder.getRoot(), project);
+ }
+
+}
--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2018 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program 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.
+ *
+ * This program 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.sonarqube.tests.source;
+
+import com.sonar.orchestrator.Orchestrator;
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.Map;
+import org.sonar.wsclient.jsonsimple.JSONArray;
+import org.sonar.wsclient.jsonsimple.JSONObject;
+import org.sonar.wsclient.jsonsimple.JSONValue;
+
+public class SourceScmWS {
+
+ private final Orchestrator orchestrator;
+
+ public SourceScmWS(Orchestrator orchestrator) {
+ this.orchestrator = orchestrator;
+ }
+
+ public Map<Integer, LineData> getScmData(String fileKey) throws ParseException {
+ Map<Integer, LineData> result = new HashMap<>();
+ String json = orchestrator.getServer().adminWsClient().get("api/sources/scm", "key", fileKey);
+ JSONObject obj = (JSONObject) JSONValue.parse(json);
+ JSONArray array = (JSONArray) obj.get("scm");
+ for (Object anArray : array) {
+ JSONArray item = (JSONArray) anArray;
+ String datetime = (String) item.get(2);
+ result.put(((Long) item.get(0)).intValue(), new LineData((String) item.get(3), datetime, (String) item.get(1)));
+ }
+ return result;
+ }
+
+
+}
projects / sonarqube.git / commitdiff