Uast: all Kotlin versions of org.jetbrains.uast.test.* moved to org.jetbrains.uast.test.*.kotlin

To avoid having same class names in Kotlin and IDEA

plugins/uast-kotlin/tests/AbstractKotlinIdentifiersTest.kt

@@ -1,6 +1,6 @@
 package org.jetbrains.uast.test.kotlin
 
-import org.jetbrains.uast.test.common.IdentifiersTestBase
+import org.jetbrains.uast.test.common.kotlin.IdentifiersTestBase
 import java.io.File
 
 

plugins/uast-kotlin/tests/AbstractKotlinRenderLogTest.kt

@@ -20,7 +20,7 @@ import org.jetbrains.uast.kotlin.JvmDeclarationUElementPlaceholder
 import org.jetbrains.uast.kotlin.KOTLIN_CACHED_UELEMENT_KEY
 import org.jetbrains.uast.kotlin.KotlinUastLanguagePlugin
 import org.jetbrains.uast.sourcePsiElement
-import org.jetbrains.uast.test.common.RenderLogTestBase
+import org.jetbrains.uast.test.common.kotlin.RenderLogTestBase
 import org.jetbrains.uast.visitor.UastVisitor
 import org.junit.Assert
 import java.io.File

plugins/uast-kotlin/tests/AbstractKotlinTypesTest.kt

@@ -1,6 +1,6 @@
 package org.jetbrains.uast.test.kotlin
 
-import org.jetbrains.uast.test.common.TypesTestBase
+import org.jetbrains.uast.test.common.kotlin.TypesTestBase
 import java.io.File
 
 abstract class AbstractKotlinTypesTest : AbstractKotlinUastTest(), TypesTestBase {

plugins/uast-kotlin/tests/AbstractKotlinUastTest.kt

@@ -30,8 +30,8 @@ import org.jetbrains.uast.kotlin.KotlinUastResolveProviderService
 import org.jetbrains.uast.kotlin.evaluation.KotlinEvaluatorExtension
 import org.jetbrains.uast.kotlin.internal.CliKotlinUastResolveProviderService
 import org.jetbrains.uast.kotlin.internal.UastAnalysisHandlerExtension
-import org.jetbrains.uast.test.env.AbstractCoreEnvironment
+import org.jetbrains.uast.test.env.kotlin.AbstractCoreEnvironment
-import org.jetbrains.uast.test.env.AbstractUastTest
+import org.jetbrains.uast.test.env.kotlin.AbstractUastTest
 import java.io.File
 
 abstract class AbstractKotlinUastTest : AbstractUastTest() {

plugins/uast-kotlin/tests/AbstractKotlinValuesTest.kt

@@ -1,6 +1,6 @@
 package org.jetbrains.uast.test.kotlin
 
-import org.jetbrains.uast.test.common.ValuesTestBase
+import org.jetbrains.uast.test.common.kotlin.ValuesTestBase
 import java.io.File
 
 abstract class AbstractKotlinValuesTest : AbstractKotlinUastTest(), ValuesTestBase {

plugins/uast-kotlin/tests/KotlinDetachedUastTest.kt

@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.psi.psiUtil.findDescendantOfType
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 import org.jetbrains.uast.*
-import org.jetbrains.uast.test.env.findUElementByTextFromPsi
+import org.jetbrains.uast.test.env.kotlin.findUElementByTextFromPsi
 
 class KotlinDetachedUastTest : KotlinLightCodeInsightFixtureTestCase() {
 

plugins/uast-kotlin/tests/KotlinUastApiTest.kt

@@ -12,8 +12,8 @@ import org.jetbrains.kotlin.utils.addToStdlib.cast
 import org.jetbrains.kotlin.utils.sure
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kotlin.KotlinUastLanguagePlugin
-import org.jetbrains.uast.test.env.findElementByText
+import org.jetbrains.uast.test.env.kotlin.findElementByText
-import org.jetbrains.uast.test.env.findElementByTextFromPsi
+import org.jetbrains.uast.test.env.kotlin.findElementByTextFromPsi
 import org.jetbrains.uast.visitor.AbstractUastVisitor
 import org.junit.Assert
 import org.junit.Test

plugins/uast-kotlin/tests/KotlinUastResolveApiTest.kt

@@ -16,9 +16,9 @@ import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UQualifiedReferenceExpression
 import org.jetbrains.uast.getContainingUMethod
 import org.jetbrains.uast.kotlin.KotlinUFunctionCallExpression
-import org.jetbrains.uast.test.env.findElementByText
+import org.jetbrains.uast.test.env.kotlin.findElementByText
-import org.jetbrains.uast.test.env.findElementByTextFromPsi
+import org.jetbrains.uast.test.env.kotlin.findElementByTextFromPsi
-import org.jetbrains.uast.test.env.findUElementByTextFromPsi
+import org.jetbrains.uast.test.env.kotlin.findUElementByTextFromPsi
 import org.jetbrains.uast.toUElement
 
 class KotlinUastResolveApiTest : KotlinLightCodeInsightFixtureTestCase() {

plugins/uast-kotlin/tests/KotlinUastResolveApiTest.kt.182

@@ -11,7 +11,7 @@ import junit.framework.TestCase
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.uast.UQualifiedReferenceExpression
-import org.jetbrains.uast.test.env.findUElementByTextFromPsi
+import org.jetbrains.uast.test.env.kotlin.findUElementByTextFromPsi
 
 class KotlinUastResolveApiTest : KotlinLightCodeInsightFixtureTestCase() {
 

plugins/uast-kotlin/tests/KotlinUastResolveTest.kt

@@ -1,7 +1,7 @@
 package org.jetbrains.uast.test.kotlin
 
 import org.jetbrains.uast.UFile
-import org.jetbrains.uast.test.common.ResolveTestBase
+import org.jetbrains.uast.test.common.kotlin.ResolveTestBase
 import org.junit.Test
 
 class KotlinUastResolveTest : AbstractKotlinUastTest(), ResolveTestBase {

plugins/uast-kotlin/tests/org/jetbrains/uast/test/common/kotlin/IdentifiersTestBase.kt

@@ -3,14 +3,14 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.uast.test.common
+package org.jetbrains.uast.test.common.kotlin
 
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiElementVisitor
 import org.jetbrains.kotlin.psi.KtBlockExpression
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.uast.*
-import org.jetbrains.uast.test.env.assertEqualsToFile
+import org.jetbrains.uast.test.env.kotlin.assertEqualsToFile
 import org.jetbrains.uast.visitor.AbstractUastVisitor
 import org.junit.ComparisonFailure
 import java.io.File

plugins/uast-kotlin/tests/org/jetbrains/uast/test/common/kotlin/RenderLogTestBase.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.uast.test.common
+package org.jetbrains.uast.test.common.kotlin
 
 import org.jetbrains.uast.UFile
 import org.jetbrains.uast.asRecursiveLogString
-import org.jetbrains.uast.test.env.assertEqualsToFile
+import org.jetbrains.uast.test.env.kotlin.assertEqualsToFile
 import java.io.File
 
 interface RenderLogTestBase {

plugins/uast-kotlin/tests/org/jetbrains/uast/test/common/kotlin/ResolveTestBase.kt

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.uast.test.common
+package org.jetbrains.uast.test.common.kotlin
 
 import com.intellij.psi.PsiNamedElement
 import org.jetbrains.uast.UFile
 import org.jetbrains.uast.UResolvable
-import org.jetbrains.uast.test.env.findElementByText
+import org.jetbrains.uast.test.env.kotlin.findElementByText
 import org.junit.Assert.assertEquals
 
 interface ResolveTestBase {

plugins/uast-kotlin/tests/org/jetbrains/uast/test/common/kotlin/TypesTestBase.kt

@@ -1,25 +1,14 @@
 /*
- * Copyright 2010-2017 JetBrains s.r.o.
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- *
+ * that can be found in the license/LICENSE.txt file.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
-package org.jetbrains.uast.test.common
+package org.jetbrains.uast.test.common.kotlin
 
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UExpression
 import org.jetbrains.uast.UFile
-import org.jetbrains.uast.test.env.assertEqualsToFile
+import org.jetbrains.uast.test.env.kotlin.assertEqualsToFile
 import org.jetbrains.uast.visitor.UastVisitor
 import java.io.File
 

plugins/uast-kotlin/tests/org/jetbrains/uast/test/common/kotlin/ValuesTestBase.kt

@@ -1,20 +1,9 @@
 /*
- * Copyright 2010-2017 JetBrains s.r.o.
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- *
+ * that can be found in the license/LICENSE.txt file.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
-package org.jetbrains.uast.test.common
+package org.jetbrains.uast.test.common.kotlin
 
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.UExpression
@@ -22,7 +11,7 @@ import org.jetbrains.uast.UFile
 import org.jetbrains.uast.evaluation.UEvaluationContext
 import org.jetbrains.uast.evaluation.UEvaluatorExtension
 import org.jetbrains.uast.evaluation.analyzeAll
-import org.jetbrains.uast.test.env.assertEqualsToFile
+import org.jetbrains.uast.test.env.kotlin.assertEqualsToFile
 import org.jetbrains.uast.visitor.UastVisitor
 import java.io.File
 

plugins/uast-kotlin/tests/org/jetbrains/uast/test/env/kotlin/AbstractCoreEnvironment.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.uast.test.env
+package org.jetbrains.uast.test.env.kotlin
 
 import com.intellij.mock.MockProject
 import java.io.File

plugins/uast-kotlin/tests/org/jetbrains/uast/test/env/kotlin/AbstractTestWithCoreEnvironment.kt

@@ -1,20 +1,9 @@
 /*
- * Copyright 2010-2017 JetBrains s.r.o.
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- *
+ * that can be found in the license/LICENSE.txt file.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
-package org.jetbrains.uast.test.env
+package org.jetbrains.uast.test.env.kotlin
 
 import com.intellij.core.CoreApplicationEnvironment
 import com.intellij.mock.MockProject

plugins/uast-kotlin/tests/org/jetbrains/uast/test/env/kotlin/AbstractUastTest.kt

@@ -1,20 +1,9 @@
 /*
- * Copyright 2010-2017 JetBrains s.r.o.
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- *
+ * that can be found in the license/LICENSE.txt file.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
-package org.jetbrains.uast.test.env
+package org.jetbrains.uast.test.env.kotlin
 
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiElement