MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

javafx: extract common setup for javafx library

Browse Source
This commit is contained in:
Anna Kozlova
2016-03-10 09:08:15 +01:00
parent e9a37446b8
commit e236142e42
7 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/GenerateGetterSetterTest.java
+2 -1
View File
@@ -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 {
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/AbstractJavaFXTestCase.java
+18 -1
View File
@@ -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() {
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java
+1 -1
View File
@@ -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 {
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXExpandAttributeTest.java
+1 -1
View File
@@ -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 {
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXImportTest.java
+1 -1
View File
@@ -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 {
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXQuickfixTest.java
+1 -1
View File
@@ -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);
}
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXRenameTest.java
+1 -1
View File
@@ -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 {