From 9e22c29825c10cbaed65f363688aed841b0b65c4 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 22 Jan 2014 20:08:45 +0400 Subject: [PATCH] Moved general JPS test data to common directory. --- .../jetbrains/jet/jps/build/KotlinJpsBuildTest.java | 2 +- .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../module2/module2.iml | 0 .../module2/src/JSecond.java | 0 .../src/JFirst.java | 0 .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../module2/module2.iml | 0 .../module2/src/JSecond.java | 0 .../module2/src/kt1.kt | 0 .../src/JFirst.java | 0 .../src/kt2.kt | 0 .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../src/Excluded.kt | 0 .../src/dir/YetAnotherExcluded.kt | 0 .../ExcludeFileUsingCompilerSettings/src/dir/bar.kt | 0 .../ExcludeFileUsingCompilerSettings/src/foo.kt | 0 .../ExcludeFolderInSourceRoot/kotlinProject.iml | 0 .../ExcludeFolderInSourceRoot/kotlinProject.ipr | 0 .../src/exclude/Excluded.kt | 0 .../ExcludeFolderInSourceRoot/src/foo.kt | 0 .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../src/dir/Excluded.kt | 0 .../src/dir/subdir/YetAnotherExcluded.kt | 0 .../src/dir/subdir/bar.kt | 0 .../src/foo.kt | 0 .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../src/bar.kt | 0 .../src/exclude/Excluded.kt | 0 .../src/exclude/YetAnotherExcluded.kt | 0 .../src/exclude/subdir/Excluded.kt | 0 .../src/exclude/subdir/YetAnotherExcluded.kt | 0 .../src/foo.kt | 0 .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../src/foo.kt | 0 .../src/module2/module2.iml | 0 .../src/module2/src/foo.kt | 0 .../JKJInheritanceProject}/kotlinProject.iml | 2 +- .../JKJInheritanceProject/kotlinProject.ipr | 0 .../JKJInheritanceProject/src/java/JFirst.java | 0 .../JKJInheritanceProject/src/java/JSecond.java | 0 .../JKJInheritanceProject/src/kotlin/KFirst.kt | 0 .../JKJProject}/kotlinProject.iml | 0 .../{ => general}/JKJProject/kotlinProject.ipr | 0 .../{ => general}/JKJProject/src/java/JFirst.java | 0 .../{ => general}/JKJProject/src/java/JSecond.java | 0 .../{ => general}/JKJProject/src/kotlin/KFirst.kt | 0 .../KJCircularProject/kotlinProject.iml | 0 .../KJCircularProject/kotlinProject.ipr | 0 .../KJCircularProject/src/java/JFirst.java | 0 .../KJCircularProject/src/kotlin/KFirst.kt | 0 .../KJKInheritanceProject/kotlinProject.iml | 0 .../KJKInheritanceProject/kotlinProject.ipr | 0 .../KJKInheritanceProject/src/java/JFirst.java | 0 .../KJKInheritanceProject/src/kotlin/KFirst.kt | 0 .../KJKInheritanceProject/src/kotlin/KSecond.kt | 0 .../{ => general}/KJKProject/kotlinProject.iml | 0 .../{ => general}/KJKProject/kotlinProject.ipr | 0 .../{ => general}/KJKProject/src/java/JFirst.java | 0 .../{ => general}/KJKProject/src/kotlin/KFirst.kt | 0 .../{ => general}/KJKProject/src/kotlin/KSecond.kt | 0 .../KotlinJavaProject/kotlinProject.iml | 0 .../KotlinJavaProject/kotlinProject.ipr | 0 .../{ => general}/KotlinJavaProject/src/Test.java | 0 .../KotlinJavaProject/src/kotlinFile.kt | 0 .../{ => general}/KotlinProject/kotlinProject.iml | 0 .../{ => general}/KotlinProject/kotlinProject.ipr | 0 .../{ => general}/KotlinProject/src/test1.kt | 0 .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../KotlinProjectTwoFilesInOnePackage/src/test1.kt | 0 .../KotlinProjectTwoFilesInOnePackage/src/test2.kt | 0 .../{ => general}/ManyFiles/kotlinProject.iml | 0 .../{ => general}/ManyFiles/kotlinProject.ipr | 0 .../testData/{ => general}/ManyFiles/src/Bar.kt | 0 .../testData/{ => general}/ManyFiles/src/boo.kt | 0 .../testData/{ => general}/ManyFiles/src/main.kt | 0 .../ReexportedDependency/kotlinProject.iml | 0 .../ReexportedDependency/kotlinProject.ipr | 0 .../ReexportedDependency/module2/lib/j/J.class | Bin .../ReexportedDependency/module2/lib/j/J.java | 0 .../module2/lib/j/annotations.xml | 0 .../ReexportedDependency/module2/module2.iml | 0 .../ReexportedDependency/module2/src/JSecond.java | 0 .../ReexportedDependency/module2/src/my.kt | 0 .../ReexportedDependency/module3/module3.iml | 0 .../ReexportedDependency/module3/src/m3.kt | 0 .../{ => general}/ReexportedDependency/src/main.kt | 0 .../TestDependencyLibrary/kotlinProject.iml | 0 .../TestDependencyLibrary/kotlinProject.ipr | 0 .../{ => general}/TestDependencyLibrary/src/src.kt | 0 .../TestDependencyLibrary/test/test.kt | 0 97 files changed, 2 insertions(+), 2 deletions(-) rename jps-plugin/testData/{ => general}/CircularDependenciesNoKotlinFiles/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/CircularDependenciesNoKotlinFiles/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/CircularDependenciesNoKotlinFiles/module2/module2.iml (100%) rename jps-plugin/testData/{ => general}/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java (100%) rename jps-plugin/testData/{ => general}/CircularDependenciesNoKotlinFiles/src/JFirst.java (100%) rename jps-plugin/testData/{ => general}/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/CircularDependenciesWithKotlinFilesDifferentPackages/module2/module2.iml (100%) rename jps-plugin/testData/{ => general}/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/JSecond.java (100%) rename jps-plugin/testData/{ => general}/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/kt1.kt (100%) rename jps-plugin/testData/{ => general}/CircularDependenciesWithKotlinFilesDifferentPackages/src/JFirst.java (100%) rename jps-plugin/testData/{ => general}/CircularDependenciesWithKotlinFilesDifferentPackages/src/kt2.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeFileUsingCompilerSettings/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/ExcludeFileUsingCompilerSettings/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/ExcludeFileUsingCompilerSettings/src/Excluded.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeFileUsingCompilerSettings/src/dir/bar.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeFileUsingCompilerSettings/src/foo.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderInSourceRoot/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderInSourceRoot/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderInSourceRoot/src/foo.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt (100%) rename jps-plugin/testData/{ => general}/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml (100%) rename jps-plugin/testData/{ => general}/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt (100%) rename jps-plugin/testData/{JKJProject => general/JKJInheritanceProject}/kotlinProject.iml (98%) rename jps-plugin/testData/{ => general}/JKJInheritanceProject/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/JKJInheritanceProject/src/java/JFirst.java (100%) rename jps-plugin/testData/{ => general}/JKJInheritanceProject/src/java/JSecond.java (100%) rename jps-plugin/testData/{ => general}/JKJInheritanceProject/src/kotlin/KFirst.kt (100%) rename jps-plugin/testData/{JKJInheritanceProject => general/JKJProject}/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/JKJProject/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/JKJProject/src/java/JFirst.java (100%) rename jps-plugin/testData/{ => general}/JKJProject/src/java/JSecond.java (100%) rename jps-plugin/testData/{ => general}/JKJProject/src/kotlin/KFirst.kt (100%) rename jps-plugin/testData/{ => general}/KJCircularProject/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/KJCircularProject/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/KJCircularProject/src/java/JFirst.java (100%) rename jps-plugin/testData/{ => general}/KJCircularProject/src/kotlin/KFirst.kt (100%) rename jps-plugin/testData/{ => general}/KJKInheritanceProject/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/KJKInheritanceProject/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/KJKInheritanceProject/src/java/JFirst.java (100%) rename jps-plugin/testData/{ => general}/KJKInheritanceProject/src/kotlin/KFirst.kt (100%) rename jps-plugin/testData/{ => general}/KJKInheritanceProject/src/kotlin/KSecond.kt (100%) rename jps-plugin/testData/{ => general}/KJKProject/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/KJKProject/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/KJKProject/src/java/JFirst.java (100%) rename jps-plugin/testData/{ => general}/KJKProject/src/kotlin/KFirst.kt (100%) rename jps-plugin/testData/{ => general}/KJKProject/src/kotlin/KSecond.kt (100%) rename jps-plugin/testData/{ => general}/KotlinJavaProject/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/KotlinJavaProject/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/KotlinJavaProject/src/Test.java (100%) rename jps-plugin/testData/{ => general}/KotlinJavaProject/src/kotlinFile.kt (100%) rename jps-plugin/testData/{ => general}/KotlinProject/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/KotlinProject/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/KotlinProject/src/test1.kt (100%) rename jps-plugin/testData/{ => general}/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/KotlinProjectTwoFilesInOnePackage/src/test1.kt (100%) rename jps-plugin/testData/{ => general}/KotlinProjectTwoFilesInOnePackage/src/test2.kt (100%) rename jps-plugin/testData/{ => general}/ManyFiles/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/ManyFiles/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/ManyFiles/src/Bar.kt (100%) rename jps-plugin/testData/{ => general}/ManyFiles/src/boo.kt (100%) rename jps-plugin/testData/{ => general}/ManyFiles/src/main.kt (100%) rename jps-plugin/testData/{ => general}/ReexportedDependency/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/ReexportedDependency/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/ReexportedDependency/module2/lib/j/J.class (100%) rename jps-plugin/testData/{ => general}/ReexportedDependency/module2/lib/j/J.java (100%) rename jps-plugin/testData/{ => general}/ReexportedDependency/module2/lib/j/annotations.xml (100%) rename jps-plugin/testData/{ => general}/ReexportedDependency/module2/module2.iml (100%) rename jps-plugin/testData/{ => general}/ReexportedDependency/module2/src/JSecond.java (100%) rename jps-plugin/testData/{ => general}/ReexportedDependency/module2/src/my.kt (100%) rename jps-plugin/testData/{ => general}/ReexportedDependency/module3/module3.iml (100%) rename jps-plugin/testData/{ => general}/ReexportedDependency/module3/src/m3.kt (100%) rename jps-plugin/testData/{ => general}/ReexportedDependency/src/main.kt (100%) rename jps-plugin/testData/{ => general}/TestDependencyLibrary/kotlinProject.iml (100%) rename jps-plugin/testData/{ => general}/TestDependencyLibrary/kotlinProject.ipr (100%) rename jps-plugin/testData/{ => general}/TestDependencyLibrary/src/src.kt (100%) rename jps-plugin/testData/{ => general}/TestDependencyLibrary/test/test.kt (100%) diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index 3d065cb8dfd..e4b717829c4 100644 --- a/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -42,7 +42,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { @Override public void setUp() throws Exception { super.setUp(); - File sourceFilesRoot = new File(TEST_DATA_PATH + getTestName(false)); + File sourceFilesRoot = new File(TEST_DATA_PATH + "general/" + getTestName(false)); workDir = copyTestDataToTmpDir(sourceFilesRoot); getOrCreateProjectDir(); } diff --git a/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.iml b/jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.iml rename to jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/kotlinProject.iml diff --git a/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.ipr b/jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.ipr rename to jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/kotlinProject.ipr diff --git a/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/module2.iml b/jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/module2/module2.iml similarity index 100% rename from jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/module2.iml rename to jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/module2/module2.iml diff --git a/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java b/jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java similarity index 100% rename from jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java rename to jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java diff --git a/jps-plugin/testData/CircularDependenciesNoKotlinFiles/src/JFirst.java b/jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/src/JFirst.java similarity index 100% rename from jps-plugin/testData/CircularDependenciesNoKotlinFiles/src/JFirst.java rename to jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/src/JFirst.java diff --git a/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.iml b/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.iml rename to jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.iml diff --git a/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.ipr b/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.ipr rename to jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.ipr diff --git a/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/module2.iml b/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/module2.iml similarity index 100% rename from jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/module2.iml rename to jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/module2.iml diff --git a/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/JSecond.java b/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/JSecond.java similarity index 100% rename from jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/JSecond.java rename to jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/JSecond.java diff --git a/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/kt1.kt b/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/kt1.kt similarity index 100% rename from jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/kt1.kt rename to jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/kt1.kt diff --git a/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/src/JFirst.java b/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/src/JFirst.java similarity index 100% rename from jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/src/JFirst.java rename to jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/src/JFirst.java diff --git a/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/src/kt2.kt b/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/src/kt2.kt similarity index 100% rename from jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/src/kt2.kt rename to jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/src/kt2.kt diff --git a/jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.iml b/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.iml rename to jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/kotlinProject.iml diff --git a/jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.ipr b/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.ipr rename to jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/kotlinProject.ipr diff --git a/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/Excluded.kt b/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/src/Excluded.kt similarity index 100% rename from jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/Excluded.kt rename to jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/src/Excluded.kt diff --git a/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt b/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt similarity index 100% rename from jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt rename to jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt diff --git a/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/bar.kt b/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/src/dir/bar.kt similarity index 100% rename from jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/bar.kt rename to jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/src/dir/bar.kt diff --git a/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/foo.kt b/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/src/foo.kt similarity index 100% rename from jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/foo.kt rename to jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/src/foo.kt diff --git a/jps-plugin/testData/ExcludeFolderInSourceRoot/kotlinProject.iml b/jps-plugin/testData/general/ExcludeFolderInSourceRoot/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/ExcludeFolderInSourceRoot/kotlinProject.iml rename to jps-plugin/testData/general/ExcludeFolderInSourceRoot/kotlinProject.iml diff --git a/jps-plugin/testData/ExcludeFolderInSourceRoot/kotlinProject.ipr b/jps-plugin/testData/general/ExcludeFolderInSourceRoot/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/ExcludeFolderInSourceRoot/kotlinProject.ipr rename to jps-plugin/testData/general/ExcludeFolderInSourceRoot/kotlinProject.ipr diff --git a/jps-plugin/testData/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt b/jps-plugin/testData/general/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt similarity index 100% rename from jps-plugin/testData/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt rename to jps-plugin/testData/general/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt diff --git a/jps-plugin/testData/ExcludeFolderInSourceRoot/src/foo.kt b/jps-plugin/testData/general/ExcludeFolderInSourceRoot/src/foo.kt similarity index 100% rename from jps-plugin/testData/ExcludeFolderInSourceRoot/src/foo.kt rename to jps-plugin/testData/general/ExcludeFolderInSourceRoot/src/foo.kt diff --git a/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml b/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml rename to jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml diff --git a/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr b/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr rename to jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr diff --git a/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt b/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt similarity index 100% rename from jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt rename to jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt diff --git a/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt b/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt similarity index 100% rename from jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt rename to jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt diff --git a/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt b/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt similarity index 100% rename from jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt rename to jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt diff --git a/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt b/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt similarity index 100% rename from jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt rename to jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt diff --git a/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml b/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml rename to jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml diff --git a/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr b/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr rename to jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr diff --git a/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt b/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt similarity index 100% rename from jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt rename to jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt diff --git a/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt b/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt similarity index 100% rename from jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt rename to jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt diff --git a/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt b/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt similarity index 100% rename from jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt rename to jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt diff --git a/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt b/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt similarity index 100% rename from jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt rename to jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt diff --git a/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt b/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt similarity index 100% rename from jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt rename to jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt diff --git a/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt b/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt similarity index 100% rename from jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt rename to jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt diff --git a/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml b/jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml rename to jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml diff --git a/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr b/jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr rename to jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr diff --git a/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt b/jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt similarity index 100% rename from jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt rename to jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt diff --git a/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml b/jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml similarity index 100% rename from jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml rename to jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml diff --git a/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt b/jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt similarity index 100% rename from jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt rename to jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt diff --git a/jps-plugin/testData/JKJProject/kotlinProject.iml b/jps-plugin/testData/general/JKJInheritanceProject/kotlinProject.iml similarity index 98% rename from jps-plugin/testData/JKJProject/kotlinProject.iml rename to jps-plugin/testData/general/JKJInheritanceProject/kotlinProject.iml index 10db71f5cd2..5d6f3a17863 100644 --- a/jps-plugin/testData/JKJProject/kotlinProject.iml +++ b/jps-plugin/testData/general/JKJInheritanceProject/kotlinProject.iml @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/jps-plugin/testData/JKJInheritanceProject/kotlinProject.ipr b/jps-plugin/testData/general/JKJInheritanceProject/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/JKJInheritanceProject/kotlinProject.ipr rename to jps-plugin/testData/general/JKJInheritanceProject/kotlinProject.ipr diff --git a/jps-plugin/testData/JKJInheritanceProject/src/java/JFirst.java b/jps-plugin/testData/general/JKJInheritanceProject/src/java/JFirst.java similarity index 100% rename from jps-plugin/testData/JKJInheritanceProject/src/java/JFirst.java rename to jps-plugin/testData/general/JKJInheritanceProject/src/java/JFirst.java diff --git a/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java b/jps-plugin/testData/general/JKJInheritanceProject/src/java/JSecond.java similarity index 100% rename from jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java rename to jps-plugin/testData/general/JKJInheritanceProject/src/java/JSecond.java diff --git a/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt b/jps-plugin/testData/general/JKJInheritanceProject/src/kotlin/KFirst.kt similarity index 100% rename from jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt rename to jps-plugin/testData/general/JKJInheritanceProject/src/kotlin/KFirst.kt diff --git a/jps-plugin/testData/JKJInheritanceProject/kotlinProject.iml b/jps-plugin/testData/general/JKJProject/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/JKJInheritanceProject/kotlinProject.iml rename to jps-plugin/testData/general/JKJProject/kotlinProject.iml diff --git a/jps-plugin/testData/JKJProject/kotlinProject.ipr b/jps-plugin/testData/general/JKJProject/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/JKJProject/kotlinProject.ipr rename to jps-plugin/testData/general/JKJProject/kotlinProject.ipr diff --git a/jps-plugin/testData/JKJProject/src/java/JFirst.java b/jps-plugin/testData/general/JKJProject/src/java/JFirst.java similarity index 100% rename from jps-plugin/testData/JKJProject/src/java/JFirst.java rename to jps-plugin/testData/general/JKJProject/src/java/JFirst.java diff --git a/jps-plugin/testData/JKJProject/src/java/JSecond.java b/jps-plugin/testData/general/JKJProject/src/java/JSecond.java similarity index 100% rename from jps-plugin/testData/JKJProject/src/java/JSecond.java rename to jps-plugin/testData/general/JKJProject/src/java/JSecond.java diff --git a/jps-plugin/testData/JKJProject/src/kotlin/KFirst.kt b/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt similarity index 100% rename from jps-plugin/testData/JKJProject/src/kotlin/KFirst.kt rename to jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt diff --git a/jps-plugin/testData/KJCircularProject/kotlinProject.iml b/jps-plugin/testData/general/KJCircularProject/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/KJCircularProject/kotlinProject.iml rename to jps-plugin/testData/general/KJCircularProject/kotlinProject.iml diff --git a/jps-plugin/testData/KJCircularProject/kotlinProject.ipr b/jps-plugin/testData/general/KJCircularProject/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/KJCircularProject/kotlinProject.ipr rename to jps-plugin/testData/general/KJCircularProject/kotlinProject.ipr diff --git a/jps-plugin/testData/KJCircularProject/src/java/JFirst.java b/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java similarity index 100% rename from jps-plugin/testData/KJCircularProject/src/java/JFirst.java rename to jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java diff --git a/jps-plugin/testData/KJCircularProject/src/kotlin/KFirst.kt b/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt similarity index 100% rename from jps-plugin/testData/KJCircularProject/src/kotlin/KFirst.kt rename to jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt diff --git a/jps-plugin/testData/KJKInheritanceProject/kotlinProject.iml b/jps-plugin/testData/general/KJKInheritanceProject/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/KJKInheritanceProject/kotlinProject.iml rename to jps-plugin/testData/general/KJKInheritanceProject/kotlinProject.iml diff --git a/jps-plugin/testData/KJKInheritanceProject/kotlinProject.ipr b/jps-plugin/testData/general/KJKInheritanceProject/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/KJKInheritanceProject/kotlinProject.ipr rename to jps-plugin/testData/general/KJKInheritanceProject/kotlinProject.ipr diff --git a/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java b/jps-plugin/testData/general/KJKInheritanceProject/src/java/JFirst.java similarity index 100% rename from jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java rename to jps-plugin/testData/general/KJKInheritanceProject/src/java/JFirst.java diff --git a/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt b/jps-plugin/testData/general/KJKInheritanceProject/src/kotlin/KFirst.kt similarity index 100% rename from jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt rename to jps-plugin/testData/general/KJKInheritanceProject/src/kotlin/KFirst.kt diff --git a/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt b/jps-plugin/testData/general/KJKInheritanceProject/src/kotlin/KSecond.kt similarity index 100% rename from jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt rename to jps-plugin/testData/general/KJKInheritanceProject/src/kotlin/KSecond.kt diff --git a/jps-plugin/testData/KJKProject/kotlinProject.iml b/jps-plugin/testData/general/KJKProject/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/KJKProject/kotlinProject.iml rename to jps-plugin/testData/general/KJKProject/kotlinProject.iml diff --git a/jps-plugin/testData/KJKProject/kotlinProject.ipr b/jps-plugin/testData/general/KJKProject/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/KJKProject/kotlinProject.ipr rename to jps-plugin/testData/general/KJKProject/kotlinProject.ipr diff --git a/jps-plugin/testData/KJKProject/src/java/JFirst.java b/jps-plugin/testData/general/KJKProject/src/java/JFirst.java similarity index 100% rename from jps-plugin/testData/KJKProject/src/java/JFirst.java rename to jps-plugin/testData/general/KJKProject/src/java/JFirst.java diff --git a/jps-plugin/testData/KJKProject/src/kotlin/KFirst.kt b/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt similarity index 100% rename from jps-plugin/testData/KJKProject/src/kotlin/KFirst.kt rename to jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt diff --git a/jps-plugin/testData/KJKProject/src/kotlin/KSecond.kt b/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt similarity index 100% rename from jps-plugin/testData/KJKProject/src/kotlin/KSecond.kt rename to jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt diff --git a/jps-plugin/testData/KotlinJavaProject/kotlinProject.iml b/jps-plugin/testData/general/KotlinJavaProject/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/KotlinJavaProject/kotlinProject.iml rename to jps-plugin/testData/general/KotlinJavaProject/kotlinProject.iml diff --git a/jps-plugin/testData/KotlinJavaProject/kotlinProject.ipr b/jps-plugin/testData/general/KotlinJavaProject/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/KotlinJavaProject/kotlinProject.ipr rename to jps-plugin/testData/general/KotlinJavaProject/kotlinProject.ipr diff --git a/jps-plugin/testData/KotlinJavaProject/src/Test.java b/jps-plugin/testData/general/KotlinJavaProject/src/Test.java similarity index 100% rename from jps-plugin/testData/KotlinJavaProject/src/Test.java rename to jps-plugin/testData/general/KotlinJavaProject/src/Test.java diff --git a/jps-plugin/testData/KotlinJavaProject/src/kotlinFile.kt b/jps-plugin/testData/general/KotlinJavaProject/src/kotlinFile.kt similarity index 100% rename from jps-plugin/testData/KotlinJavaProject/src/kotlinFile.kt rename to jps-plugin/testData/general/KotlinJavaProject/src/kotlinFile.kt diff --git a/jps-plugin/testData/KotlinProject/kotlinProject.iml b/jps-plugin/testData/general/KotlinProject/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/KotlinProject/kotlinProject.iml rename to jps-plugin/testData/general/KotlinProject/kotlinProject.iml diff --git a/jps-plugin/testData/KotlinProject/kotlinProject.ipr b/jps-plugin/testData/general/KotlinProject/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/KotlinProject/kotlinProject.ipr rename to jps-plugin/testData/general/KotlinProject/kotlinProject.ipr diff --git a/jps-plugin/testData/KotlinProject/src/test1.kt b/jps-plugin/testData/general/KotlinProject/src/test1.kt similarity index 100% rename from jps-plugin/testData/KotlinProject/src/test1.kt rename to jps-plugin/testData/general/KotlinProject/src/test1.kt diff --git a/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml b/jps-plugin/testData/general/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml rename to jps-plugin/testData/general/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml diff --git a/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr b/jps-plugin/testData/general/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr rename to jps-plugin/testData/general/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr diff --git a/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/src/test1.kt b/jps-plugin/testData/general/KotlinProjectTwoFilesInOnePackage/src/test1.kt similarity index 100% rename from jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/src/test1.kt rename to jps-plugin/testData/general/KotlinProjectTwoFilesInOnePackage/src/test1.kt diff --git a/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/src/test2.kt b/jps-plugin/testData/general/KotlinProjectTwoFilesInOnePackage/src/test2.kt similarity index 100% rename from jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/src/test2.kt rename to jps-plugin/testData/general/KotlinProjectTwoFilesInOnePackage/src/test2.kt diff --git a/jps-plugin/testData/ManyFiles/kotlinProject.iml b/jps-plugin/testData/general/ManyFiles/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/ManyFiles/kotlinProject.iml rename to jps-plugin/testData/general/ManyFiles/kotlinProject.iml diff --git a/jps-plugin/testData/ManyFiles/kotlinProject.ipr b/jps-plugin/testData/general/ManyFiles/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/ManyFiles/kotlinProject.ipr rename to jps-plugin/testData/general/ManyFiles/kotlinProject.ipr diff --git a/jps-plugin/testData/ManyFiles/src/Bar.kt b/jps-plugin/testData/general/ManyFiles/src/Bar.kt similarity index 100% rename from jps-plugin/testData/ManyFiles/src/Bar.kt rename to jps-plugin/testData/general/ManyFiles/src/Bar.kt diff --git a/jps-plugin/testData/ManyFiles/src/boo.kt b/jps-plugin/testData/general/ManyFiles/src/boo.kt similarity index 100% rename from jps-plugin/testData/ManyFiles/src/boo.kt rename to jps-plugin/testData/general/ManyFiles/src/boo.kt diff --git a/jps-plugin/testData/ManyFiles/src/main.kt b/jps-plugin/testData/general/ManyFiles/src/main.kt similarity index 100% rename from jps-plugin/testData/ManyFiles/src/main.kt rename to jps-plugin/testData/general/ManyFiles/src/main.kt diff --git a/jps-plugin/testData/ReexportedDependency/kotlinProject.iml b/jps-plugin/testData/general/ReexportedDependency/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/ReexportedDependency/kotlinProject.iml rename to jps-plugin/testData/general/ReexportedDependency/kotlinProject.iml diff --git a/jps-plugin/testData/ReexportedDependency/kotlinProject.ipr b/jps-plugin/testData/general/ReexportedDependency/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/ReexportedDependency/kotlinProject.ipr rename to jps-plugin/testData/general/ReexportedDependency/kotlinProject.ipr diff --git a/jps-plugin/testData/ReexportedDependency/module2/lib/j/J.class b/jps-plugin/testData/general/ReexportedDependency/module2/lib/j/J.class similarity index 100% rename from jps-plugin/testData/ReexportedDependency/module2/lib/j/J.class rename to jps-plugin/testData/general/ReexportedDependency/module2/lib/j/J.class diff --git a/jps-plugin/testData/ReexportedDependency/module2/lib/j/J.java b/jps-plugin/testData/general/ReexportedDependency/module2/lib/j/J.java similarity index 100% rename from jps-plugin/testData/ReexportedDependency/module2/lib/j/J.java rename to jps-plugin/testData/general/ReexportedDependency/module2/lib/j/J.java diff --git a/jps-plugin/testData/ReexportedDependency/module2/lib/j/annotations.xml b/jps-plugin/testData/general/ReexportedDependency/module2/lib/j/annotations.xml similarity index 100% rename from jps-plugin/testData/ReexportedDependency/module2/lib/j/annotations.xml rename to jps-plugin/testData/general/ReexportedDependency/module2/lib/j/annotations.xml diff --git a/jps-plugin/testData/ReexportedDependency/module2/module2.iml b/jps-plugin/testData/general/ReexportedDependency/module2/module2.iml similarity index 100% rename from jps-plugin/testData/ReexportedDependency/module2/module2.iml rename to jps-plugin/testData/general/ReexportedDependency/module2/module2.iml diff --git a/jps-plugin/testData/ReexportedDependency/module2/src/JSecond.java b/jps-plugin/testData/general/ReexportedDependency/module2/src/JSecond.java similarity index 100% rename from jps-plugin/testData/ReexportedDependency/module2/src/JSecond.java rename to jps-plugin/testData/general/ReexportedDependency/module2/src/JSecond.java diff --git a/jps-plugin/testData/ReexportedDependency/module2/src/my.kt b/jps-plugin/testData/general/ReexportedDependency/module2/src/my.kt similarity index 100% rename from jps-plugin/testData/ReexportedDependency/module2/src/my.kt rename to jps-plugin/testData/general/ReexportedDependency/module2/src/my.kt diff --git a/jps-plugin/testData/ReexportedDependency/module3/module3.iml b/jps-plugin/testData/general/ReexportedDependency/module3/module3.iml similarity index 100% rename from jps-plugin/testData/ReexportedDependency/module3/module3.iml rename to jps-plugin/testData/general/ReexportedDependency/module3/module3.iml diff --git a/jps-plugin/testData/ReexportedDependency/module3/src/m3.kt b/jps-plugin/testData/general/ReexportedDependency/module3/src/m3.kt similarity index 100% rename from jps-plugin/testData/ReexportedDependency/module3/src/m3.kt rename to jps-plugin/testData/general/ReexportedDependency/module3/src/m3.kt diff --git a/jps-plugin/testData/ReexportedDependency/src/main.kt b/jps-plugin/testData/general/ReexportedDependency/src/main.kt similarity index 100% rename from jps-plugin/testData/ReexportedDependency/src/main.kt rename to jps-plugin/testData/general/ReexportedDependency/src/main.kt diff --git a/jps-plugin/testData/TestDependencyLibrary/kotlinProject.iml b/jps-plugin/testData/general/TestDependencyLibrary/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/TestDependencyLibrary/kotlinProject.iml rename to jps-plugin/testData/general/TestDependencyLibrary/kotlinProject.iml diff --git a/jps-plugin/testData/TestDependencyLibrary/kotlinProject.ipr b/jps-plugin/testData/general/TestDependencyLibrary/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/TestDependencyLibrary/kotlinProject.ipr rename to jps-plugin/testData/general/TestDependencyLibrary/kotlinProject.ipr diff --git a/jps-plugin/testData/TestDependencyLibrary/src/src.kt b/jps-plugin/testData/general/TestDependencyLibrary/src/src.kt similarity index 100% rename from jps-plugin/testData/TestDependencyLibrary/src/src.kt rename to jps-plugin/testData/general/TestDependencyLibrary/src/src.kt diff --git a/jps-plugin/testData/TestDependencyLibrary/test/test.kt b/jps-plugin/testData/general/TestDependencyLibrary/test/test.kt similarity index 100% rename from jps-plugin/testData/TestDependencyLibrary/test/test.kt rename to jps-plugin/testData/general/TestDependencyLibrary/test/test.kt