SONAR-8857 make ws/qualityprofiles/inheritance organization aware

diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileNameTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileNameTest.java
deleted file mode 100644 (file)
index 5c8e39a..0000000
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileNameTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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 org.sonar.server.qualityprofile;
-
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class QProfileNameTest {
-
-  @Test
-  public void equals_and_hashcode() {
-    QProfileName xooP1 = new QProfileName("xoo", "p1");
-    assertThat(xooP1).isEqualTo(xooP1);
-    assertThat(xooP1).isNotEqualTo(new QProfileName("xoo", "p2"));
-    assertThat(xooP1).isNotEqualTo("xxx");
-    assertThat(xooP1).isNotEqualTo(null);
-
-    // same name but different lang
-    assertThat(xooP1).isNotEqualTo(new QProfileName("other_lang", "p1"));
-
-    assertThat(xooP1.hashCode()).isEqualTo(xooP1.hashCode());
-  }
-
-  @Test
-  public void to_string() {
-    assertThat(new QProfileName("xoo", "p1").toString()).isEqualTo("{lang=xoo, name=p1}");
-  }
-}

diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchDataLoaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchDataLoaderTest.java
index 4ea4b7984e66598bfddc2862516c323147a93cce..28339f67460cf5fb7fe8c0ecb7935710dc49d948 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchDataLoaderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchDataLoaderTest.java
@@ -40,6 +40,7 @@ import org.sonar.server.component.ComponentFinder;
 import org.sonar.server.language.LanguageTesting;
 import org.sonar.server.organization.TestDefaultOrganizationProvider;
 import org.sonar.server.qualityprofile.QProfileLookup;
+import org.sonar.server.qualityprofile.QProfileFactory;
 import org.sonarqube.ws.client.qualityprofile.SearchWsRequest;
 
 import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric;