aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2016-02-08 12:16:47 +0100
committerSébastien Lesaint <sebastien.lesaint@sonarsource.com>2016-03-02 18:05:05 +0100
commit56b23cf5998e0f791ba0057f9d27931812a390c9 (patch)
tree9d385fafbcb1f7df14beb482630134e92ebd3f9b
parenta37d4039e19bbde99a1003f468152a2f746c571e (diff)
downloadsonarqube-56b23cf5998e0f791ba0057f9d27931812a390c9.tar.gz
sonarqube-56b23cf5998e0f791ba0057f9d27931812a390c9.zip
improve reporting in case of failure in CeQueueDaoTest
Diffstat
-rw-r--r--sonar-db/src/test/java/org/sonar/db/ce/CeQueueDaoTest.java202
1 files changed, 123 insertions, 79 deletions
diff --git a/sonar-db/src/test/java/org/sonar/db/ce/CeQueueDaoTest.java b/sonar-db/src/test/java/org/sonar/db/ce/CeQueueDaoTest.java
index 9cefc290f36..ec970533b14 100644
--- a/sonar-db/src/test/java/org/sonar/db/ce/CeQueueDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/ce/CeQueueDaoTest.java
@@ -19,98 +19,110 @@
*/
package org.sonar.db.ce;
+import com.google.common.base.Function;
import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableMap;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
import org.junit.Rule;
import org.junit.Test;
import org.sonar.api.utils.Paging;
-import org.sonar.api.utils.System2;
import org.sonar.api.utils.internal.TestSystem2;
import org.sonar.db.DbTester;
+import static com.google.common.collect.FluentIterable.from;
import static com.google.common.collect.Lists.newArrayList;
import static java.util.Collections.singletonList;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.db.ce.CeQueueDto.Status.IN_PROGRESS;
+import static org.sonar.db.ce.CeQueueDto.Status.PENDING;
import static org.sonar.db.ce.CeQueueTesting.newCeQueueDto;
-
public class CeQueueDaoTest {
+ private static final long INIT_TIME = 1_450_000_000_000L;
+ private static final String TASK_UUID_1 = "TASK_1";
+ private static final String TASK_UUID_2 = "TASK_2";
+ private static final String COMPONENT_UUID_1 = "PROJECT_1";
+ private static final String COMPONENT_UUID_2 = "PROJECT_2";
+ public static final String TASK_UUID_3 = "TASK_3";
- System2 system2 = new TestSystem2().setNow(1_450_000_000_000L);
+ private TestSystem2 system2 = new TestSystem2().setNow(INIT_TIME);
@Rule
public DbTester db = DbTester.create(system2);
- CeQueueDao underTest = new CeQueueDao(system2);
+ private CeQueueDao underTest = new CeQueueDao(system2);
+ public static final String SELECT_QUEUE_UUID_AND_STATUS_QUERY = "select uuid,status from ce_queue";
@Test
public void test_insert() {
- insert("TASK_1", "PROJECT_1", CeQueueDto.Status.PENDING);
+ insert(TASK_UUID_1, COMPONENT_UUID_1, PENDING);
- Optional<CeQueueDto> saved = underTest.selectByUuid(db.getSession(), "TASK_1");
+ Optional<CeQueueDto> saved = underTest.selectByUuid(db.getSession(), TASK_UUID_1);
assertThat(saved.isPresent()).isTrue();
}
@Test
public void test_selectByUuid() {
- insert("TASK_1", "PROJECT_1", CeQueueDto.Status.PENDING);
+ insert(TASK_UUID_1, COMPONENT_UUID_1, PENDING);
assertThat(underTest.selectByUuid(db.getSession(), "TASK_UNKNOWN").isPresent()).isFalse();
- CeQueueDto saved = underTest.selectByUuid(db.getSession(), "TASK_1").get();
- assertThat(saved.getUuid()).isEqualTo("TASK_1");
+ CeQueueDto saved = underTest.selectByUuid(db.getSession(), TASK_UUID_1).get();
+ assertThat(saved.getUuid()).isEqualTo(TASK_UUID_1);
assertThat(saved.getTaskType()).isEqualTo(CeTaskTypes.REPORT);
- assertThat(saved.getComponentUuid()).isEqualTo("PROJECT_1");
- assertThat(saved.getStatus()).isEqualTo(CeQueueDto.Status.PENDING);
+ assertThat(saved.getComponentUuid()).isEqualTo(COMPONENT_UUID_1);
+ assertThat(saved.getStatus()).isEqualTo(PENDING);
assertThat(saved.getSubmitterLogin()).isEqualTo("henri");
- assertThat(saved.getCreatedAt()).isEqualTo(1_450_000_000_000L);
- assertThat(saved.getUpdatedAt()).isEqualTo(1_450_000_000_000L);
+ assertThat(saved.getCreatedAt()).isEqualTo(INIT_TIME);
+ assertThat(saved.getUpdatedAt()).isEqualTo(INIT_TIME);
assertThat(saved.getStartedAt()).isNull();
}
@Test
public void test_selectByComponentUuid() {
- insert("TASK_1", "PROJECT_1", CeQueueDto.Status.PENDING);
- insert("TASK_2", "PROJECT_1", CeQueueDto.Status.PENDING);
- insert("TASK_3", "PROJECT_2", CeQueueDto.Status.PENDING);
+ insert(TASK_UUID_1, COMPONENT_UUID_1, PENDING);
+ insert(TASK_UUID_2, COMPONENT_UUID_1, PENDING);
+ insert(TASK_UUID_3, "PROJECT_2", PENDING);
assertThat(underTest.selectByComponentUuid(db.getSession(), "UNKNOWN")).isEmpty();
- assertThat(underTest.selectByComponentUuid(db.getSession(), "PROJECT_1")).extracting("uuid").containsOnly("TASK_1", "TASK_2");
- assertThat(underTest.selectByComponentUuid(db.getSession(), "PROJECT_2")).extracting("uuid").containsOnly("TASK_3");
+ assertThat(underTest.selectByComponentUuid(db.getSession(), COMPONENT_UUID_1)).extracting("uuid").containsOnly(TASK_UUID_1, TASK_UUID_2);
+ assertThat(underTest.selectByComponentUuid(db.getSession(), "PROJECT_2")).extracting("uuid").containsOnly(TASK_UUID_3);
}
@Test
public void test_selectAllInAscOrder() {
- insert("TASK_1", "PROJECT_1", CeQueueDto.Status.PENDING);
- insert("TASK_2", "PROJECT_1", CeQueueDto.Status.PENDING);
- insert("TASK_3", "PROJECT_2", CeQueueDto.Status.PENDING);
+ insert(TASK_UUID_1, COMPONENT_UUID_1, PENDING);
+ insert(TASK_UUID_2, COMPONENT_UUID_1, PENDING);
+ insert(TASK_UUID_3, "PROJECT_2", PENDING);
- assertThat(underTest.selectAllInAscOrder(db.getSession())).extracting("uuid").containsOnly("TASK_1", "TASK_2", "TASK_3");
+ assertThat(underTest.selectAllInAscOrder(db.getSession())).extracting("uuid").containsOnly(TASK_UUID_1, TASK_UUID_2, TASK_UUID_3);
}
@Test
public void test_delete() {
- insert("TASK_1", "PROJECT_1", CeQueueDto.Status.PENDING);
+ insert(TASK_UUID_1, COMPONENT_UUID_1, PENDING);
underTest.deleteByUuid(db.getSession(), "UNKNOWN");
- assertThat(underTest.selectByUuid(db.getSession(), "TASK_1").isPresent()).isTrue();
+ assertThat(underTest.selectByUuid(db.getSession(), TASK_UUID_1).isPresent()).isTrue();
- underTest.deleteByUuid(db.getSession(), "TASK_1");
- assertThat(underTest.selectByUuid(db.getSession(), "TASK_1").isPresent()).isFalse();
+ underTest.deleteByUuid(db.getSession(), TASK_UUID_1);
+ assertThat(underTest.selectByUuid(db.getSession(), TASK_UUID_1).isPresent()).isFalse();
}
@Test
public void test_resetAllToPendingStatus() throws Exception {
- insert("TASK_1", "PROJECT_1", CeQueueDto.Status.PENDING);
- insert("TASK_2", "PROJECT_1", CeQueueDto.Status.IN_PROGRESS);
- insert("TASK_3", "PROJECT_1", CeQueueDto.Status.IN_PROGRESS);
- assertThat(underTest.countByStatus(db.getSession(), CeQueueDto.Status.PENDING)).isEqualTo(1);
- assertThat(underTest.countByStatus(db.getSession(), CeQueueDto.Status.IN_PROGRESS)).isEqualTo(2);
+ insert(TASK_UUID_1, COMPONENT_UUID_1, PENDING);
+ insert(TASK_UUID_2, COMPONENT_UUID_1, IN_PROGRESS);
+ insert(TASK_UUID_3, COMPONENT_UUID_1, IN_PROGRESS);
+ verifyCeQueueStatuses(TASK_UUID_1, PENDING, TASK_UUID_2, IN_PROGRESS, TASK_UUID_3, IN_PROGRESS);
underTest.resetAllToPendingStatus(db.getSession());
+ db.getSession().commit();
- assertThat(underTest.countByStatus(db.getSession(), CeQueueDto.Status.PENDING)).isEqualTo(3);
- assertThat(underTest.countByStatus(db.getSession(), CeQueueDto.Status.IN_PROGRESS)).isEqualTo(0);
+ verifyCeQueueStatuses(TASK_UUID_1, PENDING, TASK_UUID_2, PENDING, TASK_UUID_3, PENDING);
}
@Test
@@ -118,33 +130,32 @@ public class CeQueueDaoTest {
assertThat(underTest.peek(db.getSession()).isPresent()).isFalse();
// not pending, but in progress
- insert("TASK_1", "PROJECT_1", CeQueueDto.Status.IN_PROGRESS);
+ insert(TASK_UUID_1, COMPONENT_UUID_1, IN_PROGRESS);
assertThat(underTest.peek(db.getSession()).isPresent()).isFalse();
}
@Test
public void peek_oldest_pending() throws Exception {
- insert("TASK_1", "PROJECT_1", CeQueueDto.Status.PENDING);
- insert("TASK_2", "PROJECT_2", CeQueueDto.Status.PENDING);
+ insert(TASK_UUID_1, COMPONENT_UUID_1, PENDING);
+ system2.setNow(INIT_TIME + 3_000_000);
+ insert(TASK_UUID_2, COMPONENT_UUID_2, PENDING);
+
assertThat(underTest.countAll(db.getSession())).isEqualTo(2);
- assertThat(underTest.countByStatus(db.getSession(), CeQueueDto.Status.PENDING)).isEqualTo(2);
- assertThat(underTest.countByStatus(db.getSession(), CeQueueDto.Status.IN_PROGRESS)).isEqualTo(0);
+ verifyCeQueueStatuses(TASK_UUID_1, PENDING, TASK_UUID_2, PENDING);
// peek first one
Optional<CeQueueDto> peek = underTest.peek(db.getSession());
assertThat(peek.isPresent()).isTrue();
- assertThat(peek.get().getUuid()).isEqualTo("TASK_1");
- assertThat(peek.get().getStatus()).isEqualTo(CeQueueDto.Status.IN_PROGRESS);
- assertThat(underTest.countByStatus(db.getSession(), CeQueueDto.Status.PENDING)).isEqualTo(1);
- assertThat(underTest.countByStatus(db.getSession(), CeQueueDto.Status.IN_PROGRESS)).isEqualTo(1);
+ assertThat(peek.get().getUuid()).isEqualTo(TASK_UUID_1);
+ assertThat(peek.get().getStatus()).isEqualTo(IN_PROGRESS);
+ verifyCeQueueStatuses(TASK_UUID_1, IN_PROGRESS, TASK_UUID_2, PENDING);
// peek second one
peek = underTest.peek(db.getSession());
assertThat(peek.isPresent()).isTrue();
- assertThat(peek.get().getUuid()).isEqualTo("TASK_2");
- assertThat(peek.get().getStatus()).isEqualTo(CeQueueDto.Status.IN_PROGRESS);
- assertThat(underTest.countByStatus(db.getSession(), CeQueueDto.Status.PENDING)).isEqualTo(0);
- assertThat(underTest.countByStatus(db.getSession(), CeQueueDto.Status.IN_PROGRESS)).isEqualTo(2);
+ assertThat(peek.get().getUuid()).isEqualTo(TASK_UUID_2);
+ assertThat(peek.get().getStatus()).isEqualTo(IN_PROGRESS);
+ verifyCeQueueStatuses(TASK_UUID_1, IN_PROGRESS, TASK_UUID_2, IN_PROGRESS);
// no more pendings
assertThat(underTest.peek(db.getSession()).isPresent()).isFalse();
@@ -153,82 +164,81 @@ public class CeQueueDaoTest {
@Test
public void do_not_peek_multiple_tasks_on_same_project_at_the_same_time() throws Exception {
// two pending tasks on the same project
- insert("TASK_1", "PROJECT_1", CeQueueDto.Status.PENDING);
- insert("TASK_2", "PROJECT_1", CeQueueDto.Status.PENDING);
+ insert(TASK_UUID_1, COMPONENT_UUID_1, PENDING);
+ system2.setNow(INIT_TIME + 3_000_000);
+ insert(TASK_UUID_2, COMPONENT_UUID_1, PENDING);
Optional<CeQueueDto> peek = underTest.peek(db.getSession());
assertThat(peek.isPresent()).isTrue();
- assertThat(peek.get().getUuid()).isEqualTo("TASK_1");
- assertThat(underTest.countAll(db.getSession())).isEqualTo(2);
- assertThat(underTest.countByStatus(db.getSession(), CeQueueDto.Status.PENDING)).isEqualTo(1);
- assertThat(underTest.countByStatus(db.getSession(), CeQueueDto.Status.IN_PROGRESS)).isEqualTo(1);
+ assertThat(peek.get().getUuid()).isEqualTo(TASK_UUID_1);
+ verifyCeQueueStatuses(TASK_UUID_1, IN_PROGRESS, TASK_UUID_2, PENDING);
// do not peek second task as long as the first one is in progress
peek = underTest.peek(db.getSession());
assertThat(peek.isPresent()).isFalse();
// first one is finished
- underTest.deleteByUuid(db.getSession(), "TASK_1");
+ underTest.deleteByUuid(db.getSession(), TASK_UUID_1);
peek = underTest.peek(db.getSession());
- assertThat(peek.get().getUuid()).isEqualTo("TASK_2");
+ assertThat(peek.get().getUuid()).isEqualTo(TASK_UUID_2);
}
@Test
public void select_by_query() {
// task status not in query
- insert(newCeQueueDto("TASK_1")
- .setComponentUuid("PROJECT_1")
- .setStatus(CeQueueDto.Status.IN_PROGRESS)
+ insert(newCeQueueDto(TASK_UUID_1)
+ .setComponentUuid(COMPONENT_UUID_1)
+ .setStatus(IN_PROGRESS)
.setTaskType(CeTaskTypes.REPORT)
.setCreatedAt(100_000L));
// too early
- insert(newCeQueueDto("TASK_3")
- .setComponentUuid("PROJECT_1")
- .setStatus(CeQueueDto.Status.PENDING)
+ insert(newCeQueueDto(TASK_UUID_3)
+ .setComponentUuid(COMPONENT_UUID_1)
+ .setStatus(PENDING)
.setTaskType(CeTaskTypes.REPORT)
.setCreatedAt(90_000L));
// task type not in query
insert(newCeQueueDto("TASK_4")
.setComponentUuid("PROJECT_2")
- .setStatus(CeQueueDto.Status.PENDING)
+ .setStatus(PENDING)
.setTaskType("ANOTHER_TYPE")
.setCreatedAt(100_000L));
// correct
- insert(newCeQueueDto("TASK_2")
- .setComponentUuid("PROJECT_1")
- .setStatus(CeQueueDto.Status.PENDING)
+ insert(newCeQueueDto(TASK_UUID_2)
+ .setComponentUuid(COMPONENT_UUID_1)
+ .setStatus(PENDING)
.setTaskType(CeTaskTypes.REPORT)
.setCreatedAt(100_000L));
// correct submitted later
insert(newCeQueueDto("TASK_5")
- .setComponentUuid("PROJECT_1")
- .setStatus(CeQueueDto.Status.PENDING)
+ .setComponentUuid(COMPONENT_UUID_1)
+ .setStatus(PENDING)
.setTaskType(CeTaskTypes.REPORT)
.setCreatedAt(120_000L));
// select by component uuid, status, task type and minimum submitted at
CeTaskQuery query = new CeTaskQuery()
- .setComponentUuids(newArrayList("PROJECT_1", "PROJECT_2"))
- .setStatuses(singletonList(CeQueueDto.Status.PENDING.name()))
+ .setComponentUuids(newArrayList(COMPONENT_UUID_1, "PROJECT_2"))
+ .setStatuses(singletonList(PENDING.name()))
.setType(CeTaskTypes.REPORT)
.setMinSubmittedAt(100_000L);
List<CeQueueDto> result = underTest.selectByQueryInDescOrder(db.getSession(), query, Paging.forPageIndex(1).withPageSize(1_000).andTotal(1_000));
int total = underTest.countByQuery(db.getSession(), query);
- assertThat(result).extracting("uuid").containsExactly("TASK_5", "TASK_2");
+ assertThat(result).extracting("uuid").containsExactly("TASK_5", TASK_UUID_2);
assertThat(total).isEqualTo(2);
}
@Test
public void select_by_query_returns_empty_list_when_only_current() {
- insert(newCeQueueDto("TASK_1")
- .setComponentUuid("PROJECT_1")
- .setStatus(CeQueueDto.Status.IN_PROGRESS)
+ insert(newCeQueueDto(TASK_UUID_1)
+ .setComponentUuid(COMPONENT_UUID_1)
+ .setStatus(IN_PROGRESS)
.setTaskType(CeTaskTypes.REPORT)
.setCreatedAt(100_000L));
@@ -243,9 +253,9 @@ public class CeQueueDaoTest {
@Test
public void select_by_query_returns_empty_list_when_max_submitted_at() {
- insert(newCeQueueDto("TASK_1")
- .setComponentUuid("PROJECT_1")
- .setStatus(CeQueueDto.Status.IN_PROGRESS)
+ insert(newCeQueueDto(TASK_UUID_1)
+ .setComponentUuid(COMPONENT_UUID_1)
+ .setStatus(IN_PROGRESS)
.setTaskType(CeTaskTypes.REPORT)
.setCreatedAt(100_000L));
@@ -260,9 +270,9 @@ public class CeQueueDaoTest {
@Test
public void select_by_query_returns_empty_list_when_empty_list_of_component_uuid() {
- insert(newCeQueueDto("TASK_1")
- .setComponentUuid("PROJECT_1")
- .setStatus(CeQueueDto.Status.IN_PROGRESS)
+ insert(newCeQueueDto(TASK_UUID_1)
+ .setComponentUuid(COMPONENT_UUID_1)
+ .setStatus(IN_PROGRESS)
.setTaskType(CeTaskTypes.REPORT)
.setCreatedAt(100_000L));
@@ -288,6 +298,40 @@ public class CeQueueDaoTest {
dto.setStatus(status);
dto.setSubmitterLogin("henri");
underTest.insert(db.getSession(), dto);
- db.commit();
+ db.getSession().commit();
+ }
+
+ private static Iterable<Map<String, Object>> upperizeKeys(List<Map<String, Object>> select) {
+ return from(select).transform(new Function<Map<String, Object>, Map<String, Object>>() {
+ @Nullable
+ @Override
+ public Map<String, Object> apply(Map<String, Object> input) {
+ Map<String, Object> res = new HashMap<>(input.size());
+ for (Map.Entry<String, Object> entry : input.entrySet()) {
+ res.put(entry.getKey().toUpperCase(), entry.getValue());
+ }
+ return res;
+ }
+ });
+ }
+
+ private void verifyCeQueueStatuses(String taskUuid1, CeQueueDto.Status taskStatus1, String taskUuid2, CeQueueDto.Status taskStatus2, String taskUuid3, CeQueueDto.Status taskStatus3) {
+ verifyCeQueueStatuses(new String[]{taskUuid1, taskUuid2, taskUuid3}, new CeQueueDto.Status[]{taskStatus1, taskStatus2, taskStatus3});
+ }
+
+ private void verifyCeQueueStatuses(String taskUuid1, CeQueueDto.Status taskStatus1, String taskUuid2, CeQueueDto.Status taskStatus2) {
+ verifyCeQueueStatuses(new String[]{taskUuid1, taskUuid2}, new CeQueueDto.Status[]{taskStatus1, taskStatus2});
+ }
+
+ private void verifyCeQueueStatuses(String[] taskUuids, CeQueueDto.Status[] statuses) {
+ Map<String, Object>[] rows = new Map[taskUuids.length];
+ for (int i = 0; i < taskUuids.length; i++) {
+ rows[i] = rowMap(taskUuids[i], statuses[i]);
+ }
+ assertThat(upperizeKeys(db.select(SELECT_QUEUE_UUID_AND_STATUS_QUERY))).containsOnly(rows);
+ }
+
+ private static Map<String, Object> rowMap(String uuid, CeQueueDto.Status status) {
+ return ImmutableMap.<String, Object>of("UUID", uuid, "STATUS", status.name());
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-11 01:53:10 +0000