]> source.dussan.org Git - sonarqube.git/commitdiff
SONAR-8857 improved it debugging
authorDaniel Schwarz <daniel.schwarz@sonarsource.com>
Tue, 28 Mar 2017 09:24:43 +0000 (11:24 +0200)
committerDaniel Schwarz <bartfastiel@users.noreply.github.com>
Tue, 28 Mar 2017 13:00:24 +0000 (15:00 +0200)
it/it-tests/src/test/java/it/qualityProfile/QualityProfilesRestoreAndSearchTest.java
it/it-tests/src/test/java/util/ItUtils.java

index 22306ee11a432d2d38eb1fb1eeedec0f97a77447..887fd2fd14f1523c485f14570e1dc2d15f242332 100644 (file)
@@ -25,18 +25,15 @@ import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonarqube.ws.QualityProfiles;
-import org.sonarqube.ws.client.WsClient;
 import org.sonarqube.ws.client.qualityprofile.SearchWsRequest;
 import util.ItUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static util.ItUtils.newAdminWsClient;
 
 public class QualityProfilesRestoreAndSearchTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
-  public WsClient adminWsClient = newAdminWsClient(orchestrator);
 
   @Before
   public void init() {
@@ -47,7 +44,6 @@ public class QualityProfilesRestoreAndSearchTest {
   public void restore_and_search_in_default_organization() {
     ItUtils.restoreProfile(orchestrator, getClass().getResource("/authorisation/one-issue-per-line-profile.xml"));
     QualityProfiles.SearchWsResponse results = ItUtils.newAdminWsClient(orchestrator).qualityProfiles().search(new SearchWsRequest());
-    System.out.println(results.getProfilesList());
     assertThat(results.getProfilesList())
       .filteredOn(result -> "xoo".equals(result.getLanguage()))
       .filteredOn(result -> "one-issue-per-line".equals(result.getName()))
index 6fb30345c28c1e223a4c19d268435d764636074a..f852643d8a09d14426e5f1b6c0c6c6fc892eb140 100644 (file)
@@ -345,23 +345,19 @@ public class ItUtils {
   }
 
   public static void restoreProfile(Orchestrator orchestrator, URL resource, String organization) {
-    newAdminWsClient(orchestrator)
-      .qualityProfiles()
-      .restoreProfile(
-        RestoreWsRequest.builder()
-          .setBackup(resourceToFile(resource))
-          .setOrganization(organization)
-          .build());
-  }
-
-  private static File resourceToFile(URL resource) {
     URI uri;
     try {
       uri = resource.toURI();
     } catch (URISyntaxException e) {
       throw new IllegalArgumentException("Cannot find quality profile xml file '" + resource + "' in classpath");
     }
-    return new File(uri);
+    newAdminWsClient(orchestrator)
+      .qualityProfiles()
+      .restoreProfile(
+        RestoreWsRequest.builder()
+          .setBackup(new File(uri))
+          .setOrganization(organization)
+          .build());
   }
 
   public static class ComponentNavigation {