Migrate from checkHighlight to testHighlight (#358)

cedricziel · web-flow · commit da951db8d91f · 2021-10-10T13:34:18.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@
 ### Added
 
 ### Changed
-
+- migrate checkHighlight to testHighlight where possible
 ### Deprecated
 
 ### Removed
diff --git a/typo3-cms/src/test/java/com/cedricziel/idea/typo3/annotation/IconAnnotatorTest.java b/typo3-cms/src/test/java/com/cedricziel/idea/typo3/annotation/IconAnnotatorTest.java
@@ -12,31 +12,25 @@ public void testIconsAreNotAnnotatedWhenPluginDisabled() {
         disablePlugin();
 
         myFixture.copyFileToProject("IconRegistry9.php");
-        myFixture.configureByFiles("icon_not_available_disabled.php");
 
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("icon_not_available_disabled.php");
     }
 
     public void testIconsAreNotAnnotatedWhenPluginEnabledButAnnotationDisabled() {
         disablePlugin();
 
         myFixture.copyFileToProject("IconRegistry9.php");
-        myFixture.configureByFiles("icon_not_available_disabled.php");
 
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("icon_not_available_disabled.php");
     }
 
     public void testMissingIconsAreAnnotatedAsWarnings() {
         myFixture.copyFileToProject("IconRegistry9.php");
-        myFixture.configureByFiles("icon_not_available.php");
-
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("icon_not_available.php");
     }
 
     public void testPresentIconsAreNotAnnotated() {
         myFixture.copyFileToProject("IconRegistry9.php");
-        myFixture.configureByFiles("icon_available.php");
-
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("icon_available.php");
     }
 }
diff --git a/typo3-cms/src/test/java/com/cedricziel/idea/typo3/annotation/RouteAnnotatorTest.java b/typo3-cms/src/test/java/com/cedricziel/idea/typo3/annotation/RouteAnnotatorTest.java
@@ -14,26 +14,20 @@ public void testDoesntAnnotateRouteWhenPluginIsDisabled() {
 
         myFixture.copyFileToProject("classes.php");
 
-        myFixture.configureByFile("missing_route_disabled.php");
-
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("missing_route_disabled.php");
     }
 
     public void testDoesntAnnotateRouteWhenPluginIsEnabledButAnnotatorIsDisabled() {
         TYPO3CMSProjectSettings.getInstance(myFixture.getProject()).routeAnnotatorEnabled = false;
 
         myFixture.copyFileToProject("classes.php");
 
-        myFixture.configureByFile("missing_route_disabled.php");
-
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("missing_route_disabled.php");
     }
 
     public void testAnnotatesMissingRoutes() {
         myFixture.copyFileToProject("classes.php");
 
-        myFixture.configureByFile("missing_route.php");
-
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("missing_route.php");
     }
 }
diff --git a/typo3-cms/src/test/java/com/cedricziel/idea/typo3/codeInspection/ExtbasePropertyInjectionInspectionTest.java b/typo3-cms/src/test/java/com/cedricziel/idea/typo3/codeInspection/ExtbasePropertyInjectionInspectionTest.java
@@ -15,10 +15,7 @@ protected String getTestDataPath() {
     public void testExtbasePropertyInjectionIsMarked() {
         myFixture.enableInspections(new ExtbasePropertyInjectionInspection());
 
-        VirtualFile virtualFile = myFixture.copyFileToProject("ExtbasePropertyInjectionInspectionIsMarked.php", "MyClass.php");
-        myFixture.configureFromExistingVirtualFile(virtualFile);
-
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("ExtbasePropertyInjectionInspectionIsMarked.php");
     }
 
     public void testExtbasePropertyInjectionIsMarkedAndCanBeFixed() {
@@ -35,9 +32,6 @@ public void testExtbasePropertyInjectionIsNotMarkedWhenPluginIsDisabled() {
 
         myFixture.enableInspections(new ExtbasePropertyInjectionInspection());
 
-        VirtualFile virtualFile = myFixture.copyFileToProject("ExtbasePropertyInjectionInspectionIsNotMarked.php", "MyClass.php");
-        myFixture.configureFromExistingVirtualFile(virtualFile);
-
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("ExtbasePropertyInjectionInspectionIsNotMarked.php");
     }
 }
diff --git a/typo3-cms/src/test/java/com/cedricziel/idea/typo3/codeInspection/LegacyClassesForIDEInspectionTest.java b/typo3-cms/src/test/java/com/cedricziel/idea/typo3/codeInspection/LegacyClassesForIDEInspectionTest.java
@@ -20,9 +20,7 @@ public void testLegacyClassUsagesAreNotMarkedWhenPluginDisabled() {
         myFixture.copyFileToProject("LegacyClassesForIDE_classes.php");
         myFixture.copyFileToProject("LegacyClassesForIDE_index.php", "foo/Migrations/Code/LegacyClassesForIde.php");
 
-        myFixture.configureByFile("LegacyClassesForIDE_highlight_disabled.php");
-
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("LegacyClassesForIDE_highlight_disabled.php");
     }
 
     public void testLegacyClassUsagesAreMarkedAndCanBeFixed() {
@@ -32,9 +30,7 @@ public void testLegacyClassUsagesAreMarkedAndCanBeFixed() {
         myFixture.copyFileToProject("LegacyClassesForIDE_classes.php");
         myFixture.copyFileToProject("LegacyClassesForIDE_index.php", "foo/Migrations/Code/LegacyClassesForIde.php");
 
-        myFixture.configureByFile("LegacyClassesForIDE_highlight.php");
-
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("LegacyClassesForIDE_highlight.php");
 
         List<IntentionAction> allQuickFixes = myFixture.getAllQuickFixes();
         for (IntentionAction action : allQuickFixes) {
diff --git a/typo3-cms/src/test/java/com/cedricziel/idea/typo3/codeInspection/MissingColumnTypeInspectionTest.java b/typo3-cms/src/test/java/com/cedricziel/idea/typo3/codeInspection/MissingColumnTypeInspectionTest.java
@@ -12,38 +12,26 @@ protected String getTestDataPath() {
     public void testMissingColumnTypeIsMarked() {
         myFixture.enableInspections(new MissingColumnTypeInspection());
 
-        VirtualFile virtualFile = myFixture.copyFileToProject("MissingColumnTypeInspectionIsMarked.php", "MyClass.php");
-        myFixture.configureFromExistingVirtualFile(virtualFile);
-
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("MissingColumnTypeInspectionIsMarked.php");
     }
 
     public void testMissingColumnTypeIsNotMarkedWhenPluginDisabled() {
         disablePlugin();
 
         myFixture.enableInspections(new MissingColumnTypeInspection());
 
-        VirtualFile virtualFile = myFixture.copyFileToProject("MissingColumnTypeInspectionIsNotMarked.php", "MyClass.php");
-        myFixture.configureFromExistingVirtualFile(virtualFile);
-
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("MissingColumnTypeInspectionIsNotMarked.php");
     }
 
     public void testColumnTypeSlugIsNotAvailableForV8() {
         myFixture.enableInspections(new MissingColumnTypeInspection());
 
-        VirtualFile virtualFile = myFixture.copyFileToProject("MissingColumnTypeSlugIsMarkedOnV8.php", "MyClass.php");
-        myFixture.configureFromExistingVirtualFile(virtualFile);
-
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("MissingColumnTypeSlugIsMarkedOnV8.php");
     }
 
     public void testColumnTypeSlugIsAvailableForV9() {
         myFixture.enableInspections(new MissingColumnTypeInspection());
 
-        VirtualFile virtualFile = myFixture.copyFileToProject("MissingColumnTypeSlugIsNotMarkedOnV9.php", "MyClass.php");
-        myFixture.configureFromExistingVirtualFile(virtualFile);
-
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("MissingColumnTypeSlugIsNotMarkedOnV9.php");
     }
 }
diff --git a/typo3-cms/src/test/java/com/cedricziel/idea/typo3/codeInspection/MissingRenderTypeInspectionTest.java b/typo3-cms/src/test/java/com/cedricziel/idea/typo3/codeInspection/MissingRenderTypeInspectionTest.java
@@ -12,20 +12,14 @@ protected String getTestDataPath() {
     public void testMissingRenderTypeIsMarked() {
         myFixture.enableInspections(new MissingRenderTypeInspection());
 
-        VirtualFile virtualFile = myFixture.copyFileToProject("MissingRenderTypeInspectionIsMarked.php", "MyClass.php");
-        myFixture.configureFromExistingVirtualFile(virtualFile);
-
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("MissingRenderTypeInspectionIsMarked.php");
     }
 
     public void testMissingRenderTypeIsNotMarkedWhenPluginDisabled() {
         disablePlugin();
 
         myFixture.enableInspections(new MissingRenderTypeInspection());
 
-        VirtualFile virtualFile = myFixture.copyFileToProject("MissingRenderTypeInspectionIsNotMarked.php", "MyClass.php");
-        myFixture.configureFromExistingVirtualFile(virtualFile);
-
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("MissingRenderTypeInspectionIsNotMarked.php");
     }
 }
diff --git a/typo3-cms/src/test/java/com/cedricziel/idea/typo3/index/RouteIndexTest.java b/typo3-cms/src/test/java/com/cedricziel/idea/typo3/index/RouteIndexTest.java
@@ -46,8 +46,7 @@ public void testIssue288AjaxRoutesAreIndexed() {
 
         assertRouteExists("ajax_core_requirejs");
 
-        myFixture.configureByFile("ajax_route_usage.php");
-        myFixture.checkHighlighting();
+        myFixture.testHighlighting("ajax_route_usage.php");
 
         assertRouteStubEquals("ajax_core_requirejs","/core/requirejs", "\\TYPO3\\CMS\\Core\\Controller\\RequireJsController", "retrieveConfiguration", "public" );
     }
diff --git a/typo3-cms/src/test/java/com/cedricziel/idea/typo3/tca/codeInspection/InvalidQuantityInspectionTest.java b/typo3-cms/src/test/java/com/cedricziel/idea/typo3/tca/codeInspection/InvalidQuantityInspectionTest.java
@@ -12,7 +12,7 @@ protected String getTestDataPath() {
     public void testInvalidQuantitiesAreNotHighlightedWhenPluginIsDisabled() {
         disablePlugin();
 
-        myFixture.enableInspections(InvalidQuantityInspection.class);
+        myFixture.enableInspections(new InvalidQuantityInspection());
 
         myFixture.addFileToProject("foo/ext_emconf.php", "");
 
@@ -23,7 +23,7 @@ public void testInvalidQuantitiesAreNotHighlightedWhenPluginIsDisabled() {
     }
 
     public void testInvalidQuantitiesAreHighlighted() {
-        myFixture.enableInspections(InvalidQuantityInspection.class);
+        myFixture.enableInspections(new InvalidQuantityInspection());
 
         myFixture.addFileToProject("foo/ext_emconf.php", "");
 
diff --git a/typo3-cms/src/test/java/com/cedricziel/idea/typo3/tca/codeInspection/v10/InternalTypeFileInspectionTest.java b/typo3-cms/src/test/java/com/cedricziel/idea/typo3/tca/codeInspection/v10/InternalTypeFileInspectionTest.java
@@ -12,7 +12,7 @@ protected String getTestDataPath() {
     public void testInvalidInternalTypeIsNotDisplayedWhenPluginIsDisabled() {
         disablePlugin();
 
-        myFixture.enableInspections(InternalTypeFileInspection.class);
+        myFixture.enableInspections(new InternalTypeFileInspection());
 
         myFixture.addFileToProject("foo/ext_emconf.php", "");
 
@@ -23,7 +23,7 @@ public void testInvalidInternalTypeIsNotDisplayedWhenPluginIsDisabled() {
     }
 
     public void testInvalidInternalTypeIsNotDisplayedOnv8() {
-        myFixture.enableInspections(InternalTypeFileInspection.class);
+        myFixture.enableInspections(new InternalTypeFileInspection());
 
         myFixture.addFileToProject("foo/ext_emconf.php", "");
 
@@ -34,7 +34,7 @@ public void testInvalidInternalTypeIsNotDisplayedOnv8() {
     }
 
     public void testInvalidInternalTypeIsDisplayedOnv9() {
-        myFixture.enableInspections(InternalTypeFileInspection.class);
+        myFixture.enableInspections(new InternalTypeFileInspection());
 
         myFixture.addFileToProject("foo/ext_emconf.php", "");
 
@@ -45,7 +45,7 @@ public void testInvalidInternalTypeIsDisplayedOnv9() {
     }
 
     public void testInvalidInternalTypeIsHighlightedOnv10() {
-        myFixture.enableInspections(InternalTypeFileInspection.class);
+        myFixture.enableInspections(new InternalTypeFileInspection());
 
         myFixture.addFileToProject("foo/ext_emconf.php", "");
 

Original file line number	Diff line number	Diff line change
`@@ -12,31 +12,25 @@ public void testIconsAreNotAnnotatedWhenPluginDisabled() {`
`12`	`12`	`disablePlugin();`
`13`	`13`
`14`	`14`	`myFixture.copyFileToProject("IconRegistry9.php");`
`15`		`- myFixture.configureByFiles("icon_not_available_disabled.php");`
`16`	`15`
`17`		`- myFixture.checkHighlighting();`
	`16`	`+ myFixture.testHighlighting("icon_not_available_disabled.php");`
`18`	`17`	`}`
`19`	`18`
`20`	`19`	`public void testIconsAreNotAnnotatedWhenPluginEnabledButAnnotationDisabled() {`
`21`	`20`	`disablePlugin();`
`22`	`21`
`23`	`22`	`myFixture.copyFileToProject("IconRegistry9.php");`
`24`		`- myFixture.configureByFiles("icon_not_available_disabled.php");`
`25`	`23`
`26`		`- myFixture.checkHighlighting();`
	`24`	`+ myFixture.testHighlighting("icon_not_available_disabled.php");`
`27`	`25`	`}`
`28`	`26`
`29`	`27`	`public void testMissingIconsAreAnnotatedAsWarnings() {`
`30`	`28`	`myFixture.copyFileToProject("IconRegistry9.php");`
`31`		`- myFixture.configureByFiles("icon_not_available.php");`
`32`		`-`
`33`		`- myFixture.checkHighlighting();`
	`29`	`+ myFixture.testHighlighting("icon_not_available.php");`
`34`	`30`	`}`
`35`	`31`
`36`	`32`	`public void testPresentIconsAreNotAnnotated() {`
`37`	`33`	`myFixture.copyFileToProject("IconRegistry9.php");`
`38`		`- myFixture.configureByFiles("icon_available.php");`
`39`		`-`
`40`		`- myFixture.checkHighlighting();`
	`34`	`+ myFixture.testHighlighting("icon_available.php");`
`41`	`35`	`}`
`42`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,26 +14,20 @@ public void testDoesntAnnotateRouteWhenPluginIsDisabled() {`
`14`	`14`
`15`	`15`	`myFixture.copyFileToProject("classes.php");`
`16`	`16`
`17`		`- myFixture.configureByFile("missing_route_disabled.php");`
`18`		`-`
`19`		`- myFixture.checkHighlighting();`
	`17`	`+ myFixture.testHighlighting("missing_route_disabled.php");`
`20`	`18`	`}`
`21`	`19`
`22`	`20`	`public void testDoesntAnnotateRouteWhenPluginIsEnabledButAnnotatorIsDisabled() {`
`23`	`21`	`TYPO3CMSProjectSettings.getInstance(myFixture.getProject()).routeAnnotatorEnabled = false;`
`24`	`22`
`25`	`23`	`myFixture.copyFileToProject("classes.php");`
`26`	`24`
`27`		`- myFixture.configureByFile("missing_route_disabled.php");`
`28`		`-`
`29`		`- myFixture.checkHighlighting();`
	`25`	`+ myFixture.testHighlighting("missing_route_disabled.php");`
`30`	`26`	`}`
`31`	`27`
`32`	`28`	`public void testAnnotatesMissingRoutes() {`
`33`	`29`	`myFixture.copyFileToProject("classes.php");`
`34`	`30`
`35`		`- myFixture.configureByFile("missing_route.php");`
`36`		`-`
`37`		`- myFixture.checkHighlighting();`
	`31`	`+ myFixture.testHighlighting("missing_route.php");`
`38`	`32`	`}`
`39`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,7 @@ protected String getTestDataPath() {`
`15`	`15`	`public void testExtbasePropertyInjectionIsMarked() {`
`16`	`16`	`myFixture.enableInspections(new ExtbasePropertyInjectionInspection());`
`17`	`17`
`18`		`- VirtualFile virtualFile = myFixture.copyFileToProject("ExtbasePropertyInjectionInspectionIsMarked.php", "MyClass.php");`
`19`		`- myFixture.configureFromExistingVirtualFile(virtualFile);`
`20`		`-`
`21`		`- myFixture.checkHighlighting();`
	`18`	`+ myFixture.testHighlighting("ExtbasePropertyInjectionInspectionIsMarked.php");`
`22`	`19`	`}`
`23`	`20`
`24`	`21`	`public void testExtbasePropertyInjectionIsMarkedAndCanBeFixed() {`
`@@ -35,9 +32,6 @@ public void testExtbasePropertyInjectionIsNotMarkedWhenPluginIsDisabled() {`
`35`	`32`
`36`	`33`	`myFixture.enableInspections(new ExtbasePropertyInjectionInspection());`
`37`	`34`
`38`		`- VirtualFile virtualFile = myFixture.copyFileToProject("ExtbasePropertyInjectionInspectionIsNotMarked.php", "MyClass.php");`
`39`		`- myFixture.configureFromExistingVirtualFile(virtualFile);`
`40`		`-`
`41`		`- myFixture.checkHighlighting();`
	`35`	`+ myFixture.testHighlighting("ExtbasePropertyInjectionInspectionIsNotMarked.php");`
`42`	`36`	`}`
`43`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,20 +12,14 @@ protected String getTestDataPath() {`
`12`	`12`	`public void testMissingRenderTypeIsMarked() {`
`13`	`13`	`myFixture.enableInspections(new MissingRenderTypeInspection());`
`14`	`14`
`15`		`- VirtualFile virtualFile = myFixture.copyFileToProject("MissingRenderTypeInspectionIsMarked.php", "MyClass.php");`
`16`		`- myFixture.configureFromExistingVirtualFile(virtualFile);`
`17`		`-`
`18`		`- myFixture.checkHighlighting();`
	`15`	`+ myFixture.testHighlighting("MissingRenderTypeInspectionIsMarked.php");`
`19`	`16`	`}`
`20`	`17`
`21`	`18`	`public void testMissingRenderTypeIsNotMarkedWhenPluginDisabled() {`
`22`	`19`	`disablePlugin();`
`23`	`20`
`24`	`21`	`myFixture.enableInspections(new MissingRenderTypeInspection());`
`25`	`22`
`26`		`- VirtualFile virtualFile = myFixture.copyFileToProject("MissingRenderTypeInspectionIsNotMarked.php", "MyClass.php");`
`27`		`- myFixture.configureFromExistingVirtualFile(virtualFile);`
`28`		`-`
`29`		`- myFixture.checkHighlighting();`
	`23`	`+ myFixture.testHighlighting("MissingRenderTypeInspectionIsNotMarked.php");`
`30`	`24`	`}`
`31`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,7 @@ public void testIssue288AjaxRoutesAreIndexed() {`
`46`	`46`
`47`	`47`	`assertRouteExists("ajax_core_requirejs");`
`48`	`48`
`49`		`- myFixture.configureByFile("ajax_route_usage.php");`
`50`		`- myFixture.checkHighlighting();`
	`49`	`+ myFixture.testHighlighting("ajax_route_usage.php");`
`51`	`50`
`52`	`51`	`assertRouteStubEquals("ajax_core_requirejs","/core/requirejs", "\\TYPO3\\CMS\\Core\\Controller\\RequireJsController", "retrieveConfiguration", "public" );`
`53`	`52`	`}`