From 768fcde6f106261e61ba2e80b7ceaa02d1b6e5cc Mon Sep 17 00:00:00 2001
From: Nikita Skvortsov <nikita.skvortsov@jetbrains.com>
Date: Wed, 6 Mar 2019 13:54:18 +0300
Subject: [PATCH] code cleanup by review IDEA-CR-44495

---
 .../gradle/importing/GradleCompositeImportingTest.java    | 7 -------
 .../gradle/importing/GradleDependenciesImportingTest.java | 2 --
 .../gradle/tooling/builder/AbstractModelBuilderTest.java  | 8 ++------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleCompositeImportingTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleCompositeImportingTest.java
index 13ccc6ae1d3c..37b0b8e3ba80 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleCompositeImportingTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleCompositeImportingTest.java
@@ -391,7 +391,6 @@ public class GradleCompositeImportingTest extends GradleImportingTestCase {
     createProjectSubFile("project-a/build.gradle", "");
 
     importProject(new GradleBuildScriptBuilderEx()
-                    .withIdeaPlugin()
                     .addPostfix("apply plugin: 'java-library'",
                                 "group = 'myGroup'",
                                 "version = '1.0-SNAPSHOT'",
@@ -425,9 +424,6 @@ public class GradleCompositeImportingTest extends GradleImportingTestCase {
                            .addPostfix(
                              "group = 'myGroup'",
                              "version = '1.0-SNAPSHOT'",
-                             "repositories {",
-                             "    mavenCentral()",
-                             "}",
                              "sourceSets {",
                              "    util {",
                              "        java.srcDir 'src/util/java'",
@@ -457,9 +453,6 @@ public class GradleCompositeImportingTest extends GradleImportingTestCase {
                     .withJavaPlugin()
                     .addPostfix("group = 'myGroup'",
                                 "version = '1.0-SNAPSHOT'",
-                                "repositories {",
-                                "    mavenCentral()",
-                                "}",
                                 "dependencies {",
                                 "    compile group: 'myGroup', name: 'project-a', version: '1.0-SNAPSHOT'",
                                 "}"
diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
index 03770da8c373..6a1f918fd8a8 100644
--- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
+++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
@@ -885,9 +885,7 @@ public class GradleDependenciesImportingTest extends GradleImportingTestCase {
   }
 
   @Test
-  //@TargetVersions("5.2+")
   public void testDependencyOnDefaultConfigurationWithAdditionalArtifact() throws Exception {
-    //GradleSystemSettings.getInstance().setGradleVmOptions("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005");
     createSettingsFile("include 'project1', 'project2'");
     createProjectSubFile("project1/build.gradle",
                          new GradleBuildScriptBuilderEx()
diff --git a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
index 25c22cf61127..3a2c0a454f9c 100644
--- a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
+++ b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
@@ -32,12 +32,8 @@ import org.gradle.tooling.model.DomainObjectSet;
 import org.gradle.tooling.model.idea.IdeaModule;
 import org.gradle.util.GradleVersion;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.plugins.gradle.model.BuildScriptClasspathModel;
-import org.jetbrains.plugins.gradle.model.ClasspathEntryModel;
-import org.jetbrains.plugins.gradle.model.ExternalProject;
-import org.jetbrains.plugins.gradle.model.ProjectImportAction;
+import org.jetbrains.plugins.gradle.model.*;
 import org.jetbrains.plugins.gradle.service.execution.GradleExecutionHelper;
-import org.jetbrains.plugins.gradle.model.ClassSetProjectImportExtraModelProvider;
 import org.jetbrains.plugins.gradle.tooling.VersionMatcherRule;
 import org.jetbrains.plugins.gradle.util.GradleConstants;
 import org.junit.After;
@@ -72,7 +68,7 @@ public abstract class AbstractModelBuilderTest {
     {"2.6"}, /*{"2.7"}, {"2.8"}, {"2.9"}, {"2.10"}, {"2.11"}, {"2.12"}, {"2.13"}, */{"2.14.1"},
     {"3.0"}, /*{"3.1"}, {"3.2"}, {"3.3"}, {"3.4"},*/ {"3.5"},
     {"4.0"}, /*{"4.1"}, {"4.2"}, {"4.3"}, {"4.4"}, {"4.5.1"}, {"4.6"}, {"4.7"}, {"4.8"}, {"4.9"},*/ {"4.10.3"},
-    {"5.0"}, /*{"5.1"},*/ {"5.2.1"}
+    {"5.0"}, /*{"5.1"},*/ {"5.2.1"}, {"5.3-rc-1"}
   };
   public static final String BASE_GRADLE_VERSION = String.valueOf(SUPPORTED_GRADLE_VERSIONS[SUPPORTED_GRADLE_VERSIONS.length - 1][0]);