--- /dev/null
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 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 it.rule;
+
+import com.sonar.orchestrator.Orchestrator;
+import com.sonar.orchestrator.http.HttpMethod;
+import it.Category6Suite;
+import java.util.List;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.sonarqube.ws.client.WsClient;
+import org.sonarqube.ws.client.organization.CreateWsRequest;
+import util.ItUtils;
+
+import static it.Category6Suite.enableOrganizationsSupport;
+import static org.assertj.core.api.Assertions.assertThat;
+import static util.ItUtils.deleteOrganizationsIfExists;
+import static util.ItUtils.newAdminWsClient;
+import static util.ItUtils.newWsClient;
+
+public class RulesPerOrganizationTest {
+
+ private static WsClient adminWsClient;
+ private static final String ORGANIZATION_FOO = "foo-org";
+ private static final String ORGANIZATION_BAR = "bar-org";
+
+ @ClassRule
+ public static Orchestrator orchestrator = Category6Suite.ORCHESTRATOR;
+
+ @BeforeClass
+ public static void setUp() {
+ adminWsClient = newAdminWsClient(orchestrator);
+ enableOrganizationsSupport();
+ createOrganization(ORGANIZATION_FOO);
+ createOrganization(ORGANIZATION_BAR);
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ deleteOrganizationsIfExists(orchestrator, ORGANIZATION_FOO);
+ deleteOrganizationsIfExists(orchestrator, ORGANIZATION_BAR);
+ }
+
+ private static void createOrganization(String organization) {
+ adminWsClient.organizations().create(new CreateWsRequest.Builder().setKey(organization).setName(organization).build());
+ }
+
+ @Test
+ public void should_not_show_tags_of_other_org() {
+ updateTag("foo-tag", ORGANIZATION_FOO);
+ updateTag("bar-tag", ORGANIZATION_BAR);
+ assertThat(showRuleTags(ORGANIZATION_FOO)).containsExactly("foo-tag");
+ assertThat(showRuleTags(ORGANIZATION_BAR)).containsExactly("bar-tag");
+ }
+
+ @Test
+ public void should_not_list_tags_of_other_org() {
+ updateTag("foo-tag", ORGANIZATION_FOO);
+ updateTag("bar-tag", ORGANIZATION_BAR);
+ assertThat(listTags(ORGANIZATION_FOO))
+ .contains("foo-tag")
+ .doesNotContain("bar-tag");
+ }
+
+ @Test
+ public void should_not_show_removed_tags() {
+ updateTag("foo-tag", ORGANIZATION_FOO);
+ assertThat(showRuleTags(ORGANIZATION_FOO)).contains("foo-tag");
+
+ updateTag("", ORGANIZATION_FOO);
+ assertThat(showRuleTags(ORGANIZATION_FOO)).isEmpty();
+ }
+
+ @Test
+ public void should_not_list_removed_tags() {
+ updateTag("foo-tag", ORGANIZATION_FOO);
+ assertThat(listTags(ORGANIZATION_FOO)).contains("foo-tag");
+
+ updateTag("", ORGANIZATION_FOO);
+ assertThat(listTags(ORGANIZATION_FOO)).doesNotContain("foo-tag");
+ }
+
+ private List<String> listTags(String organization) {
+ String json = orchestrator.getServer().newHttpCall("/api/rules/tags")
+ .setParam("organization", organization)
+ .execute()
+ .getBodyAsString();
+ return (List<String>) ItUtils.jsonToMap(json).get("tags");
+ }
+
+ private List<String> showRuleTags(String organization) {
+ return newWsClient(orchestrator).rules().show(organization, "xoo:OneIssuePerFile")
+ .getRule().getTags().getTagsList();
+ }
+
+ private void updateTag(String tag, String organization) {
+ orchestrator.getServer().newHttpCall("/api/rules/update")
+ .setMethod(HttpMethod.POST)
+ .setAdminCredentials()
+ .setParam("organization", organization)
+ .setParam("key", "xoo:OneIssuePerFile")
+ .setParam("tags", tag)
+ .execute();
+ }
+}
+++ /dev/null
-/*
- * SonarQube
- * Copyright (C) 2009-2017 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 it.rule;
-
-public class ToDoTest {
-}
import static com.google.common.collect.ImmutableSet.copyOf;
import static com.google.common.collect.Sets.newHashSet;
import static java.util.Objects.requireNonNull;
+import static org.apache.commons.lang.RandomStringUtils.random;
import static org.apache.commons.lang.RandomStringUtils.randomAlphabetic;
import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric;
import static org.apache.commons.lang.math.RandomUtils.nextInt;
return RuleKey.of("repo_" + randomAlphanumeric(3), "rule_" + randomAlphanumeric(3));
}
+ public static RuleKey randomRuleKeyOfMaximumLength() {
+ return RuleKey.of(random(255), random(200));
+ }
+
public static Consumer<RuleDefinitionDto> setRepositoryKey(String repositoryKey) {
return rule -> rule.setRepositoryKey(repositoryKey);
}
@Override
public String getId() {
- // the Id is generated by elasticsearch
- return null;
+ return getRuleKey() + "|" + getScope().getScope();
}
@Override
}
private static IndexRequest newIndexRequest(RuleExtensionDoc ruleExtension) {
- return new IndexRequest(INDEX_TYPE_RULE_EXTENSION.getIndex(), INDEX_TYPE_RULE_EXTENSION.getType())
+ return new IndexRequest(INDEX_TYPE_RULE_EXTENSION.getIndex(), INDEX_TYPE_RULE_EXTENSION.getType(), ruleExtension.getId())
.source(ruleExtension.getFields())
.parent(ruleExtension.getParent());
}
*/
package org.sonar.server.rule.index;
+import com.google.common.collect.ImmutableSet;
import org.junit.Rule;
import org.junit.Test;
import org.sonar.api.config.MapSettings;
import org.sonar.db.DbClient;
import org.sonar.db.DbSession;
import org.sonar.db.DbTester;
+import org.sonar.db.organization.OrganizationDto;
import org.sonar.db.rule.RuleDefinitionDto;
import org.sonar.db.rule.RuleDto;
+import org.sonar.db.rule.RuleTesting;
import org.sonar.server.es.EsTester;
-import org.sonar.server.organization.TestDefaultOrganizationProvider;
import static com.google.common.collect.Sets.newHashSet;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.elasticsearch.index.query.QueryBuilders.termQuery;
public class RuleIndexerTest {
assertThat(esTester.countDocuments(RuleIndexDefinition.INDEX_TYPE_RULE)).isEqualTo(1);
}
+
+ @Test
+ public void index_rule_extension_with_long_id() {
+ RuleDefinitionDto rule = dbTester.rules().insert(r -> r.setRuleKey(RuleTesting.randomRuleKeyOfMaximumLength()));
+ underTest.indexRuleDefinition(rule.getKey());
+ OrganizationDto organization = dbTester.organizations().insert();
+ dbTester.rules().insertOrUpdateMetadata(rule, organization, m -> m.setTags(ImmutableSet.of("bla")));
+ underTest.indexRuleExtension(organization, rule.getKey());
+
+ RuleExtensionDoc doc = new RuleExtensionDoc()
+ .setRuleKey(rule.getKey())
+ .setScope(RuleExtensionScope.organization(organization.getUuid()));
+ assertThat(
+ esTester.client()
+ .prepareSearch(RuleIndexDefinition.INDEX_TYPE_RULE_EXTENSION)
+ .setQuery(termQuery("_id", doc.getId()))
+ .get()
+ .getHits()
+ .getHits()[0]
+ .getId()).isEqualTo(doc.getId());
+ }
}
*/
package org.sonarqube.ws.client.rule;
+import javax.annotation.Nullable;
+import org.sonarqube.ws.Rules;
import org.sonarqube.ws.Rules.SearchResponse;
import org.sonarqube.ws.client.BaseService;
import org.sonarqube.ws.client.GetRequest;
.setParam(PARAM_TYPES, inlineMultipleParamValue(request.getTypes())),
SearchResponse.parser());
}
+
+ public Rules.ShowResponse show(@Nullable String organization, String key) {
+ GetRequest request = new GetRequest(path("show"))
+ .setParam("organization", organization)
+ .setParam("key", key);
+ return call(request, Rules.ShowResponse.parser());
+ }
}
import java.util.List;
import org.junit.Rule;
import org.junit.Test;
+import org.sonarqube.ws.Rules;
import org.sonarqube.ws.Rules.SearchResponse;
import org.sonarqube.ws.client.GetRequest;
import org.sonarqube.ws.client.ServiceTester;
private RulesService underTest = serviceTester.getInstanceUnderTest();
@Test
- public void search() {
+ public void test_search() {
underTest.search(new SearchWsRequest()
.setActivation(ACTIVATION_VALUE)
.setActiveSeverities(ACTIVE_SEVERITIES_VALUE)
.hasParam(PARAM_TYPES, TYPES_VALUE_INLINED)
.andNoOtherParam();
}
+
+ @Test
+ public void test_show() {
+ underTest.show("the-org", "the-rule/key");
+
+ assertThat(serviceTester.getGetParser()).isSameAs(Rules.ShowResponse.parser());
+ GetRequest getRequest = serviceTester.getGetRequest();
+ serviceTester.assertThat(getRequest)
+ .hasPath("show")
+ .hasParam("organization", "the-org")
+ .hasParam("key", "the-rule/key")
+ .andNoOtherParam();
+ }
}
projects / sonarqube.git / commitdiff