From f004a91fa42ab3d408618c3797a5610a300e83dc Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Mon, 15 Feb 2016 15:13:32 +0100 Subject: SONAR-7187 Rename CeActivityQuery to CeTaskQuery --- .../java/org/sonar/db/ce/CeActivityDaoTest.java | 34 +++++----- .../java/org/sonar/db/ce/CeActivityQueryTest.java | 79 ---------------------- .../test/java/org/sonar/db/ce/CeQueueDaoTest.java | 8 +-- .../test/java/org/sonar/db/ce/CeTaskQueryTest.java | 79 ++++++++++++++++++++++ 4 files changed, 100 insertions(+), 100 deletions(-) delete mode 100644 sonar-db/src/test/java/org/sonar/db/ce/CeActivityQueryTest.java create mode 100644 sonar-db/src/test/java/org/sonar/db/ce/CeTaskQueryTest.java (limited to 'sonar-db/src/test') diff --git a/sonar-db/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java b/sonar-db/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java index cf726322310..05ab62daee3 100644 --- a/sonar-db/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java +++ b/sonar-db/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java @@ -96,30 +96,30 @@ public class CeActivityDaoTest { insert("TASK_4", "views", null, CeActivityDto.Status.SUCCESS); // no filters - CeActivityQuery query = new CeActivityQuery().setStatuses(Collections.emptyList()); + CeTaskQuery query = new CeTaskQuery().setStatuses(Collections.emptyList()); List dtos = underTest.selectByQuery(db.getSession(), query, 0, 10); assertThat(dtos).extracting("uuid").containsExactly("TASK_4", "TASK_3", "TASK_2", "TASK_1"); // select by component uuid - query = new CeActivityQuery().setComponentUuid("PROJECT_1"); + query = new CeTaskQuery().setComponentUuid("PROJECT_1"); dtos = underTest.selectByQuery(db.getSession(), query, 0, 100); assertThat(dtos).extracting("uuid").containsExactly("TASK_2", "TASK_1"); // select by status - query = new CeActivityQuery().setStatuses(singletonList(CeActivityDto.Status.SUCCESS.name())); + query = new CeTaskQuery().setStatuses(singletonList(CeActivityDto.Status.SUCCESS.name())); dtos = underTest.selectByQuery(db.getSession(), query, 0, 100); assertThat(dtos).extracting("uuid").containsExactly("TASK_4", "TASK_3", "TASK_1"); // select by type - query = new CeActivityQuery().setType(REPORT); + query = new CeTaskQuery().setType(REPORT); dtos = underTest.selectByQuery(db.getSession(), query, 0, 100); assertThat(dtos).extracting("uuid").containsExactly("TASK_3", "TASK_2", "TASK_1"); - query = new CeActivityQuery().setType("views"); + query = new CeTaskQuery().setType("views"); dtos = underTest.selectByQuery(db.getSession(), query, 0, 100); assertThat(dtos).extracting("uuid").containsExactly("TASK_4"); // select by multiple conditions - query = new CeActivityQuery().setType(REPORT).setOnlyCurrents(true).setComponentUuid("PROJECT_1"); + query = new CeTaskQuery().setType(REPORT).setOnlyCurrents(true).setComponentUuid("PROJECT_1"); dtos = underTest.selectByQuery(db.getSession(), query, 0, 100); assertThat(dtos).extracting("uuid").containsExactly("TASK_2"); } @@ -132,25 +132,25 @@ public class CeActivityDaoTest { insert("TASK_4", "views", null, CeActivityDto.Status.SUCCESS); // no filters - CeActivityQuery query = new CeActivityQuery(); + CeTaskQuery query = new CeTaskQuery(); assertThat(underTest.countByQuery(db.getSession(), query)).isEqualTo(4); // select by component uuid - query = new CeActivityQuery().setComponentUuid("PROJECT_1"); + query = new CeTaskQuery().setComponentUuid("PROJECT_1"); assertThat(underTest.countByQuery(db.getSession(), query)).isEqualTo(2); // select by status - query = new CeActivityQuery().setStatuses(singletonList(CeActivityDto.Status.SUCCESS.name())); + query = new CeTaskQuery().setStatuses(singletonList(CeActivityDto.Status.SUCCESS.name())); assertThat(underTest.countByQuery(db.getSession(), query)).isEqualTo(3); // select by type - query = new CeActivityQuery().setType(REPORT); + query = new CeTaskQuery().setType(REPORT); assertThat(underTest.countByQuery(db.getSession(), query)).isEqualTo(3); - query = new CeActivityQuery().setType("views"); + query = new CeTaskQuery().setType("views"); assertThat(underTest.countByQuery(db.getSession(), query)).isEqualTo(1); // select by multiple conditions - query = new CeActivityQuery().setType(REPORT).setOnlyCurrents(true).setComponentUuid("PROJECT_1"); + query = new CeTaskQuery().setType(REPORT).setOnlyCurrents(true).setComponentUuid("PROJECT_1"); assertThat(underTest.countByQuery(db.getSession(), query)).isEqualTo(1); } @@ -158,7 +158,7 @@ public class CeActivityDaoTest { public void selectByQuery_no_results_if_shortcircuited_by_component_uuids() { insert("TASK_1", REPORT, "PROJECT_1", CeActivityDto.Status.SUCCESS); - CeActivityQuery query = new CeActivityQuery(); + CeTaskQuery query = new CeTaskQuery(); query.setComponentUuids(Collections.emptyList()); assertThat(underTest.selectByQuery(db.getSession(), query, 0, 0)).isEmpty(); } @@ -167,7 +167,7 @@ public class CeActivityDaoTest { public void countByQuery_no_results_if_shortcircuited_by_component_uuids() { insert("TASK_1", REPORT, "PROJECT_1", CeActivityDto.Status.SUCCESS); - CeActivityQuery query = new CeActivityQuery(); + CeTaskQuery query = new CeTaskQuery(); query.setComponentUuids(Collections.emptyList()); assertThat(underTest.countByQuery(db.getSession(), query)).isEqualTo(0); } @@ -178,17 +178,17 @@ public class CeActivityDaoTest { insertWithDates("UUID2", 1_460_000_000_000L, 1_480_000_000_000L); // search by min submitted date - CeActivityQuery query = new CeActivityQuery().setMinSubmittedAt(1_455_000_000_000L); + CeTaskQuery query = new CeTaskQuery().setMinSubmittedAt(1_455_000_000_000L); assertThat(underTest.selectByQuery(db.getSession(), query, 0, 5)).extracting("uuid").containsOnly("UUID2"); assertThat(underTest.countByQuery(db.getSession(), query)).isEqualTo(1); // search by max executed date - query = new CeActivityQuery().setMaxExecutedAt(1_475_000_000_000L); + query = new CeTaskQuery().setMaxExecutedAt(1_475_000_000_000L); assertThat(underTest.selectByQuery(db.getSession(), query, 0, 5)).extracting("uuid").containsOnly("UUID1"); assertThat(underTest.countByQuery(db.getSession(), query)).isEqualTo(1); // search by both dates - query = new CeActivityQuery() + query = new CeTaskQuery() .setMinSubmittedAt(1_400_000_000_000L) .setMaxExecutedAt(1_475_000_000_000L); assertThat(underTest.selectByQuery(db.getSession(), query, 0, 5)).extracting("uuid").containsOnly("UUID1"); diff --git a/sonar-db/src/test/java/org/sonar/db/ce/CeActivityQueryTest.java b/sonar-db/src/test/java/org/sonar/db/ce/CeActivityQueryTest.java deleted file mode 100644 index f490e71dd36..00000000000 --- a/sonar-db/src/test/java/org/sonar/db/ce/CeActivityQueryTest.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * SonarQube - * Copyright (C) 2009-2016 SonarSource SA - * mailto:contact 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.sonar.db.ce; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import org.junit.Test; - -import static java.util.Arrays.asList; -import static org.assertj.core.api.Assertions.assertThat; - -public class CeActivityQueryTest { - - CeActivityQuery underTest = new CeActivityQuery(); - - @Test - public void no_filter_on_component_uuids_by_default() { - assertThat(underTest.getComponentUuids()).isNull(); - assertThat(underTest.isShortCircuitedByComponentUuids()).isFalse(); - } - - @Test - public void filter_on_component_uuid() { - underTest.setComponentUuid("UUID1"); - assertThat(underTest.getComponentUuids()).containsOnly("UUID1"); - assertThat(underTest.isShortCircuitedByComponentUuids()).isFalse(); - } - - @Test - public void filter_on_multiple_component_uuids() { - underTest.setComponentUuids(asList("UUID1", "UUID2")); - assertThat(underTest.getComponentUuids()).containsOnly("UUID1", "UUID2"); - assertThat(underTest.isShortCircuitedByComponentUuids()).isFalse(); - } - - /** - * componentUuid is not null but is set to empty - * --> no results - */ - @Test - public void short_circuited_if_empty_component_uuid_filter() { - underTest.setComponentUuids(Collections.emptyList()); - assertThat(underTest.getComponentUuids()).isEmpty(); - assertThat(underTest.isShortCircuitedByComponentUuids()).isTrue(); - } - - /** - * too many componentUuids for SQL request. Waiting for ES to improve this use-case - * --> no results - */ - @Test - public void short_circuited_if_too_many_component_uuid_filters() { - List uuids = new ArrayList<>(); - for (int i = 0; i < CeActivityQuery.MAX_COMPONENT_UUIDS + 2; i++) { - uuids.add(String.valueOf(i)); - } - underTest.setComponentUuids(uuids); - assertThat(underTest.getComponentUuids()).hasSize(CeActivityQuery.MAX_COMPONENT_UUIDS + 2); - assertThat(underTest.isShortCircuitedByComponentUuids()).isTrue(); - } -} 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 f051fef6284..471c0a29944 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 @@ -213,7 +213,7 @@ public class CeQueueDaoTest { .setCreatedAt(120_000L)); // select by component uuid, status, task type and minimum submitted at - CeActivityQuery query = new CeActivityQuery() + CeTaskQuery query = new CeTaskQuery() .setComponentUuids(newArrayList("PROJECT_1", "PROJECT_2")) .setStatuses(singletonList(CeQueueDto.Status.PENDING.name())) .setType(CeTaskTypes.REPORT) @@ -234,7 +234,7 @@ public class CeQueueDaoTest { .setTaskType(CeTaskTypes.REPORT) .setCreatedAt(100_000L)); - CeActivityQuery query = new CeActivityQuery().setOnlyCurrents(true); + CeTaskQuery query = new CeTaskQuery().setOnlyCurrents(true); List result = underTest.selectByQueryInDescOrder(db.getSession(), query, Paging.forPageIndex(1).withPageSize(1_000).andTotal(1_000)); int total = underTest.countByQuery(db.getSession(), query); @@ -251,7 +251,7 @@ public class CeQueueDaoTest { .setTaskType(CeTaskTypes.REPORT) .setCreatedAt(100_000L)); - CeActivityQuery query = new CeActivityQuery().setMaxExecutedAt(1_000_000_000_000L); + CeTaskQuery query = new CeTaskQuery().setMaxExecutedAt(1_000_000_000_000L); List result = underTest.selectByQueryInDescOrder(db.getSession(), query, Paging.forPageIndex(1).withPageSize(1_000).andTotal(1_000)); int total = underTest.countByQuery(db.getSession(), query); @@ -268,7 +268,7 @@ public class CeQueueDaoTest { .setTaskType(CeTaskTypes.REPORT) .setCreatedAt(100_000L)); - CeActivityQuery query = new CeActivityQuery().setComponentUuids(Collections.emptyList()); + CeTaskQuery query = new CeTaskQuery().setComponentUuids(Collections.emptyList()); List result = underTest.selectByQueryInDescOrder(db.getSession(), query, Paging.forPageIndex(1).withPageSize(1_000).andTotal(1_000)); int total = underTest.countByQuery(db.getSession(), query); diff --git a/sonar-db/src/test/java/org/sonar/db/ce/CeTaskQueryTest.java b/sonar-db/src/test/java/org/sonar/db/ce/CeTaskQueryTest.java new file mode 100644 index 00000000000..83d8173c9ac --- /dev/null +++ b/sonar-db/src/test/java/org/sonar/db/ce/CeTaskQueryTest.java @@ -0,0 +1,79 @@ +/* + * SonarQube + * Copyright (C) 2009-2016 SonarSource SA + * mailto:contact 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.sonar.db.ce; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import org.junit.Test; + +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; + +public class CeTaskQueryTest { + + CeTaskQuery underTest = new CeTaskQuery(); + + @Test + public void no_filter_on_component_uuids_by_default() { + assertThat(underTest.getComponentUuids()).isNull(); + assertThat(underTest.isShortCircuitedByComponentUuids()).isFalse(); + } + + @Test + public void filter_on_component_uuid() { + underTest.setComponentUuid("UUID1"); + assertThat(underTest.getComponentUuids()).containsOnly("UUID1"); + assertThat(underTest.isShortCircuitedByComponentUuids()).isFalse(); + } + + @Test + public void filter_on_multiple_component_uuids() { + underTest.setComponentUuids(asList("UUID1", "UUID2")); + assertThat(underTest.getComponentUuids()).containsOnly("UUID1", "UUID2"); + assertThat(underTest.isShortCircuitedByComponentUuids()).isFalse(); + } + + /** + * componentUuid is not null but is set to empty + * --> no results + */ + @Test + public void short_circuited_if_empty_component_uuid_filter() { + underTest.setComponentUuids(Collections.emptyList()); + assertThat(underTest.getComponentUuids()).isEmpty(); + assertThat(underTest.isShortCircuitedByComponentUuids()).isTrue(); + } + + /** + * too many componentUuids for SQL request. Waiting for ES to improve this use-case + * --> no results + */ + @Test + public void short_circuited_if_too_many_component_uuid_filters() { + List uuids = new ArrayList<>(); + for (int i = 0; i < CeTaskQuery.MAX_COMPONENT_UUIDS + 2; i++) { + uuids.add(String.valueOf(i)); + } + underTest.setComponentUuids(uuids); + assertThat(underTest.getComponentUuids()).hasSize(CeTaskQuery.MAX_COMPONENT_UUIDS + 2); + assertThat(underTest.isShortCircuitedByComponentUuids()).isTrue(); + } +} -- cgit v1.2.3