Remove gradle testing import from gradle 3.x
This commit is contained in:
-4
@@ -20,10 +20,6 @@ import org.junit.Test
|
|||||||
class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() {
|
class HierarchicalMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() {
|
||||||
private fun kotlinVersion() = if (gradleKotlinPluginVersion == MINIMAL_SUPPORTED_VERSION) "1.3.50" else gradleKotlinPluginVersion
|
private fun kotlinVersion() = if (gradleKotlinPluginVersion == MINIMAL_SUPPORTED_VERSION) "1.3.50" else gradleKotlinPluginVersion
|
||||||
|
|
||||||
override fun isApplicableTest(): Boolean {
|
|
||||||
return !gradleVersion.startsWith("3.")
|
|
||||||
}
|
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
fun saveSdksBeforeTest() {
|
fun saveSdksBeforeTest() {
|
||||||
val kotlinSdks = sdkCreationChecker?.getKotlinSdks() ?: emptyList()
|
val kotlinSdks = sdkCreationChecker?.getKotlinSdks() ?: emptyList()
|
||||||
|
|||||||
-4
@@ -52,10 +52,6 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
|
|||||||
assert(getModule(moduleName).getModuleWithDependenciesAndLibrariesScope(true).contains(file))
|
assert(getModule(moduleName).getModuleWithDependenciesAndLibrariesScope(true).contains(file))
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun isApplicableTest(): Boolean {
|
|
||||||
return shouldRunTest(gradleKotlinPluginVersion, gradleVersion)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testPlatformToCommonDependency() {
|
fun testPlatformToCommonDependency() {
|
||||||
val files = configureByFiles()
|
val files = configureByFiles()
|
||||||
|
|||||||
-11
@@ -5,15 +5,4 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.gradle
|
package org.jetbrains.kotlin.gradle
|
||||||
|
|
||||||
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase.Companion.MINIMAL_SUPPORTED_VERSION
|
|
||||||
|
|
||||||
//BUNCH 181
|
|
||||||
fun MultiplatformProjectImportingTest.shouldRunTest(kotlinPluginVersion: String, gradleVersion: String): Boolean {
|
|
||||||
return MINIMAL_SUPPORTED_VERSION == kotlinPluginVersion
|
|
||||||
}
|
|
||||||
|
|
||||||
fun NewMultiplatformProjectImportingTest.shouldRunTest(kotlinPluginVersion: String, gradleVersion: String): Boolean {
|
|
||||||
return !gradleVersion.startsWith("3.")
|
|
||||||
}
|
|
||||||
|
|
||||||
fun KaptImportingTest.isAndroidStudio() = false
|
fun KaptImportingTest.isAndroidStudio() = false
|
||||||
-5
@@ -36,11 +36,6 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun isApplicableTest(): Boolean {
|
|
||||||
return shouldRunTest(gradleKotlinPluginVersion, gradleVersion)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testProjectDependency() {
|
fun testProjectDependency() {
|
||||||
configureByFiles()
|
configureByFiles()
|
||||||
|
|||||||
-5
@@ -39,11 +39,6 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun isApplicableTest(): Boolean {
|
|
||||||
return shouldRunTest(gradleKotlinPluginVersion, gradleVersion)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testProjectDependency() {
|
fun testProjectDependency() {
|
||||||
configureByFiles()
|
configureByFiles()
|
||||||
|
|||||||
+1
-1
@@ -61,7 +61,7 @@ import static org.junit.Assume.assumeThat;
|
|||||||
@RunWith(value = Parameterized.class)
|
@RunWith(value = Parameterized.class)
|
||||||
public abstract class AbstractModelBuilderTest {
|
public abstract class AbstractModelBuilderTest {
|
||||||
|
|
||||||
public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"3.5"}, {"4.9"}};
|
public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"4.9"}};
|
||||||
|
|
||||||
private static final Pattern TEST_METHOD_NAME_PATTERN = Pattern.compile("(.*)\\[(\\d*: with Gradle-.*)\\]");
|
private static final Pattern TEST_METHOD_NAME_PATTERN = Pattern.compile("(.*)\\[(\\d*: with Gradle-.*)\\]");
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -60,7 +60,7 @@ import static org.junit.Assume.assumeThat;
|
|||||||
@RunWith(value = Parameterized.class)
|
@RunWith(value = Parameterized.class)
|
||||||
public abstract class AbstractModelBuilderTest {
|
public abstract class AbstractModelBuilderTest {
|
||||||
|
|
||||||
public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"3.5"}, {"4.9"}};
|
public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"4.9"}};
|
||||||
|
|
||||||
private static final Pattern TEST_METHOD_NAME_PATTERN = Pattern.compile("(.*)\\[(\\d*: with Gradle-.*)\\]");
|
private static final Pattern TEST_METHOD_NAME_PATTERN = Pattern.compile("(.*)\\[(\\d*: with Gradle-.*)\\]");
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -60,7 +60,7 @@ import static org.junit.Assume.assumeThat;
|
|||||||
@RunWith(value = Parameterized.class)
|
@RunWith(value = Parameterized.class)
|
||||||
public abstract class AbstractModelBuilderTest {
|
public abstract class AbstractModelBuilderTest {
|
||||||
|
|
||||||
public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"3.5"}, {"4.9"}};
|
public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {{"4.9"}};
|
||||||
|
|
||||||
private static final Pattern TEST_METHOD_NAME_PATTERN = Pattern.compile("(.*)\\[(\\d*: with Gradle-.*)\\]");
|
private static final Pattern TEST_METHOD_NAME_PATTERN = Pattern.compile("(.*)\\[(\\d*: with Gradle-.*)\\]");
|
||||||
|
|
||||||
|
|||||||
-34
@@ -355,26 +355,6 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@TargetVersions("3.5")
|
|
||||||
@Test
|
|
||||||
fun testAddLibraryGSKWithKotlinVersion() {
|
|
||||||
val files = importProjectFromTestData()
|
|
||||||
|
|
||||||
runInEdtAndWait {
|
|
||||||
myTestFixture.project.executeWriteCommand("") {
|
|
||||||
val stdLibVersion = KotlinWithGradleConfigurator.getKotlinStdlibVersion(myTestFixture.module)
|
|
||||||
KotlinWithGradleConfigurator.addKotlinLibraryToModule(
|
|
||||||
myTestFixture.module,
|
|
||||||
DependencyScope.COMPILE,
|
|
||||||
object : ExternalLibraryDescriptor("org.jetbrains.kotlin", "kotlin-reflect", stdLibVersion, stdLibVersion) {
|
|
||||||
override fun getLibraryClassesRoots() = emptyList<String>()
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
checkFiles(files)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testAddTestLibraryGSK() {
|
fun testAddTestLibraryGSK() {
|
||||||
val files = importProjectFromTestData()
|
val files = importProjectFromTestData()
|
||||||
@@ -457,20 +437,6 @@ class GradleConfiguratorTest : GradleImportingTestCase() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@TargetVersions("3.5")
|
|
||||||
@Test
|
|
||||||
fun testChangeCoroutinesSupportGSK() {
|
|
||||||
val files = importProjectFromTestData()
|
|
||||||
|
|
||||||
runInEdtAndWait {
|
|
||||||
myTestFixture.project.executeWriteCommand("") {
|
|
||||||
KotlinWithGradleConfigurator.changeCoroutineConfiguration(myTestFixture.module, "enable")
|
|
||||||
}
|
|
||||||
|
|
||||||
checkFiles(files)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@TargetVersions("4.4+")
|
@TargetVersions("4.4+")
|
||||||
@Test
|
@Test
|
||||||
fun testChangeCoroutinesSupportGSK49() {
|
fun testChangeCoroutinesSupportGSK49() {
|
||||||
|
|||||||
Reference in New Issue
Block a user