From 47e48dbb98cc3014db964438cd9d7774f312848a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 19 Feb 2013 11:31:16 +0100 Subject: [PATCH] Fix JavaFX tests --- .../{CoercedTypes.fxml => coercedTypes.fxml} | 0 .../{Controller.fxml => controller.fxml} | 0 ...trollerIdRef.fxml => controllerIdRef.fxml} | 0 .../{fQNtagNames.fxml => fqnTagNames.fxml} | 0 ...oller.fxml => packageLocalController.fxml} | 0 ...fxml => unresolvedTopLevelController.fxml} | 0 .../javaFX/fxml/JavaFXHighlightingTest.java | 26 +++++++++++++++---- 7 files changed, 21 insertions(+), 5 deletions(-) rename plugins/javaFX/testData/highlighting/{CoercedTypes.fxml => coercedTypes.fxml} (100%) rename plugins/javaFX/testData/highlighting/{Controller.fxml => controller.fxml} (100%) rename plugins/javaFX/testData/highlighting/{ControllerIdRef.fxml => controllerIdRef.fxml} (100%) rename plugins/javaFX/testData/highlighting/{fQNtagNames.fxml => fqnTagNames.fxml} (100%) rename plugins/javaFX/testData/highlighting/{PackageLocalController.fxml => packageLocalController.fxml} (100%) rename plugins/javaFX/testData/highlighting/{UnresolvedTopLevelController.fxml => unresolvedTopLevelController.fxml} (100%) diff --git a/plugins/javaFX/testData/highlighting/CoercedTypes.fxml b/plugins/javaFX/testData/highlighting/coercedTypes.fxml similarity index 100% rename from plugins/javaFX/testData/highlighting/CoercedTypes.fxml rename to plugins/javaFX/testData/highlighting/coercedTypes.fxml diff --git a/plugins/javaFX/testData/highlighting/Controller.fxml b/plugins/javaFX/testData/highlighting/controller.fxml similarity index 100% rename from plugins/javaFX/testData/highlighting/Controller.fxml rename to plugins/javaFX/testData/highlighting/controller.fxml diff --git a/plugins/javaFX/testData/highlighting/ControllerIdRef.fxml b/plugins/javaFX/testData/highlighting/controllerIdRef.fxml similarity index 100% rename from plugins/javaFX/testData/highlighting/ControllerIdRef.fxml rename to plugins/javaFX/testData/highlighting/controllerIdRef.fxml diff --git a/plugins/javaFX/testData/highlighting/fQNtagNames.fxml b/plugins/javaFX/testData/highlighting/fqnTagNames.fxml similarity index 100% rename from plugins/javaFX/testData/highlighting/fQNtagNames.fxml rename to plugins/javaFX/testData/highlighting/fqnTagNames.fxml diff --git a/plugins/javaFX/testData/highlighting/PackageLocalController.fxml b/plugins/javaFX/testData/highlighting/packageLocalController.fxml similarity index 100% rename from plugins/javaFX/testData/highlighting/PackageLocalController.fxml rename to plugins/javaFX/testData/highlighting/packageLocalController.fxml diff --git a/plugins/javaFX/testData/highlighting/UnresolvedTopLevelController.fxml b/plugins/javaFX/testData/highlighting/unresolvedTopLevelController.fxml similarity index 100% rename from plugins/javaFX/testData/highlighting/UnresolvedTopLevelController.fxml rename to plugins/javaFX/testData/highlighting/unresolvedTopLevelController.fxml diff --git a/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java b/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java index fa045da6d4d6..420194aa0090 100644 --- a/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java +++ b/plugins/javaFX/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.jetbrains.plugins.javaFX.fxml; import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase; @@ -14,13 +29,14 @@ import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; /** - * User: anna - * Date: 1/10/13 + * @author anna + * @since 10.01.2013 */ public class JavaFXHighlightingTest extends DaemonAnalyzerTestCase { @Override protected void setUpModule() { super.setUpModule(); + //noinspection SpellCheckingInspection PsiTestUtil.addLibrary(getModule(), "javafx", PluginPathManager.getPluginHomePath("javaFX") + "/testData", "jfxrt.jar"); } @@ -52,7 +68,7 @@ public class JavaFXHighlightingTest extends DaemonAnalyzerTestCase { public void testEnumValues() throws Exception { doTest(); } - + public void testDefaultTagProperties() throws Exception { doTest(); } @@ -78,7 +94,7 @@ public class JavaFXHighlightingTest extends DaemonAnalyzerTestCase { configureByFiles(null, getTestName(true) + ".fxml", getTestName(false) + ".java"); doDoTest(false, false); } - + private void doTestIdController() throws Exception { final String controllerClassName = getTestName(false) + "Controller"; configureByFiles(null, getTestName(true) + ".fxml", controllerClassName + ".java"); @@ -168,7 +184,7 @@ public class JavaFXHighlightingTest extends DaemonAnalyzerTestCase { doTest(); } - public void testFQNtagNames() throws Exception { + public void testFqnTagNames() throws Exception { doTest(); }