From 368c4d56dfbbfc1a5247528b720ac24048685185 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Mon, 18 May 2015 21:16:48 +0300
Subject: [PATCH] tests roots moved from java-impl to java-tests to avoid
 circular dependency between java-impl and testFramework-java

---
 java/java-impl/java-impl.iml   | 5 -----
 java/java-tests/java-tests.iml | 9 +++++++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/java/java-impl/java-impl.iml b/java/java-impl/java-impl.iml
index ee71056b6734..eb22a86d630c 100644
--- a/java/java-impl/java-impl.iml
+++ b/java/java-impl/java-impl.iml
@@ -8,15 +8,12 @@
     </content>
     <content url="file://$MODULE_DIR$/../../plugins/InspectionGadgets">
       <sourceFolder url="file://$MODULE_DIR$/../../plugins/InspectionGadgets/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../plugins/InspectionGadgets/testsrc" isTestSource="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../plugins/IntentionPowerPak">
       <sourceFolder url="file://$MODULE_DIR$/../../plugins/IntentionPowerPak/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../plugins/IntentionPowerPak/testSrc" isTestSource="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../plugins/generate-tostring">
       <sourceFolder url="file://$MODULE_DIR$/../../plugins/generate-tostring/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../plugins/generate-tostring/testSrc" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../plugins/generate-tostring/resources" type="java-resource" />
     </content>
     <orderEntry type="module" module-name="boot" />
@@ -40,7 +37,6 @@
     <orderEntry type="module" module-name="icons" />
     <orderEntry type="library" name="jcip" level="project" />
     <orderEntry type="library" name="Groovy" level="project" />
-    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="java-psi-impl" exported="" />
     <orderEntry type="module" module-name="RegExpSupport" />
     <orderEntry type="module" module-name="java-indexing-impl" exported="" />
@@ -52,7 +48,6 @@
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="Xerces" level="project" />
     <orderEntry type="library" name="Velocity" level="project" />
-    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
     <orderEntry type="module" module-name="java-structure-view" exported="" />
     <orderEntry type="module" module-name="spellchecker" />
     <orderEntry type="library" name="nekohtml" level="project" />
diff --git a/java/java-tests/java-tests.iml b/java/java-tests/java-tests.iml
index ae3f097b542f..589ebadfdeed 100644
--- a/java/java-tests/java-tests.iml
+++ b/java/java-tests/java-tests.iml
@@ -5,6 +5,15 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
     </content>
+    <content url="file://$MODULE_DIR$/../../plugins/InspectionGadgets/testsrc">
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/InspectionGadgets/testsrc" isTestSource="true" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../plugins/IntentionPowerPak/testSrc">
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/IntentionPowerPak/testSrc" isTestSource="true" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../plugins/generate-tostring/testSrc">
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/generate-tostring/testSrc" isTestSource="true" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="testFramework-java" />