From 39f00dd77b8b56c032fc44c0067d2d5cf288721c Mon Sep 17 00:00:00 2001
From: Michail Plushnikov <mplushnikov@gmail.com>
Date: Mon, 26 Oct 2020 21:17:23 +0100
Subject: [PATCH 1/3] [lombok] using hasInitializer() where possible and
 reduced test setup code

GitOrigin-RevId: 626f13e5d07caf613d9d025afea01bb8c6730d74
---
 .../intellij/plugin/processor/CleanupProcessor.java   |  2 +-
 .../intellij/plugin/processor/ValProcessor.java       |  6 +++---
 .../AbstractConstructorClassProcessor.java            |  4 ++--
 .../plugin/processor/field/GetterFieldProcessor.java  |  2 +-
 .../plugin/processor/field/WitherFieldProcessor.java  |  4 ++--
 .../AbstractLombokLightCodeInsightTestCase.java       |  9 +++++++++
 .../action/delombok/DelombokBuilderActionTest.java    |  9 ---------
 .../action/delombok/DelombokValueActionTest.java      |  9 ---------
 .../intellij/plugin/configsystem/AccessorsTest.java   | 10 ----------
 .../plugin/configsystem/FieldDefaultsTest.java        | 10 ----------
 .../plugin/configsystem/FieldNameConstantsTest.java   | 10 ----------
 .../plugin/inspection/BuilderInspectionTest.java      |  9 ---------
 .../DataFlowWithDisabledCachingInspectionTest.java    |  9 ---------
 .../plugin/inspection/DefUseInspectionTest.java       |  4 ----
 .../plugin/inspection/LombokInspectionTest.java       |  4 ++++
 .../PointlessBooleanExpressionInspectionTest.java     |  9 ---------
 .../RedundantModifiersOnValLombokInspectionTest.java  |  9 ---------
 .../plugin/inspection/SuperBuilderInspectionTest.java |  9 ---------
 .../plugin/intention/LombokIntentionActionTest.java   |  9 ---------
 .../plugin/postfix/LombokVarPostfixTemplateTest.java  |  8 --------
 .../plugin/processor/BuilderSingularTest.java         |  4 ----
 .../intellij/plugin/processor/BuilderTest.java        |  4 ----
 .../plugin/processor/BuilderToBuilderTest.java        |  4 ----
 .../intellij/plugin/processor/ExceptionTest.java      |  4 ----
 .../plugin/processor/FieldNameConstantsOldTest.java   | 11 +++++------
 .../plugin/processor/FieldNameConstantsTest.java      |  9 ---------
 .../plugin/processor/SuperBuilderSingularTest.java    |  4 ----
 .../intellij/plugin/processor/SuperBuilderTest.java   |  4 ----
 .../intellij/plugin/processor/ValueTest.java          |  7 -------
 .../plushnikov/intellij/plugin/processor/VarTest.java | 10 +---------
 .../intellij/plugin/processor/WithTest.java           |  3 ---
 .../processor/modifier/FieldDefaultsModifierTest.java |  5 -----
 .../plugin/processor/modifier/ValModifierTest.java    | 10 +---------
 .../intellij/plugin/usage/LombokUsageTest.java        | 10 ----------
 34 files changed, 29 insertions(+), 205 deletions(-)

diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/CleanupProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/CleanupProcessor.java
index 7f5cbc0b2..e8b332122 100644
--- a/src/main/java/de/plushnikov/intellij/plugin/processor/CleanupProcessor.java
+++ b/src/main/java/de/plushnikov/intellij/plugin/processor/CleanupProcessor.java
@@ -80,7 +80,7 @@ private void validateCleanUpMethodExists(@NotNull PsiLocalVariable psiVariable,
   }
 
   private void validateInitializerExist(@NotNull ProblemNewBuilder problemNewBuilder, @NotNull PsiLocalVariable psiVariable) {
-    if (null == psiVariable.getInitializer()) {
+    if (!psiVariable.hasInitializer()) {
       problemNewBuilder.addError("'@Cleanup' variable declarations need to be initialized.");
     }
   }
diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/ValProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/ValProcessor.java
index 4ae76ae3d..2bbca3b52 100644
--- a/src/main/java/de/plushnikov/intellij/plugin/processor/ValProcessor.java
+++ b/src/main/java/de/plushnikov/intellij/plugin/processor/ValProcessor.java
@@ -57,7 +57,7 @@ public static boolean isVar(@NotNull PsiVariable psiVariable) {
   }
 
   public static boolean isVal(@NotNull PsiLocalVariable psiLocalVariable) {
-    if (psiLocalVariable.getInitializer() != null) {
+    if (psiLocalVariable.hasInitializer()) {
       final PsiTypeElement typeElement = psiLocalVariable.getTypeElement();
       return isPossibleVal(typeElement.getText()) && isVal(resolveQualifiedName(typeElement));
     }
@@ -65,7 +65,7 @@ public static boolean isVal(@NotNull PsiLocalVariable psiLocalVariable) {
   }
 
   public static boolean isVar(@NotNull PsiLocalVariable psiLocalVariable) {
-    if (psiLocalVariable.getInitializer() != null) {
+    if (psiLocalVariable.hasInitializer()) {
       final PsiTypeElement typeElement = psiLocalVariable.getTypeElement();
       return isPossibleVar(typeElement.getText()) && isVar(resolveQualifiedName(typeElement));
     }
@@ -73,7 +73,7 @@ public static boolean isVar(@NotNull PsiLocalVariable psiLocalVariable) {
   }
 
   private static boolean isValOrVar(@NotNull PsiLocalVariable psiLocalVariable) {
-    if (psiLocalVariable.getInitializer() != null) {
+    if (psiLocalVariable.hasInitializer()) {
       final PsiTypeElement typeElement = psiLocalVariable.getTypeElement();
       return isPossibleValOrVar(typeElement.getText()) && isValOrVar(resolveQualifiedName(typeElement));
     }
diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/constructor/AbstractConstructorClassProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/constructor/AbstractConstructorClassProcessor.java
index db62551bc..0595d068c 100644
--- a/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/constructor/AbstractConstructorClassProcessor.java
+++ b/src/main/java/de/plushnikov/intellij/plugin/processor/clazz/constructor/AbstractConstructorClassProcessor.java
@@ -177,7 +177,7 @@ protected Collection<PsiField> getAllNotInitializedAndNotStaticFields(@NotNull P
 
         boolean isFinal = isFieldFinal(psiField, modifierList, classAnnotatedWithValue);
         // skip initialized final fields
-        addField &= (!isFinal || null == psiField.getInitializer() ||
+        addField &= (!isFinal || !psiField.hasInitializer() ||
           PsiAnnotationSearchUtil.findAnnotation(psiField, BUILDER_DEFAULT_ANNOTATION) != null);
       }
 
@@ -204,7 +204,7 @@ public Collection<PsiField> getRequiredFields(@NotNull PsiClass psiClass) {
         final boolean isFinal = isFieldFinal(psiField, modifierList, classAnnotatedWithValue);
         final boolean isNonNull = PsiAnnotationSearchUtil.isAnnotatedWith(psiField, LombokUtils.NON_NULL_PATTERN);
         // accept initialized final or nonnull fields
-        if ((isFinal || isNonNull) && null == psiField.getInitializer()) {
+        if ((isFinal || isNonNull) && !psiField.hasInitializer()) {
           result.add(psiField);
         }
       }
diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/field/GetterFieldProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/field/GetterFieldProcessor.java
index b2a5e39ef..a12817462 100644
--- a/src/main/java/de/plushnikov/intellij/plugin/processor/field/GetterFieldProcessor.java
+++ b/src/main/java/de/plushnikov/intellij/plugin/processor/field/GetterFieldProcessor.java
@@ -53,7 +53,7 @@ protected boolean validate(@NotNull PsiAnnotation psiAnnotation, @NotNull PsiFie
           PsiQuickFixFactory.createModifierListFix(psiField, PsiModifier.FINAL, true, false));
         result = false;
       }
-      if (null == psiField.getInitializer()) {
+      if (!psiField.hasInitializer()) {
         builder.addError("'lazy' requires field initialization.");
         result = false;
       }
diff --git a/src/main/java/de/plushnikov/intellij/plugin/processor/field/WitherFieldProcessor.java b/src/main/java/de/plushnikov/intellij/plugin/processor/field/WitherFieldProcessor.java
index f0afb77fb..3b7ece43f 100644
--- a/src/main/java/de/plushnikov/intellij/plugin/processor/field/WitherFieldProcessor.java
+++ b/src/main/java/de/plushnikov/intellij/plugin/processor/field/WitherFieldProcessor.java
@@ -84,7 +84,7 @@ private boolean validNonFinalInitialized(@NotNull PsiField psiField, @NotNull Pr
     final PsiClass psiClass = psiField.getContainingClass();
     if (null != psiClass &&
       psiField.hasModifierProperty(PsiModifier.FINAL) && !PsiAnnotationSearchUtil.isAnnotatedWith(psiClass, LombokClassNames.VALUE) &&
-      psiField.getInitializer() != null && !PsiAnnotationSearchUtil.isAnnotatedWith(psiField, LombokClassNames.BUILDER_DEFAULT)) {
+      psiField.hasInitializer() && !PsiAnnotationSearchUtil.isAnnotatedWith(psiField, LombokClassNames.BUILDER_DEFAULT)) {
       builder.addWarning("Not generating wither for this field: Withers cannot be generated for final, initialized fields.",
         PsiQuickFixFactory.createModifierListFix(psiField, PsiModifier.FINAL, false, false));
       return false;
@@ -152,7 +152,7 @@ private Collection<PsiField> filterFields(@NotNull PsiClass psiClass) {
       if (classField.hasModifierProperty(PsiModifier.STATIC)) {
         continue;
       }
-      if (classField.hasModifierProperty(PsiModifier.FINAL) && null != classField.getInitializer()) {
+      if (classField.hasModifierProperty(PsiModifier.FINAL) && classField.hasInitializer()) {
         continue;
       }
 
diff --git a/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokLightCodeInsightTestCase.java b/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokLightCodeInsightTestCase.java
index 8c05c8205..ff1ebeaaa 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokLightCodeInsightTestCase.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokLightCodeInsightTestCase.java
@@ -1,5 +1,6 @@
 package de.plushnikov.intellij.plugin;
 
+import com.intellij.openapi.util.RecursionManager;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -41,6 +42,14 @@ protected void loadLombokLibrary() {
     LombokTestUtil.loadLombokLibrary(myFixture.getProjectDisposable(), getModule());
   }
 
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+
+    //TODO disable assertions for the moment
+    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
+  }
+
   protected PsiFile loadToPsiFile(String fileName) {
     final String sourceFilePath = getBasePath() + "/" + fileName;
     VirtualFile virtualFile = myFixture.copyFileToProject(sourceFilePath, fileName);
diff --git a/src/test/java/de/plushnikov/intellij/plugin/action/delombok/DelombokBuilderActionTest.java b/src/test/java/de/plushnikov/intellij/plugin/action/delombok/DelombokBuilderActionTest.java
index b8e47fc77..5bc64cc0b 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/action/delombok/DelombokBuilderActionTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/action/delombok/DelombokBuilderActionTest.java
@@ -1,7 +1,6 @@
 package de.plushnikov.intellij.plugin.action.delombok;
 
 import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.util.RecursionManager;
 import de.plushnikov.intellij.plugin.action.LombokLightActionTestCase;
 
 public class DelombokBuilderActionTest extends LombokLightActionTestCase {
@@ -15,14 +14,6 @@ protected String getBasePath() {
     return super.getBasePath() + "/action/delombok/builder";
   }
 
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-  }
-
   public void testBuilderSimple() throws Exception {
     doTest();
   }
diff --git a/src/test/java/de/plushnikov/intellij/plugin/action/delombok/DelombokValueActionTest.java b/src/test/java/de/plushnikov/intellij/plugin/action/delombok/DelombokValueActionTest.java
index 270881929..dfb86e647 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/action/delombok/DelombokValueActionTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/action/delombok/DelombokValueActionTest.java
@@ -1,7 +1,6 @@
 package de.plushnikov.intellij.plugin.action.delombok;
 
 import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.util.RecursionManager;
 import de.plushnikov.intellij.plugin.action.LombokLightActionTestCase;
 
 public class DelombokValueActionTest extends LombokLightActionTestCase {
@@ -15,14 +14,6 @@ protected String getBasePath() {
     return super.getBasePath() + "/action/delombok/value";
   }
 
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-  }
-
   public void testValuePlain() throws Exception {
     doTest();
   }
diff --git a/src/test/java/de/plushnikov/intellij/plugin/configsystem/AccessorsTest.java b/src/test/java/de/plushnikov/intellij/plugin/configsystem/AccessorsTest.java
index 09d8bd716..92ee4999d 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/configsystem/AccessorsTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/configsystem/AccessorsTest.java
@@ -1,7 +1,5 @@
 package de.plushnikov.intellij.plugin.configsystem;
 
-import com.intellij.openapi.util.RecursionManager;
-
 /**
  * Unit tests for IntelliJPlugin for Lombok with activated config system
  */
@@ -16,14 +14,6 @@ protected String getBasePath() {
     return super.getBasePath() + "/configsystem/accessors";
   }
 
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-  }
-
   public void testChain$GetterSetterFieldTest() {
     doTest();
   }
diff --git a/src/test/java/de/plushnikov/intellij/plugin/configsystem/FieldDefaultsTest.java b/src/test/java/de/plushnikov/intellij/plugin/configsystem/FieldDefaultsTest.java
index f4dec70f2..3cf968e4e 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/configsystem/FieldDefaultsTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/configsystem/FieldDefaultsTest.java
@@ -1,7 +1,5 @@
 package de.plushnikov.intellij.plugin.configsystem;
 
-import com.intellij.openapi.util.RecursionManager;
-
 import java.io.IOException;
 
 /**
@@ -14,14 +12,6 @@ protected String getBasePath() {
     return super.getBasePath() + "/configsystem/fieldDefaults";
   }
 
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-  }
-
   //region DefaultFinal
   public void testDefaultFinal$DefaultFinalFieldTest() throws IOException {
     doTest();
diff --git a/src/test/java/de/plushnikov/intellij/plugin/configsystem/FieldNameConstantsTest.java b/src/test/java/de/plushnikov/intellij/plugin/configsystem/FieldNameConstantsTest.java
index 3b2f02865..6e6946b36 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/configsystem/FieldNameConstantsTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/configsystem/FieldNameConstantsTest.java
@@ -1,7 +1,5 @@
 package de.plushnikov.intellij.plugin.configsystem;
 
-import com.intellij.openapi.util.RecursionManager;
-
 public class FieldNameConstantsTest extends AbstractLombokConfigSystemTestCase {
 
   @Override
@@ -9,14 +7,6 @@ protected String getBasePath() {
     return super.getBasePath() + "/configsystem/fieldnameconstants";
   }
 
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-  }
-
   public void testConfiguration$FieldNameConstantsConfigKeys() {
     doTest();
   }
diff --git a/src/test/java/de/plushnikov/intellij/plugin/inspection/BuilderInspectionTest.java b/src/test/java/de/plushnikov/intellij/plugin/inspection/BuilderInspectionTest.java
index ed3c6b865..363ff408e 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/inspection/BuilderInspectionTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/inspection/BuilderInspectionTest.java
@@ -3,7 +3,6 @@
 import com.intellij.codeInspection.InspectionProfileEntry;
 import com.intellij.openapi.application.ApplicationInfo;
 import com.intellij.openapi.util.BuildNumber;
-import com.intellij.openapi.util.RecursionManager;
 
 public class BuilderInspectionTest extends LombokInspectionTest {
 
@@ -17,14 +16,6 @@ protected InspectionProfileEntry getInspection() {
     return new LombokInspection();
   }
 
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-  }
-
   public void testBuilderDefaultValue() {
     final BuildNumber buildNumber = ApplicationInfo.getInstance().getBuild();
     if (193 <= buildNumber.getBaselineVersion()) {
diff --git a/src/test/java/de/plushnikov/intellij/plugin/inspection/DataFlowWithDisabledCachingInspectionTest.java b/src/test/java/de/plushnikov/intellij/plugin/inspection/DataFlowWithDisabledCachingInspectionTest.java
index b5b2127c0..60d913f8a 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/inspection/DataFlowWithDisabledCachingInspectionTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/inspection/DataFlowWithDisabledCachingInspectionTest.java
@@ -2,7 +2,6 @@
 
 import com.intellij.codeInspection.InspectionProfileEntry;
 import com.intellij.codeInspection.dataFlow.DataFlowInspection;
-import com.intellij.openapi.util.RecursionManager;
 
 
 public class DataFlowWithDisabledCachingInspectionTest extends LombokInspectionTest {
@@ -17,14 +16,6 @@ protected InspectionProfileEntry getInspection() {
     return new DataFlowInspection();
   }
 
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-  }
-
   public void testDefaultBuilderFinalValueInspectionIsAlwaysThat() {
     doTest();
   }
diff --git a/src/test/java/de/plushnikov/intellij/plugin/inspection/DefUseInspectionTest.java b/src/test/java/de/plushnikov/intellij/plugin/inspection/DefUseInspectionTest.java
index 8c810c145..bdbd7357b 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/inspection/DefUseInspectionTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/inspection/DefUseInspectionTest.java
@@ -2,7 +2,6 @@
 
 import com.intellij.codeInspection.InspectionProfileEntry;
 import com.intellij.codeInspection.defUse.DefUseInspection;
-import com.intellij.openapi.util.RecursionManager;
 import org.jetbrains.annotations.Nullable;
 
 
@@ -19,9 +18,6 @@ protected InspectionProfileEntry getInspection() {
   }
 
   public void testIssue633() {
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-
     doTest();
   }
 }
diff --git a/src/test/java/de/plushnikov/intellij/plugin/inspection/LombokInspectionTest.java b/src/test/java/de/plushnikov/intellij/plugin/inspection/LombokInspectionTest.java
index 12b8cc2ea..2a59b3a44 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/inspection/LombokInspectionTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/inspection/LombokInspectionTest.java
@@ -1,5 +1,6 @@
 package de.plushnikov.intellij.plugin.inspection;
 
+import com.intellij.openapi.util.RecursionManager;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.testFramework.LightProjectDescriptor;
 import com.siyeh.ig.LightJavaInspectionTestCase;
@@ -16,6 +17,9 @@ public void setUp() throws Exception {
     LombokTestUtil.loadLombokLibrary(myFixture.getProjectDisposable(), getModule());
 
     Registry.get("platform.random.idempotence.check.rate").setValue(1, getTestRootDisposable());
+
+    //TODO disable assertions for the moment
+    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
   }
 
   @NotNull
diff --git a/src/test/java/de/plushnikov/intellij/plugin/inspection/PointlessBooleanExpressionInspectionTest.java b/src/test/java/de/plushnikov/intellij/plugin/inspection/PointlessBooleanExpressionInspectionTest.java
index 5a6809b58..b61ad18eb 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/inspection/PointlessBooleanExpressionInspectionTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/inspection/PointlessBooleanExpressionInspectionTest.java
@@ -1,7 +1,6 @@
 package de.plushnikov.intellij.plugin.inspection;
 
 import com.intellij.codeInspection.InspectionProfileEntry;
-import com.intellij.openapi.util.RecursionManager;
 import com.siyeh.ig.controlflow.PointlessBooleanExpressionInspection;
 
 
@@ -19,14 +18,6 @@ protected InspectionProfileEntry getInspection() {
     return new PointlessBooleanExpressionInspection();
   }
 
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-  }
-
   public void testPointlessBooleanExpressionBuilderDefault() {
     doTest();
   }
diff --git a/src/test/java/de/plushnikov/intellij/plugin/inspection/RedundantModifiersOnValLombokInspectionTest.java b/src/test/java/de/plushnikov/intellij/plugin/inspection/RedundantModifiersOnValLombokInspectionTest.java
index 13628bcad..ec93796f0 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/inspection/RedundantModifiersOnValLombokInspectionTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/inspection/RedundantModifiersOnValLombokInspectionTest.java
@@ -1,7 +1,6 @@
 package de.plushnikov.intellij.plugin.inspection;
 
 import com.intellij.codeInspection.InspectionProfileEntry;
-import com.intellij.openapi.util.RecursionManager;
 import de.plushnikov.intellij.plugin.inspection.modifiers.RedundantModifiersOnValLombokAnnotationInspection;
 
 public class RedundantModifiersOnValLombokInspectionTest extends LombokInspectionTest {
@@ -11,14 +10,6 @@ protected String getTestDataPath() {
     return TEST_DATA_INSPECTION_DIRECTORY + "/redundantModifierInspection";
   }
 
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-  }
-
   @Override
   protected InspectionProfileEntry getInspection() {
     return new RedundantModifiersOnValLombokAnnotationInspection();
diff --git a/src/test/java/de/plushnikov/intellij/plugin/inspection/SuperBuilderInspectionTest.java b/src/test/java/de/plushnikov/intellij/plugin/inspection/SuperBuilderInspectionTest.java
index 0fc5250e2..989191beb 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/inspection/SuperBuilderInspectionTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/inspection/SuperBuilderInspectionTest.java
@@ -3,7 +3,6 @@
 import com.intellij.codeInspection.InspectionProfileEntry;
 import com.intellij.openapi.application.ApplicationInfo;
 import com.intellij.openapi.util.BuildNumber;
-import com.intellij.openapi.util.RecursionManager;
 
 public class SuperBuilderInspectionTest extends LombokInspectionTest {
 
@@ -17,14 +16,6 @@ protected InspectionProfileEntry getInspection() {
     return new LombokInspection();
   }
 
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-  }
-
   public void testBuilderDefaultValue() {
     final BuildNumber buildNumber = ApplicationInfo.getInstance().getBuild();
     if (193 <= buildNumber.getBaselineVersion()) {
diff --git a/src/test/java/de/plushnikov/intellij/plugin/intention/LombokIntentionActionTest.java b/src/test/java/de/plushnikov/intellij/plugin/intention/LombokIntentionActionTest.java
index ccaeccb10..28df23aed 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/intention/LombokIntentionActionTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/intention/LombokIntentionActionTest.java
@@ -1,7 +1,6 @@
 package de.plushnikov.intellij.plugin.intention;
 
 import com.intellij.codeInsight.intention.IntentionAction;
-import com.intellij.openapi.util.RecursionManager;
 import com.intellij.psi.PsiFile;
 import de.plushnikov.intellij.plugin.AbstractLombokLightCodeInsightTestCase;
 
@@ -14,14 +13,6 @@ protected String getBasePath() {
     return TEST_DATA_INTENTION_DIRECTORY;
   }
 
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-  }
-
   public abstract IntentionAction getIntentionAction();
 
   public abstract boolean wasInvocationSuccessful();
diff --git a/src/test/java/de/plushnikov/intellij/plugin/postfix/LombokVarPostfixTemplateTest.java b/src/test/java/de/plushnikov/intellij/plugin/postfix/LombokVarPostfixTemplateTest.java
index 4f7bed0b7..65180c2dc 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/postfix/LombokVarPostfixTemplateTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/postfix/LombokVarPostfixTemplateTest.java
@@ -1,16 +1,8 @@
 package de.plushnikov.intellij.plugin.postfix;
 
-import com.intellij.openapi.util.RecursionManager;
 import de.plushnikov.intellij.plugin.AbstractLombokLightCodeInsightTestCase;
 
 public class LombokVarPostfixTemplateTest extends AbstractLombokLightCodeInsightTestCase {
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-  }
 
   public void testSimpleVarl() {
     doTest("/postfix/varl/");
diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderSingularTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderSingularTest.java
index 4aa341cb5..ccc572825 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderSingularTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderSingularTest.java
@@ -1,6 +1,5 @@
 package de.plushnikov.intellij.plugin.processor;
 
-import com.intellij.openapi.util.RecursionManager;
 import de.plushnikov.intellij.plugin.AbstractLombokParsingTestCase;
 
 /**
@@ -13,9 +12,6 @@ public void setUp() throws Exception {
     // Add dummy classes, which are absent in mockJDK
     myFixture.addClass("package java.util;\n  public interface NavigableSet<E> extends java.util.SortedSet<E> {}");
     myFixture.addClass("package java.util;\n  public interface NavigableMap<K,V> extends java.util.SortedMap<K,V> {}");
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
   }
 
   public void testBuilder$Singular$Generic$Guava$SingularGuavaBiMap() {
diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderTest.java
index 263aca3c3..a6fd61ab2 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderTest.java
@@ -1,6 +1,5 @@
 package de.plushnikov.intellij.plugin.processor;
 
-import com.intellij.openapi.util.RecursionManager;
 import de.plushnikov.intellij.plugin.AbstractLombokParsingTestCase;
 
 /**
@@ -18,9 +17,6 @@ public void setUp() throws Exception {
     super.setUp();
     // Add dummy classes, which are absent in mockJDK
     myFixture.addClass("package java.util;\n  public interface NavigableMap<K,V> extends java.util.SortedMap<K,V> {}");
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
   }
 
   // This test is lombok's homepage example.
diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderToBuilderTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderToBuilderTest.java
index dcaf47ac6..e69c7f755 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderToBuilderTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/processor/BuilderToBuilderTest.java
@@ -1,6 +1,5 @@
 package de.plushnikov.intellij.plugin.processor;
 
-import com.intellij.openapi.util.RecursionManager;
 import de.plushnikov.intellij.plugin.AbstractLombokParsingTestCase;
 
 /**
@@ -12,9 +11,6 @@ public void setUp() throws Exception {
     super.setUp();
     // Add dummy classes, which are absent in mockJDK
     myFixture.addClass("package java.util;\n  public interface NavigableMap<K,V> extends java.util.SortedMap<K,V> {}");
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
   }
 
   public void testBuilder$BuilderWithToBuilder() {
diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/ExceptionTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/ExceptionTest.java
index 0efb84d47..1f2f45b0f 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/processor/ExceptionTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/processor/ExceptionTest.java
@@ -1,7 +1,6 @@
 package de.plushnikov.intellij.plugin.processor;
 
 import com.intellij.openapi.command.WriteCommandAction;
-import com.intellij.openapi.util.RecursionManager;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiMethod;
@@ -21,9 +20,6 @@ protected String getBasePath() {
   }
 
   public void testError526() {
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-
     PsiFile psiFile = loadToPsiFile(getTestName(false) + ".java");
     assertNotNull(psiFile);
 
diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/FieldNameConstantsOldTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/FieldNameConstantsOldTest.java
index 2ee232406..0093782f7 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/processor/FieldNameConstantsOldTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/processor/FieldNameConstantsOldTest.java
@@ -1,20 +1,19 @@
 package de.plushnikov.intellij.plugin.processor;
 
-import com.intellij.openapi.util.RecursionManager;
+import com.intellij.testFramework.LightProjectDescriptor;
 import de.plushnikov.intellij.plugin.AbstractLombokParsingTestCase;
 import de.plushnikov.intellij.plugin.LombokTestUtil;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Unit tests for @FieldNameConstants annotation from old version of lombok
  */
 public class FieldNameConstantsOldTest extends AbstractLombokParsingTestCase {
 
+  @NotNull
   @Override
-  public void setUp() throws Exception {
-    super.setUp();
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
+  protected LightProjectDescriptor getProjectDescriptor() {
+    return LombokTestUtil.LOMBOK_OLD_DESCRIPTOR;
   }
 
   public void testFieldnameconstants$FieldNameConstantsOldBasic() {
diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/FieldNameConstantsTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/FieldNameConstantsTest.java
index 4d10275d9..49ac8855b 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/processor/FieldNameConstantsTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/processor/FieldNameConstantsTest.java
@@ -1,6 +1,5 @@
 package de.plushnikov.intellij.plugin.processor;
 
-import com.intellij.openapi.util.RecursionManager;
 import de.plushnikov.intellij.plugin.AbstractLombokParsingTestCase;
 
 /**
@@ -8,14 +7,6 @@
  */
 public class FieldNameConstantsTest extends AbstractLombokParsingTestCase {
 
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-  }
-
   public void testFieldnameconstants$FieldNameConstantsBasic() {
     doTest(true);
   }
diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/SuperBuilderSingularTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/SuperBuilderSingularTest.java
index ca4f9c6fa..f638930a0 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/processor/SuperBuilderSingularTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/processor/SuperBuilderSingularTest.java
@@ -1,6 +1,5 @@
 package de.plushnikov.intellij.plugin.processor;
 
-import com.intellij.openapi.util.RecursionManager;
 import de.plushnikov.intellij.plugin.AbstractLombokParsingTestCase;
 
 /**
@@ -13,9 +12,6 @@ public void setUp() throws Exception {
     // Add dummy classes, which are absent in mockJDK
     myFixture.addClass("package java.util;\n  public interface NavigableSet<E> extends java.util.SortedSet<E> {}");
     myFixture.addClass("package java.util;\n  public interface NavigableMap<K,V> extends java.util.SortedMap<K,V> {}");
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
   }
 
   public void testSuperbuilder$Singular$Generic$Guava$SingularGuavaBiMap() {
diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/SuperBuilderTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/SuperBuilderTest.java
index 44383d230..b41e1f9f0 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/processor/SuperBuilderTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/processor/SuperBuilderTest.java
@@ -1,6 +1,5 @@
 package de.plushnikov.intellij.plugin.processor;
 
-import com.intellij.openapi.util.RecursionManager;
 import de.plushnikov.intellij.plugin.AbstractLombokParsingTestCase;
 
 /**
@@ -18,9 +17,6 @@ public void setUp() throws Exception {
     super.setUp();
     // Add dummy classes, which are absent in mockJDK
     myFixture.addClass("package java.util;\n  public interface NavigableMap<K,V> extends java.util.SortedMap<K,V> {}");
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
   }
 
   public void testSuperbuilder$SuperBuilderAbstract() {
diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/ValueTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/ValueTest.java
index 8b0a3e507..a2ab0f8c7 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/processor/ValueTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/processor/ValueTest.java
@@ -1,6 +1,5 @@
 package de.plushnikov.intellij.plugin.processor;
 
-import com.intellij.openapi.util.RecursionManager;
 import de.plushnikov.intellij.plugin.AbstractLombokParsingTestCase;
 
 public class ValueTest extends AbstractLombokParsingTestCase {
@@ -14,9 +13,6 @@ protected boolean shouldCompareCodeBlocks() {
   }
 
   public void testValue$ValueIssue94() {
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-
     doTest(true);
   }
 
@@ -53,9 +49,6 @@ protected boolean shouldCompareCodeBlocks() {
   }
 
   public void testValue$ValueWithPackagePrivate() {
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-
     doTest(true);
   }
 
diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/VarTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/VarTest.java
index b5febd261..fbacd6f6d 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/processor/VarTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/processor/VarTest.java
@@ -1,11 +1,6 @@
 package de.plushnikov.intellij.plugin.processor;
 
-import com.intellij.openapi.util.RecursionManager;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiIdentifier;
-import com.intellij.psi.PsiLocalVariable;
-import com.intellij.psi.PsiParameter;
-import com.intellij.psi.PsiType;
+import com.intellij.psi.*;
 import de.plushnikov.intellij.plugin.AbstractLombokLightCodeInsightTestCase;
 
 public class VarTest extends AbstractLombokLightCodeInsightTestCase {
@@ -63,9 +58,6 @@ public void testGenericNewCollection() {
   }
 
   public void testGenericTypeDiamond296() {
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-
     configureClass("new java.util.concurrent.atomic.AtomicReference<>(\"abc\")");
     verifyLocalVariableType("java.util.concurrent.atomic.AtomicReference<java.lang.String>");
   }
diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/WithTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/WithTest.java
index 25091ec5a..25f559afa 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/processor/WithTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/processor/WithTest.java
@@ -1,6 +1,5 @@
 package de.plushnikov.intellij.plugin.processor;
 
-import com.intellij.openapi.util.RecursionManager;
 import de.plushnikov.intellij.plugin.AbstractLombokParsingTestCase;
 
 public class WithTest extends AbstractLombokParsingTestCase {
@@ -62,8 +61,6 @@ protected boolean shouldCompareCodeBlocks() {
   }
 
   public void testWith$WithAndBuilderDefaultOnFieldAndValueOnClass() {
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
     doTest(true);
   }
 
diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/FieldDefaultsModifierTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/FieldDefaultsModifierTest.java
index 922bcb850..235c401a6 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/FieldDefaultsModifierTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/FieldDefaultsModifierTest.java
@@ -1,6 +1,5 @@
 package de.plushnikov.intellij.plugin.processor.modifier;
 
-import com.intellij.openapi.util.RecursionManager;
 import com.intellij.psi.PsiField;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiModifier;
@@ -46,8 +45,6 @@ public void testFieldDefaultsFinalFalse() {
   }
 
   public void testFieldDefaultsWithNonFinal() {
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
     PsiModifierList modifierList = getFieldModifierListAtCaret();
 
     assertFalse("@FieldDefaults(makeFinal = true) should not make @NonFinal fields final", modifierList.hasModifierProperty(PsiModifier.FINAL));
@@ -114,8 +111,6 @@ public void testFieldDefaultsPrivate() {
   }
 
   public void testFieldDefaultsPublicWithPackagePrivate() {
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
     PsiModifierList modifierList = getFieldModifierListAtCaret();
 
     assertFalse("@FieldDefaults(level = AccessLevel.PUBLIC) should not make @PackagePrivate fields public", modifierList.hasModifierProperty(PsiModifier.PUBLIC));
diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/ValModifierTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/ValModifierTest.java
index 8e82b2aed..5fb0249fc 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/ValModifierTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/ValModifierTest.java
@@ -1,11 +1,6 @@
 package de.plushnikov.intellij.plugin.processor.modifier;
 
-import com.intellij.openapi.util.RecursionManager;
-import com.intellij.psi.PsiDocumentManager;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiLocalVariable;
-import com.intellij.psi.PsiModifier;
-import com.intellij.psi.PsiType;
+import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
 
@@ -23,9 +18,6 @@ protected String getTestDataPath() {
   public void setUp() throws Exception {
     super.setUp();
     myFixture.addClass("package lombok;\npublic @interface val { }");
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
   }
 
   public void testValModifiers() {
diff --git a/src/test/java/de/plushnikov/intellij/plugin/usage/LombokUsageTest.java b/src/test/java/de/plushnikov/intellij/plugin/usage/LombokUsageTest.java
index 35a483ea2..6eee2bb00 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/usage/LombokUsageTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/usage/LombokUsageTest.java
@@ -1,6 +1,5 @@
 package de.plushnikov.intellij.plugin.usage;
 
-import com.intellij.openapi.util.RecursionManager;
 import com.intellij.usageView.UsageInfo;
 import de.plushnikov.intellij.plugin.AbstractLombokLightCodeInsightTestCase;
 import org.jetbrains.annotations.NotNull;
@@ -25,25 +24,16 @@ public void testFindUsageAccessors() {
   }
 
   public void testFindUsageWither() {
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-
     final Collection<UsageInfo> usages = loadTestClass();
     assertUsages(usages, "findUsageWither.withBar", "findUsageWither.getBar");
   }
 
   public void testFindUsageBuilder() {
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-
     final Collection<UsageInfo> usages = loadTestClass();
     assertUsages(usages, "FindUsageBuilder.builder().bar", "findUsageBuilder.getBar");
   }
 
   public void testFindUsageSingularBuilder() {
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-
     final Collection<UsageInfo> usages = loadTestClass();
     assertUsages(usages, "FindUsageSingularBuilder.builder().bar", "FindUsageSingularBuilder.builder().bars",
       "FindUsageSingularBuilder.builder().clearBars", "findUsageBuilder.getBars");

From 0cb442132bfeadfd6dd92bb8dd83b7b741d05766 Mon Sep 17 00:00:00 2001
From: Michail Plushnikov <mplushnikov@gmail.com>
Date: Tue, 27 Oct 2020 18:35:57 +0100
Subject: [PATCH 2/3] fix merge

---
 .../AbstractLombokLightCodeInsightTestCase.java       | 11 +++--------
 .../plugin/processor/FieldNameConstantsOldTest.java   |  8 --------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokLightCodeInsightTestCase.java b/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokLightCodeInsightTestCase.java
index ff1ebeaaa..342aca30a 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokLightCodeInsightTestCase.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/AbstractLombokLightCodeInsightTestCase.java
@@ -36,20 +36,15 @@ public void setUp() throws Exception {
     super.setUp();
 
     loadLombokLibrary();
+
+    //TODO disable assertions for the moment
+    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
   }
 
   protected void loadLombokLibrary() {
     LombokTestUtil.loadLombokLibrary(myFixture.getProjectDisposable(), getModule());
   }
 
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-
-    //TODO disable assertions for the moment
-    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
-  }
-
   protected PsiFile loadToPsiFile(String fileName) {
     final String sourceFilePath = getBasePath() + "/" + fileName;
     VirtualFile virtualFile = myFixture.copyFileToProject(sourceFilePath, fileName);
diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/FieldNameConstantsOldTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/FieldNameConstantsOldTest.java
index 0093782f7..f91dc0ba8 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/processor/FieldNameConstantsOldTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/processor/FieldNameConstantsOldTest.java
@@ -1,21 +1,13 @@
 package de.plushnikov.intellij.plugin.processor;
 
-import com.intellij.testFramework.LightProjectDescriptor;
 import de.plushnikov.intellij.plugin.AbstractLombokParsingTestCase;
 import de.plushnikov.intellij.plugin.LombokTestUtil;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * Unit tests for @FieldNameConstants annotation from old version of lombok
  */
 public class FieldNameConstantsOldTest extends AbstractLombokParsingTestCase {
 
-  @NotNull
-  @Override
-  protected LightProjectDescriptor getProjectDescriptor() {
-    return LombokTestUtil.LOMBOK_OLD_DESCRIPTOR;
-  }
-
   public void testFieldnameconstants$FieldNameConstantsOldBasic() {
     doTest(true);
   }

From d8b68470d9f266afcc1780bd05865bdcf39cf578 Mon Sep 17 00:00:00 2001
From: Michail Plushnikov <mplushnikov@gmail.com>
Date: Tue, 27 Oct 2020 18:39:36 +0100
Subject: [PATCH 3/3] fix merge

---
 .../intellij/plugin/processor/modifier/ValModifierTest.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/ValModifierTest.java b/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/ValModifierTest.java
index 5fb0249fc..f0f29b921 100644
--- a/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/ValModifierTest.java
+++ b/src/test/java/de/plushnikov/intellij/plugin/processor/modifier/ValModifierTest.java
@@ -1,5 +1,6 @@
 package de.plushnikov.intellij.plugin.processor.modifier;
 
+import com.intellij.openapi.util.RecursionManager;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase;
@@ -18,6 +19,8 @@ protected String getTestDataPath() {
   public void setUp() throws Exception {
     super.setUp();
     myFixture.addClass("package lombok;\npublic @interface val { }");
+    //TODO disable assertions for the moment
+    RecursionManager.disableMissedCacheAssertions(myFixture.getProjectDisposable());
   }
 
   public void testValModifiers() {