From 12ccd9132e30df9e91e42369dd4af0ee7b2b590d Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Thu, 19 Mar 2015 22:43:47 +0100 Subject: [PATCH] Fix coupling of some db tests with local timezone --- .../org/sonar/server/issue/IssueService.java | 29 ++----- .../server/component/db/SnapshotDaoTest.java | 12 +-- .../computation/db/AnalysisReportDaoTest.java | 12 ++- .../server/issue/IssueServiceMediumTest.java | 31 ------- .../server/issue/ServerIssueStorageTest.java | 4 +- .../sonar/server/issue/db/IssueDaoTest.java | 11 ++- .../db/SnapshotDaoTest/insert-result.xml | 12 +-- .../AnalysisReportDaoTest/insert-result.xml | 8 +- .../one_analysis_report.xml | 8 +- .../update-all-to-status-pending-result.xml | 6 +- .../should_insert_new_issues-result.xml | 6 +- .../should_update_issues-result.xml | 6 +- .../issue/db/IssueDaoTest/insert-result.xml | 6 +- .../org/sonar/core/issue/db/IssueDao.java | 16 ---- .../org/sonar/core/issue/db/IssueMapper.java | 9 --- .../org/sonar/core/issue/db/IssueMapper.xml | 27 ------- .../core/issue/db/IssueChangeDaoTest.java | 8 +- .../core/issue/db/IssueChangeMapperTest.java | 13 ++- .../org/sonar/core/issue/db/IssueDaoTest.java | 19 ----- .../sonar/core/issue/db/IssueMapperTest.java | 30 +++---- .../sonar/core/issue/db/IssueStorageTest.java | 10 +-- .../sonar/core/resource/ResourceDaoTest.java | 10 +-- .../db/IssueChangeDaoTest/insert-result.xml | 6 +- .../db/IssueChangeDaoTest/update-result.xml | 2 +- .../insert_comment-result.xml | 4 +- .../insert_diff-result.xml | 6 +- .../IssueDaoTest/find_rules_by_component.xml | 80 ------------------- .../db/IssueMapperTest/testInsert-result.xml | 6 +- .../db/IssueMapperTest/testUpdate-result.xml | 6 +- .../issue/db/IssueMapperTest/testUpdate.xml | 9 +-- .../should_insert_new_issues-result.xml | 6 +- .../should_resolve_conflicts_on_updates.xml | 2 +- .../should_update_issues-result.xml | 6 +- .../ResourceDaoTest/insert-result.xml | 4 +- 34 files changed, 111 insertions(+), 319 deletions(-) delete mode 100644 sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/find_rules_by_component.xml diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java index b434afc2dca..d6c8f06dd75 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java @@ -21,8 +21,6 @@ package org.sonar.server.issue; import com.google.common.base.Objects; import com.google.common.base.Strings; -import com.google.common.collect.HashMultiset; -import com.google.common.collect.Multiset; import org.apache.commons.lang.StringUtils; import org.sonar.api.ServerComponent; import org.sonar.api.issue.ActionPlan; @@ -46,7 +44,6 @@ import org.sonar.core.issue.db.IssueStorage; import org.sonar.core.issue.workflow.IssueWorkflow; import org.sonar.core.issue.workflow.Transition; import org.sonar.core.persistence.DbSession; -import org.sonar.core.rule.RuleDto; import org.sonar.server.db.DbClient; import org.sonar.server.es.SearchOptions; import org.sonar.server.es.SearchResult; @@ -63,8 +60,12 @@ import org.sonar.server.user.index.UserIndex; import javax.annotation.CheckForNull; import javax.annotation.Nullable; - -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Map; public class IssueService implements ServerComponent { @@ -279,24 +280,6 @@ public class IssueService implements ServerComponent { } } - // TODO result should be replaced by an aggregation object in IssueIndex - public RulesAggregation findRulesByComponent(String componentKey, @Nullable Date periodDate, DbSession session) { - RulesAggregation rulesAggregation = new RulesAggregation(); - for (RuleDto ruleDto : deprecatedIssueDao.findRulesByComponent(componentKey, periodDate, session)) { - rulesAggregation.add(ruleDto); - } - return rulesAggregation; - } - - // TODO result should be replaced by an aggregation object in IssueIndex - public Multiset findSeveritiesByComponent(String componentKey, @Nullable Date periodDate, DbSession session) { - Multiset aggregation = HashMultiset.create(); - for (String severity : deprecatedIssueDao.findSeveritiesByComponent(componentKey, periodDate, session)) { - aggregation.add(severity); - } - return aggregation; - } - public Issue getByKey(String key) { return issueIndex.getByKey(key); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/db/SnapshotDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/db/SnapshotDaoTest.java index 443ad6d6a79..94f8c1ca48b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/db/SnapshotDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/db/SnapshotDaoTest.java @@ -271,11 +271,11 @@ public class SnapshotDaoTest extends AbstractDaoTestCase { .setPeriodParam(3, "32") .setPeriodParam(4, "33") .setPeriodParam(5, "34") - .setPeriodDate(1, DateUtils.parseDate("2011-09-24").getTime()) - .setPeriodDate(2, DateUtils.parseDate("2011-09-25").getTime()) - .setPeriodDate(3, DateUtils.parseDate("2011-09-26").getTime()) - .setPeriodDate(4, DateUtils.parseDate("2011-09-27").getTime()) - .setPeriodDate(5, DateUtils.parseDate("2011-09-28").getTime()) - .setBuildDate(DateUtils.parseDate("2011-09-29").getTime()); + .setPeriodDate(1, 1_500_000_000_001L) + .setPeriodDate(2, 1_500_000_000_002L) + .setPeriodDate(3, 1_500_000_000_003L) + .setPeriodDate(4, 1_500_000_000_004L) + .setPeriodDate(5, 1_500_000_000_005L) + .setBuildDate(1_500_000_000_006L); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/db/AnalysisReportDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/db/AnalysisReportDaoTest.java index bf4456f66ab..2b34564c7b1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/db/AnalysisReportDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/db/AnalysisReportDaoTest.java @@ -39,7 +39,6 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.sonar.api.utils.DateUtils.parseDate; import static org.sonar.core.computation.db.AnalysisReportDto.Status.PENDING; import static org.sonar.core.computation.db.AnalysisReportDto.Status.WORKING; @@ -64,8 +63,7 @@ public class AnalysisReportDaoTest { this.system2 = mock(System2.class); this.sut = new AnalysisReportDao(system2); - when(system2.now()).thenReturn(parseDate("2014-09-26").getTime()); - when(system2.newDate()).thenReturn(parseDate("2014-09-26")); + when(system2.now()).thenReturn(1_500_000_000_000L); } @After @@ -156,10 +154,10 @@ public class AnalysisReportDaoTest { AnalysisReportDto report = sut.selectById(session, 1L); assertThat(report.getProjectKey()).isEqualTo(DEFAULT_PROJECT_KEY); - assertThat(report.getCreatedAt()).isEqualTo(parseDate("2014-09-24").getTime()); - assertThat(report.getUpdatedAt()).isEqualTo(parseDate("2014-09-25").getTime()); - assertThat(report.getStartedAt()).isEqualTo(parseDate("2014-09-26").getTime()); - assertThat(report.getFinishedAt()).isEqualTo(parseDate("2014-09-27").getTime()); + assertThat(report.getCreatedAt()).isEqualTo(1_500_000_000_001L); + assertThat(report.getUpdatedAt()).isEqualTo(1_500_000_000_002L); + assertThat(report.getStartedAt()).isEqualTo(1_500_000_000_003L); + assertThat(report.getFinishedAt()).isEqualTo(1_500_000_000_004L); assertThat(report.getStatus()).isEqualTo(WORKING); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java index 8f9f5730607..911581eec05 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueServiceMediumTest.java @@ -21,7 +21,6 @@ package org.sonar.server.issue; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterators; -import com.google.common.collect.Multiset; import com.google.common.collect.Sets; import org.junit.After; import org.junit.Before; @@ -456,36 +455,6 @@ public class IssueServiceMediumTest { service.createManualIssue(file.key(), rule.getKey(), 10, "Fix it", null, 2d); } - @Test - public void find_rules_by_component() throws Exception { - RuleDto rule = newRule(); - ComponentDto project = newProject(); - ComponentDto file = newFile(project); - - // 2 issues on the same rule - saveIssue(IssueTesting.newDto(rule, file, project)); - saveIssue(IssueTesting.newDto(rule, file, project)); - - RulesAggregation result = service.findRulesByComponent(file.key(), null, session); - assertThat(result.rules()).hasSize(1); - } - - @Test - public void find_rules_by_severity() throws Exception { - RuleDto rule = newRule(); - ComponentDto project = newProject(); - ComponentDto file = newFile(project); - - saveIssue(IssueTesting.newDto(rule, file, project).setSeverity(Severity.MAJOR)); - saveIssue(IssueTesting.newDto(rule, file, project).setSeverity(Severity.MAJOR)); - saveIssue(IssueTesting.newDto(rule, file, project).setSeverity(Severity.INFO)); - - Multiset result = service.findSeveritiesByComponent(file.key(), null, session); - assertThat(result.count("MAJOR")).isEqualTo(2); - assertThat(result.count("INFO")).isEqualTo(1); - assertThat(result.count("UNKNOWN")).isEqualTo(0); - } - @Test public void search_issues() { RuleDto rule = newRule(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java index f4a9f6372f4..afca99bb5f4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ServerIssueStorageTest.java @@ -101,7 +101,7 @@ public class ServerIssueStorageTest extends AbstractDaoTestCase { // override generated key comment.setKey("FGHIJ"); - Date date = DateUtils.parseDate("2013-05-18"); + Date date = DateUtils.parseDateTime("2013-05-18T12:00:00+0000"); DefaultIssue issue = new DefaultIssue() .setKey("ABCDE") .setNew(true) @@ -137,7 +137,7 @@ public class ServerIssueStorageTest extends AbstractDaoTestCase { // override generated key comment.setKey("FGHIJ"); - Date date = DateUtils.parseDate("2013-05-18"); + Date date = DateUtils.parseDateTime("2013-05-18T12:00:00+0000"); DefaultIssue issue = new DefaultIssue() .setKey("ABCDE") .setNew(false) diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueDaoTest.java index 74a54905655..7a6f9a6f0e2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/db/IssueDaoTest.java @@ -23,7 +23,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.sonar.api.rule.RuleKey; -import org.sonar.api.utils.DateUtils; import org.sonar.core.component.ComponentDto; import org.sonar.core.issue.db.IssueDto; import org.sonar.core.persistence.AbstractDaoTestCase; @@ -151,11 +150,11 @@ public class IssueDaoTest extends AbstractDaoTestCase { dto.setChecksum("123456789"); dto.setMessage("the message"); - dto.setIssueCreationDate(DateUtils.parseDate("2013-05-18")); - dto.setIssueUpdateDate(DateUtils.parseDate("2013-05-19")); - dto.setIssueCloseDate(DateUtils.parseDate("2013-05-20")); - dto.setCreatedAt(1400000000000L); - dto.setUpdatedAt(1450000000000L); + dto.setIssueCreationTime(1_500_000_000_000L); + dto.setIssueUpdateTime(1_500_000_000_001L); + dto.setIssueCloseTime(1_500_000_000_002L); + dto.setCreatedAt(1_400_000_000_000L); + dto.setUpdatedAt(1_450_000_000_000L); sut.insert(session, dto); session.commit(); diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/db/SnapshotDaoTest/insert-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/db/SnapshotDaoTest/insert-result.xml index 094c6be6cb4..a138d68b188 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/component/db/SnapshotDaoTest/insert-result.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/component/db/SnapshotDaoTest/insert-result.xml @@ -2,12 +2,12 @@ diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/db/AnalysisReportDaoTest/insert-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/db/AnalysisReportDaoTest/insert-result.xml index bc6bbc5b63e..4fd579504fe 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/computation/db/AnalysisReportDaoTest/insert-result.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/db/AnalysisReportDaoTest/insert-result.xml @@ -7,8 +7,8 @@ report_status="PENDING" started_at="[null]" finished_at="[null]" - created_at="1411682400000" - updated_at="1411682400000" + created_at="1500000000000" + updated_at="1500000000000" /> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/db/AnalysisReportDaoTest/one_analysis_report.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/db/AnalysisReportDaoTest/one_analysis_report.xml index a4e07b73029..c38ac125e00 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/computation/db/AnalysisReportDaoTest/one_analysis_report.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/db/AnalysisReportDaoTest/one_analysis_report.xml @@ -4,9 +4,9 @@ project_key="123456789-987654321" uuid="REPORT_1" report_status="WORKING" - created_at="1411509600000" - updated_at="1411596000000" - started_at="1411682400000" - finished_at="1411768800000" + created_at="1500000000001" + updated_at="1500000000002" + started_at="1500000000003" + finished_at="1500000000004" /> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/db/AnalysisReportDaoTest/update-all-to-status-pending-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/db/AnalysisReportDaoTest/update-all-to-status-pending-result.xml index 2c240ea4bc4..16fb8dc0895 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/computation/db/AnalysisReportDaoTest/update-all-to-status-pending-result.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/db/AnalysisReportDaoTest/update-all-to-status-pending-result.xml @@ -7,7 +7,7 @@ uuid="UUID_1" report_status="PENDING" created_at="1411509600000" - updated_at="1411682400000" + updated_at="1500000000000" started_at="[null]" finished_at="[null]" /> @@ -18,7 +18,7 @@ uuid="UUID_2" report_status="PENDING" created_at="1411596000000" - updated_at="1411682400000" + updated_at="1500000000000" started_at="[null]" finished_at="[null]" /> @@ -29,7 +29,7 @@ uuid="UUID_3" report_status="PENDING" created_at="1411682400000" - updated_at="1411682400000" + updated_at="1500000000000" started_at="[null]" finished_at="[null]" /> diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml index 40fc2fb5a22..b63e969de7f 100644 --- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml +++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ServerIssueStorageTest/should_insert_new_issues-result.xml @@ -16,9 +16,9 @@ issue_attributes="foo=bar" tags="[null]" action_plan_key="[null]" - issue_creation_date="1368828000000" - issue_update_date="1368828000000" - issue_close_date="1368828000000" + issue_creation_date="1368878400000" + issue_update_date="1368878400000" + issue_close_date="1368878400000" /> findRulesByComponent(String componentKey, @Nullable Date createdAtOrAfter, DbSession session) { - return mapper(session).findRulesByComponent(componentKey, dateToLong(createdAtOrAfter)); - } - - // TODO replace by aggregation in IssueIndex - public List findSeveritiesByComponent(String componentKey, @Nullable Date createdAtOrAfter, DbSession session) { - return mapper(session).findSeveritiesByComponent(componentKey, dateToLong(createdAtOrAfter)); - } - protected IssueMapper mapper(DbSession session) { return session.getMapper(IssueMapper.class); } diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java index 59e6e4b10c3..569fa659449 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueMapper.java @@ -19,11 +19,6 @@ */ package org.sonar.core.issue.db; -import org.apache.ibatis.annotations.Param; -import org.sonar.core.rule.RuleDto; - -import javax.annotation.Nullable; - import java.util.List; public interface IssueMapper { @@ -34,10 +29,6 @@ public interface IssueMapper { List selectByActionPlan(String actionPlan); - List findRulesByComponent(@Param("componentKey") String componentKey, @Nullable @Param("createdAt") Long createdAtOrAfter); - - List findSeveritiesByComponent(@Param("componentKey") String componentKey, @Nullable @Param("createdAt") Long createdAtOrAfter); - void insert(IssueDto issue); int update(IssueDto issue); diff --git a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml index 8c86c34f8f3..b15e9ec8ef4 100644 --- a/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/issue/db/IssueMapper.xml @@ -212,32 +212,5 @@ - - - - diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeDaoTest.java index b6c047e795d..c6d5d6219bf 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeDaoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeDaoTest.java @@ -191,9 +191,9 @@ public class IssueChangeDaoTest extends AbstractDaoTestCase { .setChangeData("Some text") .setChangeType("comment") .setIssueKey("ABCDE") - .setCreatedAt(DateUtils.parseDate("2014-09-09").getTime()) - .setUpdatedAt(DateUtils.parseDate("2014-09-10").getTime()) - .setIssueChangeCreationDate(DateUtils.parseDate("2014-09-11").getTime()); + .setCreatedAt(1_500_000_000_000L) + .setUpdatedAt(1_501_000_000_000L) + .setIssueChangeCreationDate(1_502_000_000_000L); dao.insert(session, changeDto); session.commit(); @@ -210,7 +210,7 @@ public class IssueChangeDaoTest extends AbstractDaoTestCase { // Only the following fields can be updated: change.setChangeData("new comment"); - change.setUpdatedAt(DateUtils.parseDate("2013-06-30").getTime()); + change.setUpdatedAt(1_500_000_000_000L); assertThat(dao.update(change)).isTrue(); diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeMapperTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeMapperTest.java index 6c428e4a901..070cd2641d8 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeMapperTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueChangeMapperTest.java @@ -23,7 +23,6 @@ import org.apache.ibatis.session.SqlSession; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.sonar.api.utils.DateUtils; import org.sonar.core.persistence.AbstractDaoTestCase; import org.sonar.core.persistence.MyBatis; @@ -50,10 +49,9 @@ public class IssueChangeMapperTest extends AbstractDaoTestCase { dto.setIssueKey("ABCDE"); dto.setChangeType(IssueChangeDto.TYPE_FIELD_CHANGE); dto.setChangeData("severity=INFO|BLOCKER"); - long d = DateUtils.parseDate("2013-05-18").getTime(); - dto.setCreatedAt(d); - dto.setUpdatedAt(d); - dto.setIssueChangeCreationDate(d); + dto.setCreatedAt(1_500_000_000_000L); + dto.setUpdatedAt(1_500_000_000_000L); + dto.setIssueChangeCreationDate(1_500_000_000_000L); mapper.insert(dto); session.commit(); @@ -68,9 +66,8 @@ public class IssueChangeMapperTest extends AbstractDaoTestCase { dto.setIssueKey("ABCDE"); dto.setChangeType(IssueChangeDto.TYPE_COMMENT); dto.setChangeData("the comment"); - long d = DateUtils.parseDate("2013-05-18").getTime(); - dto.setCreatedAt(d); - dto.setUpdatedAt(d); + dto.setCreatedAt(1_500_000_000_000L); + dto.setUpdatedAt(1_500_000_000_000L); mapper.insert(dto); session.commit(); diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java index 785b52b7e67..d8495ccb6d2 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueDaoTest.java @@ -24,8 +24,6 @@ import org.apache.ibatis.executor.result.DefaultResultHandler; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.sonar.api.rule.Severity; -import org.sonar.api.utils.DateUtils; import org.sonar.core.persistence.AbstractDaoTestCase; import org.sonar.core.persistence.DbSession; @@ -128,21 +126,4 @@ public class IssueDaoTest extends AbstractDaoTestCase { assertThat(issue.getComponentKey()).isNotNull(); assertThat(issue.getProjectKey()).isNull(); } - - @Test - public void find_rules_by_component() { - setupData("shared", "find_rules_by_component"); - - assertThat(dao.findRulesByComponent("Action.java", null, session)).hasSize(3); - assertThat(dao.findRulesByComponent("Action.java", DateUtils.parseDate("2013-04-17"), session)).hasSize(2); - } - - @Test - public void find_severities_by_component() { - setupData("shared", "find_severities_by_component"); - - assertThat(dao.findSeveritiesByComponent("Action.java", null, session)).containsExactly(Severity.BLOCKER, Severity.MAJOR, Severity.BLOCKER); - assertThat(dao.findSeveritiesByComponent("Action.java", DateUtils.parseDate("2013-04-17"), session)).containsExactly(Severity.MAJOR); - } - } diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java index b09958301cf..d9561829aa7 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueMapperTest.java @@ -66,11 +66,11 @@ public class IssueMapperTest extends AbstractDaoTestCase { dto.setChecksum("123456789"); dto.setMessage("the message"); - dto.setIssueCreationDate(DateUtils.parseDate("2013-05-18")); - dto.setIssueUpdateDate(DateUtils.parseDate("2013-05-19")); - dto.setIssueCloseDate(DateUtils.parseDate("2013-05-20")); - dto.setCreatedAt(1400000000000L); - dto.setUpdatedAt(1500000000000L); + dto.setIssueCreationTime(1_401_000_000_000L); + dto.setIssueUpdateTime(1_402_000_000_000L); + dto.setIssueCloseTime(1_403_000_000_000L); + dto.setCreatedAt(1_400_000_000_000L); + dto.setUpdatedAt(1_500_000_000_000L); mapper.insert(dto); session.commit(); @@ -101,11 +101,11 @@ public class IssueMapperTest extends AbstractDaoTestCase { dto.setChecksum("123456789"); dto.setMessage("the message"); - dto.setIssueCreationDate(DateUtils.parseDate("2013-05-18")); - dto.setIssueUpdateDate(DateUtils.parseDate("2013-05-19")); - dto.setIssueCloseDate(DateUtils.parseDate("2013-05-20")); - dto.setCreatedAt(1400000000000L); - dto.setUpdatedAt(1500000000000L); + dto.setIssueCreationTime(1_401_000_000_000L); + dto.setIssueUpdateTime(1_402_000_000_000L); + dto.setIssueCloseTime(1_403_000_000_000L); + dto.setCreatedAt(1_400_000_000_000L); + dto.setUpdatedAt(1_500_000_000_000L); mapper.update(dto); session.commit(); @@ -135,11 +135,11 @@ public class IssueMapperTest extends AbstractDaoTestCase { dto.setIssueAttributes("JIRA=FOO-1234"); dto.setChecksum("123456789"); dto.setMessage("the message"); - dto.setIssueCreationDate(DateUtils.parseDate("2013-05-18")); - dto.setIssueUpdateDate(DateUtils.parseDate("2013-05-19")); - dto.setIssueCloseDate(DateUtils.parseDate("2013-05-20")); - dto.setCreatedAt(1400000000000L); - dto.setUpdatedAt(1500000000000L); + dto.setIssueCreationTime(1_401_000_000_000L); + dto.setIssueUpdateTime(1_402_000_000_000L); + dto.setIssueCloseTime(1_403_000_000_000L); + dto.setCreatedAt(1_400_000_000_000L); + dto.setUpdatedAt(1_500_000_000_000L); // selected after last update -> ok dto.setSelectedAt(1500000000000L); diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStorageTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStorageTest.java index 8ec847c3c86..bdda38311e9 100644 --- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStorageTest.java +++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueStorageTest.java @@ -63,7 +63,7 @@ public class IssueStorageTest extends AbstractDaoTestCase { // override generated key comment.setKey("FGHIJ"); - Date date = DateUtils.parseDate("2013-05-18"); + Date date = DateUtils.parseDateTime("2013-05-18T12:00:00+0000"); DefaultIssue issue = new DefaultIssue() .setKey("ABCDE") .setNew(true) @@ -98,7 +98,7 @@ public class IssueStorageTest extends AbstractDaoTestCase { // override generated key comment.setKey("FGHIJ"); - Date date = DateUtils.parseDate("2013-05-18"); + Date date = DateUtils.parseDateTime("2013-05-18T12:00:00+0000"); DefaultIssue issue = new DefaultIssue() .setKey("ABCDE") .setNew(true) @@ -136,7 +136,7 @@ public class IssueStorageTest extends AbstractDaoTestCase { // override generated key comment.setKey("FGHIJ"); - Date date = DateUtils.parseDate("2013-05-18"); + Date date = DateUtils.parseDateTime("2013-05-18T12:00:00+0000"); DefaultIssue issue = new DefaultIssue() .setKey("ABCDE") .setNew(true) @@ -174,7 +174,7 @@ public class IssueStorageTest extends AbstractDaoTestCase { // override generated key comment.setKey("FGHIJ"); - Date date = DateUtils.parseDate("2013-05-18"); + Date date = DateUtils.parseDateTime("2013-05-18T12:00:00+0000"); DefaultIssue issue = new DefaultIssue() .setKey("ABCDE") .setNew(false) @@ -220,7 +220,7 @@ public class IssueStorageTest extends AbstractDaoTestCase { // override generated key comment.setKey("FGHIJ"); - Date date = DateUtils.parseDate("2013-05-18"); + Date date = DateUtils.parseDateTime("2013-05-18T12:00:00+0000"); DefaultIssue issue = new DefaultIssue() .setKey("ABCDE") .setNew(false) diff --git a/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java b/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java index 56b56b5fe15..cb3f32dff32 100644 --- a/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java +++ b/sonar-core/src/test/java/org/sonar/core/resource/ResourceDaoTest.java @@ -28,7 +28,6 @@ import org.junit.Test; import org.sonar.api.component.Component; import org.sonar.api.resources.Qualifiers; import org.sonar.api.resources.Scopes; -import org.sonar.api.utils.DateUtils; import org.sonar.api.utils.System2; import org.sonar.core.component.ComponentDto; import org.sonar.core.component.SnapshotDto; @@ -36,7 +35,6 @@ import org.sonar.core.persistence.AbstractDaoTestCase; import org.sonar.core.persistence.DbSession; import javax.annotation.Nullable; - import java.util.Collections; import java.util.List; @@ -56,7 +54,7 @@ public class ResourceDaoTest extends AbstractDaoTestCase { public void createDao() { session = getMyBatis().openSession(false); system2 = mock(System2.class); - when(system2.now()).thenReturn(DateUtils.parseDate("2014-09-03").getTime()); + when(system2.now()).thenReturn(1_500_000_000_000L); dao = new ResourceDao(getMyBatis(), system2); } @@ -284,7 +282,7 @@ public class ResourceDaoTest extends AbstractDaoTestCase { assertThat(file1.getId()).isNotNull(); assertThat(file2.getId()).isNotNull(); - checkTables("insert", new String[] {"authorization_updated_at"}, "projects"); + checkTables("insert", new String[] {"authorization_updated_at", "created_at"}, "projects"); // SONAR-3636 : created_at must be fed when inserting a new entry in the 'projects' table ResourceDto fileLoadedFromDB = dao.getResource(file1.getId()); @@ -430,11 +428,11 @@ public class ResourceDaoTest extends AbstractDaoTestCase { assertThat(snapshotDto.getPeriodMode(2)).isEqualTo("days"); assertThat(snapshotDto.getPeriodModeParameter(2)).isEqualTo("30"); - assertThat(snapshotDto.getPeriodDate(2)).isEqualTo(DateUtils.parseDate("2011-09-24").getTime()); + assertThat(snapshotDto.getPeriodDate(2)).isEqualTo(1_316_815_200_000L); assertThat(snapshotDto.getPeriodMode(3)).isEqualTo("days"); assertThat(snapshotDto.getPeriodModeParameter(3)).isEqualTo("90"); - assertThat(snapshotDto.getPeriodDate(3)).isEqualTo(DateUtils.parseDate("2011-07-26").getTime()); + assertThat(snapshotDto.getPeriodDate(3)).isEqualTo(1_311_631_200_000L); assertThat(snapshotDto.getPeriodMode(4)).isEqualTo("previous_analysis"); assertThat(snapshotDto.getPeriodModeParameter(4)).isNull(); diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/insert-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/insert-result.xml index 6e5a96df545..06468bff8a8 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/insert-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/insert-result.xml @@ -7,9 +7,9 @@ user_login="emmerik" change_type="comment" change_data="Some text" - created_at="1410213600000" - updated_at="1410300000000" - issue_change_creation_date="1410386400000" + created_at="1500000000000" + updated_at="1501000000000" + issue_change_creation_date="1502000000000" /> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/update-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/update-result.xml index 754dfd948f2..16020534152 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/update-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeDaoTest/update-result.xml @@ -32,7 +32,7 @@ change_type="comment" change_data="new comment" created_at="1367704800000" - updated_at="1372543200000" + updated_at="1500000000000" issue_change_creation_date="[null]" /> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeMapperTest/insert_comment-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeMapperTest/insert_comment-result.xml index ad0e38ea83d..0cafa3297f4 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeMapperTest/insert_comment-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeMapperTest/insert_comment-result.xml @@ -6,8 +6,8 @@ user_login="emmerik" change_type="comment" change_data="the comment" - created_at="1368828000000" - updated_at="1368828000000" + created_at="1500000000000" + updated_at="1500000000000" issue_change_creation_date="[null]" /> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeMapperTest/insert_diff-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeMapperTest/insert_diff-result.xml index d4754f60a06..f84e3423e12 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeMapperTest/insert_diff-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueChangeMapperTest/insert_diff-result.xml @@ -6,8 +6,8 @@ user_login="emmerik" change_type="diff" change_data="severity=INFO|BLOCKER" - created_at="1368828000000" - updated_at="1368828000000" - issue_change_creation_date="1368828000000" + created_at="1500000000000" + updated_at="1500000000000" + issue_change_creation_date="1500000000000" /> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/find_rules_by_component.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/find_rules_by_component.xml deleted file mode 100644 index 9d97be65b71..00000000000 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueDaoTest/find_rules_by_component.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml index bbc47e84e7f..5083212cdc6 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testInsert-result.xml @@ -19,9 +19,9 @@ assignee="karadoc" issue_attributes="JIRA=FOO-1234" tags="[null]" - issue_creation_date="1368828000000" - issue_update_date="1368914400000" - issue_close_date="1369000800000" + issue_creation_date="1401000000000" + issue_update_date="1402000000000" + issue_close_date="1403000000000" created_at="1400000000000" updated_at="1500000000000" action_plan_key="current_sprint" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml index 148d47a907b..bceb8d3e10b 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate-result.xml @@ -19,9 +19,9 @@ assignee="karadoc" issue_attributes="JIRA=FOO-1234" tags="[null]" - issue_creation_date="1368828000000" - issue_update_date="1368914400000" - issue_close_date="1369000800000" + issue_creation_date="1401000000000" + issue_update_date="1402000000000" + issue_close_date="1403000000000" created_at="1400000000000" updated_at="1500000000000" action_plan_key="current_sprint" diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml index 941e2e0e698..65c1df5a462 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueMapperTest/testUpdate.xml @@ -17,12 +17,11 @@ reporter="[null]" author_login="[null]" assignee="[null]" - issue_attributes="[null]" - issue_creation_date="[null]" - issue_update_date="[null]" - issue_close_date="[null]" + issue_creation_date="1401000000000" + issue_update_date="1402000000000" + issue_close_date="1403000000000" created_at="1400000000000" - updated_at="1400000000000" + updated_at="1500000000000" action_plan_key="[null]" /> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml index a69e0a72135..bea6889ccad 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_insert_new_issues-result.xml @@ -16,9 +16,9 @@ issue_attributes="foo=bar" tags="[null]" action_plan_key="[null]" - issue_creation_date="1368828000000" - issue_update_date="1368828000000" - issue_close_date="1368828000000" + issue_creation_date="1368878400000" + issue_update_date="1368878400000" + issue_close_date="1368878400000" /> diff --git a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml index ea291ef00bc..91524aa02bc 100644 --- a/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/issue/db/IssueStorageTest/should_update_issues-result.xml @@ -21,9 +21,9 @@ issue_attributes="foo=bar" tags="[null]" action_plan_key="[null]" - issue_creation_date="1368828000000" - issue_update_date="1368828000000" - issue_close_date="1368828000000" + issue_creation_date="1368878400000" + issue_update_date="1368878400000" + issue_close_date="1368878400000" /> -- 2.39.5