From 0494862ce580f38df2381e6281f621ef7f98e2c6 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 1 Jun 2017 22:44:20 +0300 Subject: [PATCH] Minor: Move Android Extensions compiler plugin tests to some other package --- .../org/jetbrains/kotlin/generators/tests/GenerateTests.kt | 6 +++--- .../synthetic}/test/AbstractAndroidBoxTest.kt | 4 ++-- .../synthetic}/test/AbstractAndroidBytecodeShapeTest.kt | 4 ++-- .../test/AbstractAndroidSyntheticPropertyDescriptorTest.kt | 4 ++-- .../synthetic}/test/AndroidBoxTestGenerated.java | 2 +- .../synthetic}/test/AndroidBytecodeShapeTestGenerated.java | 2 +- .../AndroidSyntheticPropertyDescriptorTestGenerated.java | 2 +- .../android => android/synthetic}/test/CompilerTestUtils.kt | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) rename plugins/plugins-tests/tests/org/jetbrains/kotlin/{lang/resolve/android => android/synthetic}/test/AbstractAndroidBoxTest.kt (97%) rename plugins/plugins-tests/tests/org/jetbrains/kotlin/{lang/resolve/android => android/synthetic}/test/AbstractAndroidBytecodeShapeTest.kt (94%) rename plugins/plugins-tests/tests/org/jetbrains/kotlin/{lang/resolve/android => android/synthetic}/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt (96%) rename plugins/plugins-tests/tests/org/jetbrains/kotlin/{lang/resolve/android => android/synthetic}/test/AndroidBoxTestGenerated.java (99%) rename plugins/plugins-tests/tests/org/jetbrains/kotlin/{lang/resolve/android => android/synthetic}/test/AndroidBytecodeShapeTestGenerated.java (99%) rename plugins/plugins-tests/tests/org/jetbrains/kotlin/{lang/resolve/android => android/synthetic}/test/AndroidSyntheticPropertyDescriptorTestGenerated.java (99%) rename plugins/plugins-tests/tests/org/jetbrains/kotlin/{lang/resolve/android => android/synthetic}/test/CompilerTestUtils.kt (97%) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 1abbe1675a1..f600ebe20eb 100755 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -157,9 +157,9 @@ import org.jetbrains.kotlin.jvm.runtime.AbstractJvmRuntimeDescriptorLoaderTest import org.jetbrains.kotlin.kapt3.test.AbstractClassFileToSourceStubConverterTest import org.jetbrains.kotlin.kapt3.test.AbstractKotlinKaptContextTest import org.jetbrains.kotlin.kdoc.AbstractKDocLexerTest -import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidBoxTest -import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidBytecodeShapeTest -import org.jetbrains.kotlin.lang.resolve.android.test.AbstractAndroidSyntheticPropertyDescriptorTest +import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidBoxTest +import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidBytecodeShapeTest +import org.jetbrains.kotlin.android.synthetic.test.AbstractAndroidSyntheticPropertyDescriptorTest import org.jetbrains.kotlin.modules.xml.AbstractModuleXmlParserTest import org.jetbrains.kotlin.multiplatform.AbstractMultiPlatformIntegrationTest import org.jetbrains.kotlin.noarg.AbstractBlackBoxCodegenTestForNoArg diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidBoxTest.kt similarity index 97% rename from plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidBoxTest.kt index 6fe96740402..5d1a8457350 100755 --- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBoxTest.kt +++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidBoxTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.lang.resolve.android.test +package org.jetbrains.kotlin.android.synthetic.test import com.intellij.openapi.util.io.FileUtil import com.intellij.util.ArrayUtil diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidBytecodeShapeTest.kt similarity index 94% rename from plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidBytecodeShapeTest.kt index fa432986322..24ec6d5d7ea 100755 --- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidBytecodeShapeTest.kt +++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidBytecodeShapeTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.lang.resolve.android.test +package org.jetbrains.kotlin.android.synthetic.test import org.jetbrains.kotlin.codegen.AbstractBytecodeTextTest import org.jetbrains.kotlin.config.CompilerConfiguration diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt similarity index 96% rename from plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt index 43607563ab8..e5026dc1818 100755 --- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt +++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidSyntheticPropertyDescriptorTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.lang.resolve.android.test +package org.jetbrains.kotlin.android.synthetic.test import org.jetbrains.kotlin.android.synthetic.res.AndroidPackageFragmentProviderExtension import org.jetbrains.kotlin.android.synthetic.res.AndroidSyntheticPackageFragmentProvider diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidBoxTestGenerated.java similarity index 99% rename from plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidBoxTestGenerated.java index 2f5ed48f585..f7aefea221c 100644 --- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java +++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidBoxTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.lang.resolve.android.test; +package org.jetbrains.kotlin.android.synthetic.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidBytecodeShapeTestGenerated.java similarity index 99% rename from plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidBytecodeShapeTestGenerated.java index cccaf2a0be9..627fb720840 100644 --- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java +++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidBytecodeShapeTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.lang.resolve.android.test; +package org.jetbrains.kotlin.android.synthetic.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidSyntheticPropertyDescriptorTestGenerated.java b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidSyntheticPropertyDescriptorTestGenerated.java similarity index 99% rename from plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidSyntheticPropertyDescriptorTestGenerated.java rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidSyntheticPropertyDescriptorTestGenerated.java index b8b4d61829b..6e0fafcfa50 100644 --- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidSyntheticPropertyDescriptorTestGenerated.java +++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/AndroidSyntheticPropertyDescriptorTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.lang.resolve.android.test; +package org.jetbrains.kotlin.android.synthetic.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/CompilerTestUtils.kt similarity index 97% rename from plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt rename to plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/CompilerTestUtils.kt index 742836d6905..1e459f81a9f 100755 --- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/lang/resolve/android/test/CompilerTestUtils.kt +++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/android/synthetic/test/CompilerTestUtils.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.lang.resolve.android.test +package org.jetbrains.kotlin.android.synthetic.test import com.intellij.testFramework.registerServiceInstance import org.jetbrains.kotlin.android.synthetic.AndroidConfigurationKeys