javafx: unable to coerce check does not make sense for pane's node elements

This commit is contained in:
Anna Kozlova
2015-06-17 20:12:20 +03:00
parent 439da816bd
commit eeded09c18
8 changed files with 15 additions and 34 deletions
@@ -53,10 +53,4 @@ public abstract class AbstractJavaFXTestCase extends LightCodeInsightFixtureTest
super.setUp();
enableInspections();
}
@Override
protected void runTest() throws Throwable {
Assume.assumeFalse(SystemInfo.isMac);
super.runTest();
}
}
@@ -15,6 +15,7 @@
*/
package org.jetbrains.plugins.javaFX.fxml;
import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase;
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.codeInsight.intention.impl.ShowIntentionActionsHandler;
@@ -26,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
public class JavaFXCollapseSubtagToAttributeTest extends JavaFXDaemonAnalyzerTestCase {
public class JavaFXCollapseSubtagToAttributeTest extends DaemonAnalyzerTestCase {
@Override
protected void setUpModule() {
super.setUpModule();
@@ -1,16 +0,0 @@
package org.jetbrains.plugins.javaFX.fxml;
import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase;
import com.intellij.openapi.util.SystemInfo;
import org.junit.Assume;
/**
* @author nik
*/
public class JavaFXDaemonAnalyzerTestCase extends DaemonAnalyzerTestCase {
@Override
protected void runTest() throws Throwable {
Assume.assumeFalse(SystemInfo.isMac);
super.runTest();
}
}
@@ -15,6 +15,7 @@
*/
package org.jetbrains.plugins.javaFX.fxml;
import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase;
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.codeInsight.intention.impl.ShowIntentionActionsHandler;
@@ -26,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
public class JavaFXExpandAttributeTest extends JavaFXDaemonAnalyzerTestCase {
public class JavaFXExpandAttributeTest extends DaemonAnalyzerTestCase {
@Override
protected void setUpModule() {
super.setUpModule();
@@ -15,6 +15,7 @@
*/
package org.jetbrains.plugins.javaFX.fxml;
import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase;
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.openapi.application.PluginPathManager;
import com.intellij.testFramework.PsiTestUtil;
@@ -22,7 +23,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
public class JavaFXImportTest extends JavaFXDaemonAnalyzerTestCase {
public class JavaFXImportTest extends DaemonAnalyzerTestCase {
@Override
protected void setUpModule() {
super.setUpModule();
@@ -101,13 +101,7 @@ public class JavaFXQuickfixTest extends LightCodeInsightFixtureTestCase {
super.setUp();
myFixture.enableInspections(new JavaFxUnresolvedFxIdReferenceInspection());
}
@Override
protected void runTest() throws Throwable {
Assume.assumeFalse(SystemInfo.isMac);
super.runTest();
}
@NotNull
@Override
protected String getTestDataPath() {
@@ -16,6 +16,7 @@
package org.jetbrains.plugins.javaFX.fxml;
import com.intellij.codeInsight.TargetElementUtil;
import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase;
import com.intellij.openapi.application.PluginPathManager;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
@@ -25,7 +26,7 @@ import com.intellij.testFramework.PsiTestUtil;
import com.intellij.testFramework.fixtures.CodeInsightTestUtil;
import org.jetbrains.annotations.NotNull;
public class JavaFXRenameTest extends JavaFXDaemonAnalyzerTestCase {
public class JavaFXRenameTest extends DaemonAnalyzerTestCase {
@Override
protected void setUpModule() {
super.setUpModule();
@@ -158,7 +158,12 @@ public class JavaFxPropertyAttributeDescriptor extends BasicXmlAttributeDescript
}
else {
final PsiClass tagClass = JavaFxPsiUtil.getTagClass((XmlAttributeValue)context);
boxedQName = tagClass != null ? tagClass.getQualifiedName() : null;
if (tagClass != null && !InheritanceUtil.isInheritor(tagClass, false, JavaFxCommonClassNames.JAVAFX_SCENE_NODE)) {
boxedQName = tagClass.getQualifiedName();
}
else {
boxedQName = null;
}
}
if (boxedQName != null) {
try {