aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorMichal Duda <michal.duda@sonarsource.com>2020-08-05 11:56:21 +0200
committersonartech <sonartech@sonarsource.com>2020-08-12 20:06:28 +0000
commit94ea3b30c8fded80d7c02e1f4da12c9e5e6092d3 (patch)
treeae7de5582b4d20c1892f7d37e02cf3c34d74bc23 /server
parent47d30c27a87275a17f5f3e3c6e4af4192dec4fb4 (diff)
downloadsonarqube-94ea3b30c8fded80d7c02e1f4da12c9e5e6092d3.tar.gz
sonarqube-94ea3b30c8fded80d7c02e1f4da12c9e5e6092d3.zip
SONAR-13445 fix failure to export project on Oracle and mssql
Diffstat (limited to 'server')
-rw-r--r--server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java
index 79bf805add8..d53912a6779 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java
@@ -72,13 +72,13 @@ public class CeActivityDaoTest {
private static final long INITIAL_TIME = 1_450_000_000_000L;
- private TestSystem2 system2 = new TestSystem2().setNow(INITIAL_TIME);
+ private final TestSystem2 system2 = new TestSystem2().setNow(INITIAL_TIME);
@Rule
public DbTester db = DbTester.create(system2);
- private DbSession dbSession = db.getSession();
- private CeActivityDao underTest = new CeActivityDao(system2);
+ private final DbSession dbSession = db.getSession();
+ private final CeActivityDao underTest = new CeActivityDao(system2);
@Before
public void setup() {
@@ -768,11 +768,11 @@ public class CeActivityDaoTest {
insert("TASK_2", REPORT, MAINCOMPONENT_1, FAILED);
ProjectDto projectDto1 = db.components()
- .insertPrivateProjectDto(db.getDefaultOrganization(), branchDto -> branchDto.setNeedIssueSync(false));
+ .insertPrivateProjectDto(db.getDefaultOrganization(), branchDto -> branchDto.setNeedIssueSync(false));
insert("TASK_3", CeTaskTypes.BRANCH_ISSUE_SYNC, projectDto1.getUuid(), projectDto1.getUuid(), SUCCESS);
ProjectDto projectDto2 = db.components()
- .insertPrivateProjectDto(db.getDefaultOrganization(), branchDto -> branchDto.setNeedIssueSync(false));
+ .insertPrivateProjectDto(db.getDefaultOrganization(), branchDto -> branchDto.setNeedIssueSync(false));
insert("TASK_4", CeTaskTypes.BRANCH_ISSUE_SYNC, projectDto2.getUuid(), projectDto2.getUuid(), SUCCESS);
assertThat(underTest.hasAnyFailedIssueSyncTask(db.getSession())).isFalse();
@@ -781,22 +781,22 @@ public class CeActivityDaoTest {
insert("TASK_5", CeTaskTypes.BRANCH_ISSUE_SYNC, projectDto3.getUuid(), projectDto3.getUuid(), SUCCESS);
BranchDto projectBranch = db.components()
- .insertProjectBranch(projectDto3, branchDto -> branchDto.setNeedIssueSync(true));
+ .insertProjectBranch(projectDto3, branchDto -> branchDto.setNeedIssueSync(true));
insert("TASK_6", CeTaskTypes.BRANCH_ISSUE_SYNC, projectBranch.getUuid(), projectDto3.getUuid(), FAILED);
- //failed task and project branch still exists and need sync
+ // failed task and project branch still exists and need sync
assertThat(underTest.hasAnyFailedIssueSyncTask(db.getSession())).isTrue();
- //assume branch has been re-analysed
+ // assume branch has been re-analysed
db.getDbClient().branchDao().updateNeedIssueSync(db.getSession(), projectBranch.getUuid(), false);
assertThat(underTest.hasAnyFailedIssueSyncTask(db.getSession())).isFalse();
- //assume branch has been deleted
+ // assume branch has been deleted
db.getDbClient().purgeDao().deleteBranch(db.getSession(), projectBranch.getUuid());
- //associated branch does not exist, so there is no failures - either it has been deleted or purged or reanalysed
+ // associated branch does not exist, so there is no failures - either it has been deleted or purged or reanalysed
assertThat(underTest.hasAnyFailedIssueSyncTask(db.getSession())).isFalse();
}