From ec759dcab2c390791a905d892b2eb84e5d5787b6 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Wed, 30 Mar 2016 18:58:26 +0200
Subject: [PATCH] javafx: regroup tests so only one javafx plugin is on the
 classpath

---
 plugins/javaFX/javaFX.iml                                       | 2 ++
 .../plugins/javaFX/fxml/AbstractJavaFXQuickFixTest.java         | 0
 .../jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java   | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename plugins/javaFX/{javaFX-CE => }/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXQuickFixTest.java (100%)
 rename plugins/javaFX/{javaFX-CE => }/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java (97%)

diff --git a/plugins/javaFX/javaFX.iml b/plugins/javaFX/javaFX.iml
index df8d83d58a19..3e4c82d62ae0 100644
--- a/plugins/javaFX/javaFX.iml
+++ b/plugins/javaFX/javaFX.iml
@@ -5,6 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -24,5 +25,6 @@
     <orderEntry type="module" module-name="manifest" />
     <orderEntry type="module" module-name="idea-ui" />
     <orderEntry type="library" name="SceneBuilderKit" level="project" />
+    <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXQuickFixTest.java b/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXQuickFixTest.java
similarity index 100%
rename from plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXQuickFixTest.java
rename to plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXQuickFixTest.java
diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java b/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java
similarity index 97%
rename from plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java
rename to plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java
index 272a950829d9..ead8d2f56bf2 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java
+++ b/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java
@@ -15,7 +15,6 @@
  */
 package org.jetbrains.plugins.javaFX.fxml;
 
-import com.intellij.openapi.application.PluginPathManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.roots.ContentEntry;
 import com.intellij.openapi.roots.ModifiableRootModel;