From e236142e42f7e0962f58e241e092dd2dd5dfea98 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Wed, 9 Mar 2016 20:46:04 +0100 Subject: [PATCH] javafx: extract common setup for javafx library --- .../javaFX/GenerateGetterSetterTest.java | 3 ++- .../javaFX/fxml/AbstractJavaFXTestCase.java | 19 ++++++++++++++++++- .../JavaFXCollapseSubtagToAttributeTest.java | 2 +- .../fxml/JavaFXExpandAttributeTest.java | 2 +- .../plugins/javaFX/fxml/JavaFXImportTest.java | 2 +- .../javaFX/fxml/JavaFXQuickfixTest.java | 2 +- .../plugins/javaFX/fxml/JavaFXRenameTest.java | 2 +- 7 files changed, 25 insertions(+), 7 deletions(-) diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/GenerateGetterSetterTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/GenerateGetterSetterTest.java index 3c41bf68379a..c5ae9fc93656 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/GenerateGetterSetterTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/GenerateGetterSetterTest.java @@ -26,6 +26,7 @@ import com.intellij.testFramework.PsiTestUtil; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.plugins.javaFX.fxml.AbstractJavaFXTestCase; @PlatformTestCase.WrapInCommand public class GenerateGetterSetterTest extends DaemonAnalyzerTestCase { @@ -40,7 +41,7 @@ public class GenerateGetterSetterTest extends DaemonAnalyzerTestCase { @Override protected void setUpModule() { super.setUpModule(); - PsiTestUtil.addLibrary(getModule(), "javafx", PluginPathManager.getPluginHomePath("javaFX") + "/testData", "jfxrt.jar"); + AbstractJavaFXTestCase.addJavaFxJarAsLibrary(getModule()); } protected void doTest() throws Exception { diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java index d74a73d12441..7cefdb5b178f 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java @@ -24,6 +24,9 @@ import com.intellij.testFramework.PsiTestUtil; import com.intellij.testFramework.fixtures.DefaultLightProjectDescriptor; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.io.File; /** * User: anna @@ -33,11 +36,25 @@ public abstract class AbstractJavaFXTestCase extends LightCodeInsightFixtureTest public static final DefaultLightProjectDescriptor JAVA_FX_DESCRIPTOR = new DefaultLightProjectDescriptor() { @Override public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @NotNull ContentEntry contentEntry) { - PsiTestUtil.addLibrary(module, model, "javafx", PluginPathManager.getPluginHomePath("javaFX") + "/testData", "jfxrt.jar"); + addJavaFxJarAsLibrary(module, model); super.configureModule(module, model, contentEntry); } }; + public static void addJavaFxJarAsLibrary(@NotNull Module module) { + addJavaFxJarAsLibrary(module, null); + } + + public static void addJavaFxJarAsLibrary(@NotNull Module module, @Nullable ModifiableRootModel model) { + final String libPath = PluginPathManager.getPluginHomePath("javaFX") + "/testData"; //System.getProperty("java.home") + File.separator + "lib" + File.separator + "ext"; + if (model != null) { + PsiTestUtil.addLibrary(module, model, "javafx", libPath, "jfxrt.jar"); + } + else { + PsiTestUtil.addLibrary(module, "javafx", libPath, "jfxrt.jar"); + } + } + @NotNull @Override protected LightProjectDescriptor getProjectDescriptor() { diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java index 9839bef63707..fa0c74ead15d 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java @@ -31,7 +31,7 @@ public class JavaFXCollapseSubtagToAttributeTest extends DaemonAnalyzerTestCase @Override protected void setUpModule() { super.setUpModule(); - PsiTestUtil.addLibrary(getModule(), "javafx", PluginPathManager.getPluginHomePath("javaFX") + "/testData", "jfxrt.jar"); + AbstractJavaFXTestCase.addJavaFxJarAsLibrary(getModule()); } public void testAdditionalSubtags() throws Exception { diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXExpandAttributeTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXExpandAttributeTest.java index bcee2c97e692..f9361dd25434 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXExpandAttributeTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXExpandAttributeTest.java @@ -31,7 +31,7 @@ public class JavaFXExpandAttributeTest extends DaemonAnalyzerTestCase { @Override protected void setUpModule() { super.setUpModule(); - PsiTestUtil.addLibrary(getModule(), "javafx", PluginPathManager.getPluginHomePath("javaFX") + "/testData", "jfxrt.jar"); + AbstractJavaFXTestCase.addJavaFxJarAsLibrary(getModule()); } public void testDefaultAttr() throws Exception { diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXImportTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXImportTest.java index e8fea47215e8..510f5b5b3d76 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXImportTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXImportTest.java @@ -27,7 +27,7 @@ public class JavaFXImportTest extends DaemonAnalyzerTestCase { @Override protected void setUpModule() { super.setUpModule(); - PsiTestUtil.addLibrary(getModule(), "javafx", PluginPathManager.getPluginHomePath("javaFX") + "/testData", "jfxrt.jar"); + AbstractJavaFXTestCase.addJavaFxJarAsLibrary(getModule()); } public void testSimpleImport() throws Exception { diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java index 0658ce0f8a92..70c5151212eb 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java @@ -40,7 +40,7 @@ public class JavaFXQuickfixTest extends LightCodeInsightFixtureTestCase { public static final DefaultLightProjectDescriptor JAVA_FX_WITH_GROOVY_DESCRIPTOR = new DefaultLightProjectDescriptor() { @Override public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @NotNull ContentEntry contentEntry) { - PsiTestUtil.addLibrary(module, model, "javafx", PluginPathManager.getPluginHomePath("javaFX") + "/testData", "jfxrt.jar"); + AbstractJavaFXTestCase.addJavaFxJarAsLibrary(module, model); PsiTestUtil.addLibrary(module, model, "javafx", PluginPathManager.getPluginHomePath("javaFX") + "/testData", "groovy-1.8.0.jar"); super.configureModule(module, model, contentEntry); } diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java index 713bc42382e4..808fa190b203 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java @@ -30,7 +30,7 @@ public class JavaFXRenameTest extends DaemonAnalyzerTestCase { @Override protected void setUpModule() { super.setUpModule(); - PsiTestUtil.addLibrary(getModule(), "javafx", PluginPathManager.getPluginHomePath("javaFX") + "/testData", "jfxrt.jar"); + AbstractJavaFXTestCase.addJavaFxJarAsLibrary(getModule()); } public void testCustomComponent() throws Exception {