From dcd7e13a1cdf79430156f156e3091cb1f939ccaa Mon Sep 17 00:00:00 2001
From: Vyacheslav Kotelnikov <kotelnikovvv@msk.bcs.ru>
Date: Tue, 17 Oct 2023 21:45:17 +0300
Subject: [PATCH 1/3] added preferred test framework combobox to settings form

---
 .../GenerateAllSetterSettingForm.form         | 32 +++++++++++++++++--
 .../GenerateAllSetterSettingForm.java         |  3 ++
 .../template/GenerateSetterState.java         | 12 +++++++
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateAllSetterSettingForm.form b/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateAllSetterSettingForm.form
index 1cf6958..5b78ca3 100644
--- a/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateAllSetterSettingForm.form
+++ b/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateAllSetterSettingForm.form
@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="panel1" default-binding="true" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="500" height="400"/>
+      <xy x="20" y="20" width="521" height="400"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -15,7 +15,7 @@
         <properties/>
         <border type="none"/>
         <children>
-          <grid id="a574c" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="a574c" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints border-constraint="North"/>
             <properties/>
@@ -47,7 +47,7 @@
               <grid id="99e56" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                 <margin top="0" left="0" bottom="0" right="0"/>
                 <constraints>
-                  <grid row="1" column="0" row-span="2" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                  <grid row="2" column="0" row-span="2" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties/>
                 <border type="none"/>
@@ -124,6 +124,32 @@
                   </grid>
                 </children>
               </grid>
+              <grid id="e4650" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+                <margin top="0" left="0" bottom="0" right="0"/>
+                <constraints>
+                  <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties/>
+                <border type="none"/>
+                <children>
+                  <component id="687d3" class="javax.swing.JLabel" binding="preferredTestingFrameworkForLabel" default-binding="true">
+                    <constraints>
+                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <text value="Preferred testing framework (for assertions)"/>
+                    </properties>
+                  </component>
+                  <component id="ea787" class="javax.swing.JComboBox" binding="comboBoxPreferredTestFramework">
+                    <constraints>
+                      <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <editable value="false"/>
+                    </properties>
+                  </component>
+                </children>
+              </grid>
             </children>
           </grid>
           <grid id="ca9b3" binding="splitterPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
diff --git a/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateAllSetterSettingForm.java b/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateAllSetterSettingForm.java
index 9a55c39..1dec9ba 100644
--- a/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateAllSetterSettingForm.java
+++ b/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateAllSetterSettingForm.java
@@ -63,6 +63,8 @@ public class GenerateAllSetterSettingForm {
     private JPanel splitterPanel;
     private JCheckBox useOnlyJDKClassesCheckBox;
     private JPanel generateByTemplateSettings;
+    private JComboBox comboBoxPreferredTestFramework;
+    private JLabel preferredTestingFrameworkForLabel;
     private GenerateSetterState myGenerateSetterState;
     private int currentSelectedIndex = -1;
 
@@ -252,6 +254,7 @@ public void importFromSettings(GenerateSetterState state) {
     public GenerateSetterState getTheState() {
         myGenerateSetterState.setGenerateByTemplate(enableGenerateByTemplateCheckBox.isSelected());
         myGenerateSetterState.setUseJdkClassesOnly(useOnlyJDKClassesCheckBox.isSelected());
+        myGenerateSetterState.setPreferredTestingFramework(((String) comboBoxPreferredTestFramework.getSelectedItem()));
         return myGenerateSetterState;
     }
 
diff --git a/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateSetterState.java b/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateSetterState.java
index ca3fed4..ac8ac59 100644
--- a/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateSetterState.java
+++ b/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateSetterState.java
@@ -28,6 +28,8 @@ public class GenerateSetterState {
     private Boolean useJdkClassesOnly = false;
     private Boolean generateByTemplate = false;
 
+    private String preferredTestingFramework = "JUnit 5";
+
     private List<Template> templateList = Lists.newArrayList();
 
     public Boolean getUseJdkClassesOnly() {
@@ -66,6 +68,7 @@ public boolean equals(Object o) {
                 .append(useJdkClassesOnly, that.useJdkClassesOnly)
                 .append(generateByTemplate, that.generateByTemplate)
                 .append(templateList, that.templateList)
+                .append(preferredTestingFramework, that.preferredTestingFramework)
                 .isEquals();
     }
 
@@ -75,6 +78,15 @@ public int hashCode() {
                 .append(useJdkClassesOnly)
                 .append(generateByTemplate)
                 .append(templateList)
+                .append(preferredTestingFramework)
                 .toHashCode();
     }
+
+    public String getPreferredTestingFramework() {
+        return preferredTestingFramework;
+    }
+
+    public void setPreferredTestingFramework(String preferredTestingFramework) {
+        this.preferredTestingFramework = preferredTestingFramework;
+    }
 }

From 8ef2ad5487a1d978eb145268d0ec3d8824d7b0a6 Mon Sep 17 00:00:00 2001
From: Vyacheslav Kotelnikov <kotelnikovvv@msk.bcs.ru>
Date: Sun, 22 Oct 2023 16:18:48 +0300
Subject: [PATCH 2/3] updated preferred TestEngine combobox. Updated current
 TestEngine detection

---
 .../generatesetter/TestEngine.java            | 32 ++++++++++
 .../actions/AssertAllGetterAction.java        | 64 ++++++++++++-------
 .../actions/AssertNotNullAction.java          | 25 ++++----
 .../GenerateAllSetterSettingForm.form         | 16 +++--
 .../GenerateAllSetterSettingForm.java         | 24 ++++++-
 .../template/GenerateSetterState.java         | 15 +++--
 6 files changed, 124 insertions(+), 52 deletions(-)
 create mode 100644 src/main/java/com/bruce/intellijplugin/generatesetter/TestEngine.java

diff --git a/src/main/java/com/bruce/intellijplugin/generatesetter/TestEngine.java b/src/main/java/com/bruce/intellijplugin/generatesetter/TestEngine.java
new file mode 100644
index 0000000..68507b0
--- /dev/null
+++ b/src/main/java/com/bruce/intellijplugin/generatesetter/TestEngine.java
@@ -0,0 +1,32 @@
+package com.bruce.intellijplugin.generatesetter;
+
+public enum TestEngine {
+    ASSERT("Plain java assert", "java.util", "Objects"),
+    JUNIT4("JUnit 4", "org.junit", "Assert"),
+    JUNIT5("JUnit 5", "org.junit.jupiter.api", "Assertions"),
+    TESTNG("TestNG", "org.testng.asserts", "Assertion"),
+    ASSERTJ("AssertJ", "org.assertj.core.api", "Assertions"),
+    HAMCREST("Hamcrest", "org.hamcrest.core", "MatcherAssert");
+
+    private final String formattedName;
+    private final String assertionsPackage;
+    private final String assertionsClassName;
+
+    TestEngine(String formattedName, String assertionsPackage, String assertionsClassName) {
+        this.formattedName = formattedName;
+        this.assertionsPackage = assertionsPackage;
+        this.assertionsClassName = assertionsClassName;
+    }
+
+    public String getFormattedName() {
+        return formattedName;
+    }
+
+    public String getAssertionsPackage() {
+        return assertionsPackage;
+    }
+
+    public String getAssertionsClassName() {
+        return assertionsClassName;
+    }
+}
diff --git a/src/main/java/com/bruce/intellijplugin/generatesetter/actions/AssertAllGetterAction.java b/src/main/java/com/bruce/intellijplugin/generatesetter/actions/AssertAllGetterAction.java
index ad45fb2..15e859f 100644
--- a/src/main/java/com/bruce/intellijplugin/generatesetter/actions/AssertAllGetterAction.java
+++ b/src/main/java/com/bruce/intellijplugin/generatesetter/actions/AssertAllGetterAction.java
@@ -16,6 +16,10 @@
 
 import com.bruce.intellijplugin.generatesetter.CommonConstants;
 import com.bruce.intellijplugin.generatesetter.GenerateAllHandlerAdapter;
+import com.bruce.intellijplugin.generatesetter.TestEngine;
+import com.bruce.intellijplugin.generatesetter.template.GenerateSetterService;
+import com.bruce.intellijplugin.generatesetter.template.GenerateSetterState;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.module.Module;
@@ -30,33 +34,31 @@
 import com.intellij.psi.PsiImportStatement;
 import com.intellij.psi.PsiImportStaticStatement;
 import com.intellij.psi.PsiJavaFile;
+import com.intellij.psi.impl.compiled.ClsClassImpl;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.PsiShortNamesCache;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static com.bruce.intellijplugin.generatesetter.actions.AssertAllGetterAction.TestEngine.ASSERT;
-import static com.bruce.intellijplugin.generatesetter.actions.AssertAllGetterAction.TestEngine.ASSERTJ;
-import static com.bruce.intellijplugin.generatesetter.actions.AssertAllGetterAction.TestEngine.JUNIT4;
-import static com.bruce.intellijplugin.generatesetter.actions.AssertAllGetterAction.TestEngine.JUNIT5;
-import static com.bruce.intellijplugin.generatesetter.actions.AssertAllGetterAction.TestEngine.TESTNG;
+import static com.bruce.intellijplugin.generatesetter.TestEngine.*;
 
 /**
  * @author bruce ge
  */
 public class AssertAllGetterAction extends GenerateAllSetterBase {
-    enum TestEngine {ASSERT, JUNIT4, JUNIT5, TESTNG, ASSERTJ}
 
     // imports to add when generating asserts.
-    private static final Map<TestEngine, String> engineImports = ImmutableMap.<TestEngine, String>builder()
-            .put(JUNIT4, "static org.junit.Assert.assertEquals")
-            .put(JUNIT5, "static org.junit.jupiter.api.Assertions.assertEquals")
-            .put(TESTNG, "static org.testng.Assert.assertEquals")
-            .put(ASSERTJ, "static org.assertj.core.api.Assertions.assertThat")
-            .put(ASSERT, "java.util.Objects")
+    private static final Map<TestEngine, List<String>> engineImports = ImmutableMap.<TestEngine, List<String>>builder()
+            .put(JUNIT4, ImmutableList.of("static org.junit.Assert.assertEquals"))
+            .put(JUNIT5, ImmutableList.of("static org.junit.jupiter.api.Assertions.assertEquals"))
+            .put(TESTNG, ImmutableList.of("static org.testng.Assert.assertEquals"))
+            .put(ASSERTJ, ImmutableList.of("static org.assertj.core.api.Assertions.assertThat"))
+            .put(ASSERT, ImmutableList.of("java.util.Objects"))
+            .put(HAMCREST, ImmutableList.of("static org.hamcrest.MatcherAssert.assertThat", "org.hamcrest.Matchers.*"))
             .build();
 
     // className like 'java.util.Objects' -> engine (only java.util.Objects)
@@ -70,6 +72,7 @@ enum TestEngine {ASSERT, JUNIT4, JUNIT5, TESTNG, ASSERTJ}
             .put("org.junit.jupiter.api.Assertions", JUNIT5)
             .put("org.testng.Assert", TESTNG)
             .put("org.assertj.core.api.Assertions", ASSERTJ)
+            .put("org.hamcrest.MatcherAssert", HAMCREST)
             .build();
 
     // engine -> assert static method
@@ -78,6 +81,7 @@ enum TestEngine {ASSERT, JUNIT4, JUNIT5, TESTNG, ASSERTJ}
             .put(JUNIT5, "assertEquals")
             .put(TESTNG, "assertEquals")
             .put(ASSERTJ, "assertThat")
+            .put(HAMCREST, "assertThat")
             .build();
 
     protected Project project;
@@ -136,18 +140,25 @@ private TestEngine detectCurrentTestEngineInternal(Project project, PsiFile cont
                 PsiJavaFile javaFile = (PsiJavaFile) containingFile;
                 PsiImportList importList = javaFile.getImportList();
 
-                // prefer AssertJ if it is in classpath
+
+                // prefer TestEngine from settings if it is in classpath
                 ProjectFileIndex index = ProjectFileIndex.getInstance(project);
                 Module module = index.getModuleForFile(containingFile.getVirtualFile());
                 if (module != null) {
+                    GenerateSetterState state = GenerateSetterService.getInstance().getState();
+                    TestEngine preferredTestEngine = state.getPreferredTestEngine();
+
+                    String assertionsClassName = preferredTestEngine.getAssertionsClassName();
+
                     GlobalSearchScope searchScope = GlobalSearchScope.moduleRuntimeScope(module, true);
-                    PsiClass[] lists = PsiShortNamesCache.getInstance(project)
-                            .getClassesByName("Assertions", searchScope);
+                    PsiClass[] projectAssertionClasses = PsiShortNamesCache.getInstance(project)
+                            .getClassesByName(assertionsClassName, searchScope);
 
-                    for (PsiClass psiClass : lists) {
-                        if ("org.assertj.core.api.Assertions".equals(psiClass.getName())) {
+                    for (PsiClass psiClass : projectAssertionClasses) {
+                        String psiClassQualifiedName = psiClass.getQualifiedName();
+                        if (String.format("%s.%s", preferredTestEngine.getAssertionsPackage(), preferredTestEngine.getAssertionsClassName()).equals(psiClassQualifiedName)) {
                             detectImportedEngines(importList);
-                            return ASSERTJ;
+                            return preferredTestEngine;
                         }
                     }
                 }
@@ -165,22 +176,25 @@ private TestEngine detectCurrentTestEngineInternal(Project project, PsiFile cont
                         }
 
                         if (qualifiedName.startsWith("org.junit.jupiter.api.")) {
-                            return TestEngine.JUNIT5;
+                            return JUNIT5;
                         }
                         if (qualifiedName.startsWith("org.junit.")) {
-                            return TestEngine.JUNIT4;
+                            return JUNIT4;
                         }
                         if (qualifiedName.startsWith("org.assertj.")) {
-                            return TestEngine.ASSERTJ;
+                            return ASSERTJ;
                         }
                         if (qualifiedName.startsWith("org.testng.")) {
-                            return TestEngine.TESTNG;
+                            return TESTNG;
+                        }
+                        if (qualifiedName.startsWith("org.hamcrest.")) {
+                            return HAMCREST;
                         }
                     }
                 }
             }
 
-            return TestEngine.ASSERT;
+            return ASSERT;
         }
 
         private void detectImportedEngines(PsiImportList importList) {
@@ -263,6 +277,8 @@ public String formatLine(String line) {
                     return "assertThat(" + getter + ").isEqualTo(" + value + ");";
                 case ASSERT:
                     return "assert Objects.equals(" + value + ", " + getter + ");";
+                case HAMCREST:
+                    return "assertThat(" + value + ", equalTo(" + getter + ");";
                 default:
                     throw new Error("Unknown case: " + currentFileTestEngine);
             }
@@ -271,7 +287,7 @@ public String formatLine(String line) {
         @Override
         public void appendImportList(Set<String> newImportList) {
             if (!currentFileImportedEngines.contains(currentFileTestEngine)) {
-                newImportList.add(engineImports.get(currentFileTestEngine));
+                newImportList.addAll(engineImports.get(currentFileTestEngine));
             }
         }
     }
diff --git a/src/main/java/com/bruce/intellijplugin/generatesetter/actions/AssertNotNullAction.java b/src/main/java/com/bruce/intellijplugin/generatesetter/actions/AssertNotNullAction.java
index 2ec7e80..f8d7680 100644
--- a/src/main/java/com/bruce/intellijplugin/generatesetter/actions/AssertNotNullAction.java
+++ b/src/main/java/com/bruce/intellijplugin/generatesetter/actions/AssertNotNullAction.java
@@ -1,6 +1,8 @@
 package com.bruce.intellijplugin.generatesetter.actions;
 
 import com.bruce.intellijplugin.generatesetter.CommonConstants;
+import com.bruce.intellijplugin.generatesetter.TestEngine;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.intellij.psi.PsiMethod;
 import org.jetbrains.annotations.NotNull;
@@ -9,20 +11,15 @@
 import java.util.Map;
 import java.util.Set;
 
-import static com.bruce.intellijplugin.generatesetter.actions.AssertAllGetterAction.TestEngine.ASSERT;
-import static com.bruce.intellijplugin.generatesetter.actions.AssertAllGetterAction.TestEngine.ASSERTJ;
-import static com.bruce.intellijplugin.generatesetter.actions.AssertAllGetterAction.TestEngine.JUNIT4;
-import static com.bruce.intellijplugin.generatesetter.actions.AssertAllGetterAction.TestEngine.JUNIT5;
-import static com.bruce.intellijplugin.generatesetter.actions.AssertAllGetterAction.TestEngine.TESTNG;
-
 public class AssertNotNullAction extends AssertAllGetterAction {
     // imports to add when generating asserts.
-    private static final Map<TestEngine, String> engineImports = ImmutableMap.<TestEngine, String>builder()
-            .put(JUNIT4, "static org.junit.Assert.assertNotNull")
-            .put(JUNIT5, "static org.junit.jupiter.api.Assertions.assertNotNull")
-            .put(TESTNG, "static org.testng.Assert.assertNotNull")
-            .put(ASSERTJ, "static org.assertj.core.api.Assertions.assertThat")
-            .put(ASSERT, "java.util.Objects")
+    private static final Map<TestEngine, List<String>> engineImports = ImmutableMap.<TestEngine, List<String>>builder()
+            .put(TestEngine.JUNIT4, ImmutableList.of("static org.junit.Assert.assertNotNull"))
+            .put(TestEngine.JUNIT5, ImmutableList.of("static org.junit.jupiter.api.Assertions.assertNotNull"))
+            .put(TestEngine.TESTNG, ImmutableList.of("static org.testng.Assert.assertNotNull"))
+            .put(TestEngine.ASSERTJ, ImmutableList.of("static org.assertj.core.api.Assertions.assertThat"))
+            .put(TestEngine.ASSERT, ImmutableList.of("java.util.Objects"))
+            .put(TestEngine.HAMCREST, ImmutableList.of("static org.hamcrest.MatcherAssert.assertThat", "org.hamcrest.Matchers.*"))
             .build();
 
     private final GenerateAllAssertsHandlerAdapter generateAllHandler;
@@ -48,7 +45,7 @@ protected String generateStringForNoParam(String generateName,
         Set<TestEngine> currentFileImportedEngines = generateAllHandler.currentFileImportedEngines;
 
         if (!currentFileImportedEngines.contains(currentFileTestEngine)) {
-            newImportList.add(engineImports.get(currentFileTestEngine));
+            newImportList.addAll(engineImports.get(currentFileTestEngine));
         }
 
         switch (currentFileTestEngine) {
@@ -60,6 +57,8 @@ protected String generateStringForNoParam(String generateName,
                 return splitText + "assertThat(" + generateName + ").isNotNull();";
             case ASSERT:
                 return splitText + "assert " + generateName + " != null";
+            case HAMCREST:
+                return splitText + "assertThat( " + generateName + ", notNullValue());";
             default:
                 throw new Error("Unknown case: " + currentFileTestEngine);
         }
diff --git a/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateAllSetterSettingForm.form b/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateAllSetterSettingForm.form
index 5b78ca3..d2f67bc 100644
--- a/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateAllSetterSettingForm.form
+++ b/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateAllSetterSettingForm.form
@@ -124,7 +124,7 @@
                   </grid>
                 </children>
               </grid>
-              <grid id="e4650" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+              <grid id="e4650" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                 <margin top="0" left="0" bottom="0" right="0"/>
                 <constraints>
                   <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -132,22 +132,28 @@
                 <properties/>
                 <border type="none"/>
                 <children>
-                  <component id="687d3" class="javax.swing.JLabel" binding="preferredTestingFrameworkForLabel" default-binding="true">
+                  <component id="687d3" class="javax.swing.JLabel" binding="preferAssertionsFromLabel" default-binding="true">
                     <constraints>
                       <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                     </constraints>
                     <properties>
-                      <text value="Preferred testing framework (for assertions)"/>
+                      <labelFor value="ea787"/>
+                      <text value="Prefer assertions from:"/>
                     </properties>
                   </component>
-                  <component id="ea787" class="javax.swing.JComboBox" binding="comboBoxPreferredTestFramework">
+                  <component id="ea787" class="javax.swing.JComboBox" binding="preferredTestEngineComboBox">
                     <constraints>
-                      <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+                      <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
                     </constraints>
                     <properties>
                       <editable value="false"/>
                     </properties>
                   </component>
+                  <hspacer id="e5454">
+                    <constraints>
+                      <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                  </hspacer>
                 </children>
               </grid>
             </children>
diff --git a/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateAllSetterSettingForm.java b/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateAllSetterSettingForm.java
index 1dec9ba..913d301 100644
--- a/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateAllSetterSettingForm.java
+++ b/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateAllSetterSettingForm.java
@@ -14,6 +14,7 @@
 
 package com.bruce.intellijplugin.generatesetter.template;
 
+import com.bruce.intellijplugin.generatesetter.TestEngine;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.BrowserUtil;
 import com.intellij.openapi.actionSystem.*;
@@ -33,7 +34,10 @@
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.refactoring.ui.ClassNameReferenceEditor;
 import com.intellij.testFramework.LightVirtualFile;
+import com.intellij.ui.CollectionComboBoxModel;
 import com.intellij.ui.EditorTextField;
+import com.intellij.ui.EnumComboBoxModel;
+import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ui.components.JBList;
 import com.intellij.ui.components.labels.LinkLabel;
 import com.intellij.ui.components.labels.LinkListener;
@@ -46,6 +50,7 @@
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -63,8 +68,8 @@ public class GenerateAllSetterSettingForm {
     private JPanel splitterPanel;
     private JCheckBox useOnlyJDKClassesCheckBox;
     private JPanel generateByTemplateSettings;
-    private JComboBox comboBoxPreferredTestFramework;
-    private JLabel preferredTestingFrameworkForLabel;
+    private JComboBox<TestEngine> preferredTestEngineComboBox;
+    private JLabel preferAssertionsFromLabel;
     private GenerateSetterState myGenerateSetterState;
     private int currentSelectedIndex = -1;
 
@@ -148,6 +153,16 @@ public void actionPerformed(ActionEvent e) {
                 updateGenerateByTemplateCheckBoxState();
             }
         });
+
+        preferredTestEngineComboBox.setModel(new EnumComboBoxModel<>(TestEngine.class));
+        ListCellRendererWrapper<TestEngine> aRenderer = new ListCellRendererWrapper() {
+            @Override
+            public void customize(JList list, Object value, int index, boolean selected, boolean hasFocus) {
+                setText(((TestEngine) value).getFormattedName());
+            }
+        };
+        preferredTestEngineComboBox.setRenderer(aRenderer);
+
     }
 
     private void updateGenerateByTemplateCheckBoxState() {
@@ -223,6 +238,9 @@ public void importFromSettings(GenerateSetterState state) {
         Boolean useJdkClassesOnly = state.getUseJdkClassesOnly();
         useOnlyJDKClassesCheckBox.setSelected(useJdkClassesOnly);
 
+        TestEngine preferredTestEngine = state.getPreferredTestEngine();
+        preferredTestEngineComboBox.setSelectedItem(preferredTestEngine);
+
         Boolean generateByTemplate = state.getGenerateByTemplate();
         enableGenerateByTemplateCheckBox.setSelected(generateByTemplate);
         updateGenerateByTemplateCheckBoxState();
@@ -254,7 +272,7 @@ public void importFromSettings(GenerateSetterState state) {
     public GenerateSetterState getTheState() {
         myGenerateSetterState.setGenerateByTemplate(enableGenerateByTemplateCheckBox.isSelected());
         myGenerateSetterState.setUseJdkClassesOnly(useOnlyJDKClassesCheckBox.isSelected());
-        myGenerateSetterState.setPreferredTestingFramework(((String) comboBoxPreferredTestFramework.getSelectedItem()));
+        myGenerateSetterState.setPreferredTestEngine(((TestEngine) preferredTestEngineComboBox.getSelectedItem()));
         return myGenerateSetterState;
     }
 
diff --git a/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateSetterState.java b/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateSetterState.java
index ac8ac59..1dad5d4 100644
--- a/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateSetterState.java
+++ b/src/main/java/com/bruce/intellijplugin/generatesetter/template/GenerateSetterState.java
@@ -15,6 +15,7 @@
 package com.bruce.intellijplugin.generatesetter.template;
 
 
+import com.bruce.intellijplugin.generatesetter.TestEngine;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -28,7 +29,7 @@ public class GenerateSetterState {
     private Boolean useJdkClassesOnly = false;
     private Boolean generateByTemplate = false;
 
-    private String preferredTestingFramework = "JUnit 5";
+    private TestEngine preferredTestEngine = TestEngine.ASSERTJ;
 
     private List<Template> templateList = Lists.newArrayList();
 
@@ -68,7 +69,7 @@ public boolean equals(Object o) {
                 .append(useJdkClassesOnly, that.useJdkClassesOnly)
                 .append(generateByTemplate, that.generateByTemplate)
                 .append(templateList, that.templateList)
-                .append(preferredTestingFramework, that.preferredTestingFramework)
+                .append(preferredTestEngine, that.preferredTestEngine)
                 .isEquals();
     }
 
@@ -78,15 +79,15 @@ public int hashCode() {
                 .append(useJdkClassesOnly)
                 .append(generateByTemplate)
                 .append(templateList)
-                .append(preferredTestingFramework)
+                .append(preferredTestEngine)
                 .toHashCode();
     }
 
-    public String getPreferredTestingFramework() {
-        return preferredTestingFramework;
+    public TestEngine getPreferredTestEngine() {
+        return preferredTestEngine;
     }
 
-    public void setPreferredTestingFramework(String preferredTestingFramework) {
-        this.preferredTestingFramework = preferredTestingFramework;
+    public void setPreferredTestEngine(TestEngine preferredTestEngine) {
+        this.preferredTestEngine = preferredTestEngine;
     }
 }

From 187668f5c83106ad1e883a47d6f91d2d977b9cb6 Mon Sep 17 00:00:00 2001
From: Vyacheslav Kotelnikov <kotelnikovvv@msk.bcs.ru>
Date: Sun, 29 Oct 2023 18:07:11 +0300
Subject: [PATCH 3/3] improved existing test engine import detection by static
 method. Added tests for AssertAllGetterAction

---
 build.gradle                                  |   1 +
 .../actions/AssertAllGetterAction.java        |  38 ++--
 .../actions/GenerateAllSetterBase.java        |   3 +-
 .../template/GenerateSetterService.java       |  55 ++++++
 .../template/PreferredTestEngineProvider.java |  16 ++
 .../AssertAllGetterWithDefaultValueTest.java  | 175 ++++++++++++++++++
 .../after.java                                |  81 ++++++++
 .../before.java                               |  69 +++++++
 .../after.java                                |  82 ++++++++
 .../before.java                               |  70 +++++++
 .../after.java                                |  81 ++++++++
 .../before.java                               |  69 +++++++
 .../after.java                                |  88 +++++++++
 .../before.java                               |  69 +++++++
 .../after.java                                |  81 ++++++++
 .../before.java                               |  70 +++++++
 16 files changed, 1030 insertions(+), 18 deletions(-)
 create mode 100644 src/test/java/com/bruce/intellijplugin/generatesetter/template/GenerateSetterService.java
 create mode 100644 src/test/java/com/bruce/intellijplugin/generatesetter/template/PreferredTestEngineProvider.java
 create mode 100644 src/test/java/generateAllSetter/AssertAllGetterWithDefaultValueTest.java
 create mode 100644 src/test/resources/testData/testGenerateAllSetterDefaultValue_AssertJ/after.java
 create mode 100644 src/test/resources/testData/testGenerateAllSetterDefaultValue_AssertJ/before.java
 create mode 100644 src/test/resources/testData/testGenerateAllSetterDefaultValue_IgnoresExistingImportWithPreferredEngine/after.java
 create mode 100644 src/test/resources/testData/testGenerateAllSetterDefaultValue_IgnoresExistingImportWithPreferredEngine/before.java
 create mode 100644 src/test/resources/testData/testGenerateAllSetterDefaultValue_Jupiter/after.java
 create mode 100644 src/test/resources/testData/testGenerateAllSetterDefaultValue_Jupiter/before.java
 create mode 100644 src/test/resources/testData/testGenerateAllSetterDefaultValue_SwitchesBetweenEnginesCorrectly/after.java
 create mode 100644 src/test/resources/testData/testGenerateAllSetterDefaultValue_SwitchesBetweenEnginesCorrectly/before.java
 create mode 100644 src/test/resources/testData/testGenerateAllSetterDefaultValue_UsesExistingImportIfPreferredNotOnClasspath/after.java
 create mode 100644 src/test/resources/testData/testGenerateAllSetterDefaultValue_UsesExistingImportIfPreferredNotOnClasspath/before.java

diff --git a/build.gradle b/build.gradle
index 6881923..3334112 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,6 +55,7 @@ intellij {
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
+    testCompile group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.10.0'
     // https://mvnrepository.com/artifact/org.assertj/assertj-core
     testCompile group: 'org.assertj', name: 'assertj-core', version: '3.12.2'
 
diff --git a/src/main/java/com/bruce/intellijplugin/generatesetter/actions/AssertAllGetterAction.java b/src/main/java/com/bruce/intellijplugin/generatesetter/actions/AssertAllGetterAction.java
index 15e859f..0203225 100644
--- a/src/main/java/com/bruce/intellijplugin/generatesetter/actions/AssertAllGetterAction.java
+++ b/src/main/java/com/bruce/intellijplugin/generatesetter/actions/AssertAllGetterAction.java
@@ -27,13 +27,7 @@
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiClass;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiImportList;
-import com.intellij.psi.PsiImportStatement;
-import com.intellij.psi.PsiImportStaticStatement;
-import com.intellij.psi.PsiJavaFile;
+import com.intellij.psi.*;
 import com.intellij.psi.impl.compiled.ClsClassImpl;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.PsiShortNamesCache;
@@ -209,15 +203,27 @@ private void detectImportedEngines(PsiImportList importList) {
             for (PsiImportStaticStatement importStaticStatement : importStaticStatements) {
                 PsiClass psiClass = importStaticStatement.resolveTargetClass();
                 if (psiClass == null) {
-                    continue;
-                }
-
-                String qualifiedName = psiClass.getQualifiedName();
-                TestEngine testEngine = engineStaticImportsReversed.get(qualifiedName);
-                if (testEngine != null) {
-                    String referenceName = importStaticStatement.getReferenceName(); // like assertEquals
-                    if (referenceName == null || referenceName.equals(engineStaticImportsMethod.get(testEngine))) {
-                        currentFileImportedEngines.add(testEngine);
+                    //if it is a static import of a method from any testengine
+                    PsiJavaCodeReferenceElement importReference = importStaticStatement.getImportReference();
+                    if (importReference == null || importReference.getQualifiedName() == null) {
+                        continue;
+                    }
+                    String qualifiedName = importReference.getQualifiedName();
+                    engineStaticImportsReversed.entrySet()
+                            .stream()
+                            .filter(entry -> qualifiedName.startsWith(entry.getKey()))
+                            .findFirst()
+                            .ifPresent(entry -> currentFileImportedEngines.add(entry.getValue()));
+
+                } else {
+
+                    String qualifiedName = psiClass.getQualifiedName();
+                    TestEngine testEngine = engineStaticImportsReversed.get(qualifiedName);
+                    if (testEngine != null) {
+                        String referenceName = importStaticStatement.getReferenceName(); // like assertEquals
+                        if (referenceName == null || referenceName.equals(engineStaticImportsMethod.get(testEngine))) {
+                            currentFileImportedEngines.add(testEngine);
+                        }
                     }
                 }
             }
diff --git a/src/main/java/com/bruce/intellijplugin/generatesetter/actions/GenerateAllSetterBase.java b/src/main/java/com/bruce/intellijplugin/generatesetter/actions/GenerateAllSetterBase.java
index 3657a25..fc51c32 100644
--- a/src/main/java/com/bruce/intellijplugin/generatesetter/actions/GenerateAllSetterBase.java
+++ b/src/main/java/com/bruce/intellijplugin/generatesetter/actions/GenerateAllSetterBase.java
@@ -581,13 +581,12 @@ else if (psiClassOfParameter!=null && psiClassOfParameter.isEnum()) {
         }
         builder.append(");");
 
-        generateAllHandler.appendImportList(newImportList);
-
         if (generateAllHandler.forAssertWithDefaultValues()) {
             mainBuilder.append(generateAllHandler.formatLine(builder.toString()));
         } else {
             mainBuilder.append(builder);
         }
+        generateAllHandler.appendImportList(newImportList);
     }
 
     private static void appendCollectNotEmpty(StringBuilder builder,
diff --git a/src/test/java/com/bruce/intellijplugin/generatesetter/template/GenerateSetterService.java b/src/test/java/com/bruce/intellijplugin/generatesetter/template/GenerateSetterService.java
new file mode 100644
index 0000000..2c67e5d
--- /dev/null
+++ b/src/test/java/com/bruce/intellijplugin/generatesetter/template/GenerateSetterService.java
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (c) 2017-2019, bruce.ge.
+ *    This program is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU General Public License
+ *    as published by the Free Software Foundation; version 2 of
+ *    the License.
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *    GNU General Public License for more details.
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program;
+ */
+
+package com.bruce.intellijplugin.generatesetter.template;
+
+import com.bruce.intellijplugin.generatesetter.TestEngine;
+import com.intellij.openapi.components.PersistentStateComponent;
+import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.components.State;
+import com.intellij.openapi.components.Storage;
+import com.intellij.psi.PsiFileFactory;
+import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nullable;
+
+/**
+ * @author bruce ge 2022/8/25
+ */
+@State(
+        name = "com.bruce.GenerateAllSetterState",
+        storages = @Storage("GenerateAllSetterPlugin.xml"))
+public class GenerateSetterService implements PersistentStateComponent<GenerateSetterState> {
+
+    public static GenerateSetterService getInstance() {
+        return ServiceManager.getService(GenerateSetterService.class);
+    }
+
+    private GenerateSetterState myState = new GenerateSetterState();
+
+    @Nullable
+    @Override
+    public GenerateSetterState getState() {
+        GenerateSetterState generateSetterState = new GenerateSetterState();
+        generateSetterState.setPreferredTestEngine(PreferredTestEngineProvider.getTestEngine());
+        return generateSetterState;
+    }
+
+    @Override
+    public void loadState(@NotNull GenerateSetterState state) {
+        GenerateSetterState generateSetterState = new GenerateSetterState();
+        generateSetterState.setPreferredTestEngine(TestEngine.JUNIT4);
+        myState = generateSetterState;
+    }
+}
diff --git a/src/test/java/com/bruce/intellijplugin/generatesetter/template/PreferredTestEngineProvider.java b/src/test/java/com/bruce/intellijplugin/generatesetter/template/PreferredTestEngineProvider.java
new file mode 100644
index 0000000..d4e0592
--- /dev/null
+++ b/src/test/java/com/bruce/intellijplugin/generatesetter/template/PreferredTestEngineProvider.java
@@ -0,0 +1,16 @@
+package com.bruce.intellijplugin.generatesetter.template;
+
+import com.bruce.intellijplugin.generatesetter.TestEngine;
+
+public class PreferredTestEngineProvider {
+
+    public static TestEngine testEngine = TestEngine.ASSERTJ;
+
+    public static TestEngine getTestEngine() {
+        return testEngine;
+    }
+
+    public static void setTestEngine(TestEngine testEngine) {
+        PreferredTestEngineProvider.testEngine = testEngine;
+    }
+}
diff --git a/src/test/java/generateAllSetter/AssertAllGetterWithDefaultValueTest.java b/src/test/java/generateAllSetter/AssertAllGetterWithDefaultValueTest.java
new file mode 100644
index 0000000..8af1184
--- /dev/null
+++ b/src/test/java/generateAllSetter/AssertAllGetterWithDefaultValueTest.java
@@ -0,0 +1,175 @@
+/*
+ *  Copyright (c) 2017-2019, bruce.ge.
+ *    This program is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU General Public License
+ *    as published by the Free Software Foundation; version 2 of
+ *    the License.
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *    GNU General Public License for more details.
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program;
+ */
+
+package generateAllSetter;
+
+import com.bruce.intellijplugin.generatesetter.CommonConstants;
+import com.bruce.intellijplugin.generatesetter.TestEngine;
+import com.bruce.intellijplugin.generatesetter.template.PreferredTestEngineProvider;
+import com.intellij.codeInsight.intention.IntentionAction;
+import com.intellij.pom.java.LanguageLevel;
+import com.intellij.testFramework.LightProjectDescriptor;
+import com.intellij.testFramework.PsiTestUtil;
+import com.intellij.testFramework.fixtures.*;
+import com.intellij.util.PathUtil;
+import org.assertj.core.api.Assertions;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jps.model.module.JpsModuleSourceRootType;
+
+import java.io.File;
+
+import static org.jetbrains.jps.model.java.JavaSourceRootType.TEST_SOURCE;
+
+/**
+ * @author bruce ge
+ */
+public class AssertAllGetterWithDefaultValueTest extends LightCodeInsightFixtureTestCase {
+    @NotNull
+    @Override
+    protected LightProjectDescriptor getProjectDescriptor() {
+
+        class MyDescriptor extends ProjectDescriptor {
+
+            public MyDescriptor(@NotNull LanguageLevel languageLevel) {
+                super(languageLevel);
+            }
+
+            public MyDescriptor(@NotNull LanguageLevel languageLevel, boolean withAnnotations) {
+                super(languageLevel, withAnnotations);
+            }
+
+            @NotNull
+            @Override
+            protected JpsModuleSourceRootType<?> getSourceRootType() {
+                return TEST_SOURCE;
+            }
+
+            @Override
+            public boolean equals(Object obj) {
+                // make every project descriptor unique to prevent dependency interference
+                // https://plugins.jetbrains.com/docs/intellij/light-and-heavy-tests.html#lightprojectdescriptor
+                return false;
+            }
+        }
+
+        return new MyDescriptor(LanguageLevel.HIGHEST);
+    }
+
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        addLibrary(org.assertj.core.api.Assertions.class);
+        addLibrary(org.junit.jupiter.api.Assertions.class);
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    @Override
+    protected String getTestDataPath() {
+        return "src/test/resources/testData";
+    }
+
+    public void testGenerateAllSetterDefaultValue_AssertJ() {
+
+        PreferredTestEngineProvider.setTestEngine(TestEngine.ASSERTJ);
+
+        myFixture.configureByFile(getName() + "/before.java");
+
+        IntentionAction singleIntention = myFixture.findSingleIntention(CommonConstants.ASSERT_ALL_PROPS);
+
+        Assertions.assertThat(singleIntention).isNotNull();
+        myFixture.launchAction(singleIntention);
+
+        myFixture.checkResultByFile(getName() + "/after.java",true);
+    }
+
+    public void testGenerateAllSetterDefaultValue_Jupiter() {
+
+        PreferredTestEngineProvider.setTestEngine(TestEngine.JUNIT5);
+
+        myFixture.configureByFile(getName() + "/before.java");
+
+        IntentionAction singleIntention = myFixture.findSingleIntention(CommonConstants.ASSERT_ALL_PROPS);
+
+        Assertions.assertThat(singleIntention).isNotNull();
+        myFixture.launchAction(singleIntention);
+
+        myFixture.checkResultByFile(getName() + "/after.java",true);
+    }
+
+    public void testGenerateAllSetterDefaultValue_UsesExistingImportIfPreferredNotOnClasspath() {
+
+        PreferredTestEngineProvider.setTestEngine(TestEngine.HAMCREST);
+
+        myFixture.configureByFile(getName() + "/before.java");
+
+        IntentionAction singleIntention = myFixture.findSingleIntention(CommonConstants.ASSERT_ALL_PROPS);
+
+        Assertions.assertThat(singleIntention).isNotNull();
+        myFixture.launchAction(singleIntention);
+
+        myFixture.checkResultByFile(getName() + "/after.java",true);
+    }
+
+    public void testGenerateAllSetterDefaultValue_SwitchesBetweenEnginesCorrectly() {
+
+        PreferredTestEngineProvider.setTestEngine(TestEngine.JUNIT5);
+
+        myFixture.configureByFile(getName() + "/before.java");
+
+        IntentionAction singleIntention = myFixture.findSingleIntention(CommonConstants.ASSERT_ALL_PROPS);
+
+        Assertions.assertThat(singleIntention).isNotNull();
+        myFixture.launchAction(singleIntention);
+
+
+        PreferredTestEngineProvider.setTestEngine(TestEngine.ASSERTJ);
+
+        singleIntention = myFixture.findSingleIntention(CommonConstants.ASSERT_ALL_PROPS);
+
+        Assertions.assertThat(singleIntention).isNotNull();
+        myFixture.launchAction(singleIntention);
+
+        myFixture.checkResultByFile(getName() + "/after.java",true);
+
+
+    }
+
+    public void testGenerateAllSetterDefaultValue_IgnoresExistingImportWithPreferredEngine() {
+
+        PreferredTestEngineProvider.setTestEngine(TestEngine.JUNIT5);
+
+        myFixture.configureByFile(getName() + "/before.java");
+
+        IntentionAction singleIntention = myFixture.findSingleIntention(CommonConstants.ASSERT_ALL_PROPS);
+        Assertions.assertThat(singleIntention).isNotNull();
+        myFixture.launchAction(singleIntention);
+
+        myFixture.checkResultByFile(getName() + "/after.java",true);
+
+    }
+
+    private void addLibrary(Class<?> aClass) {
+        String jarPathForClass = PathUtil.getJarPathForClass(aClass);
+        File file = new File(jarPathForClass);
+        String libName = file.getName();
+        PsiTestUtil.addLibrary(myFixture.getProjectDisposable(), myModule, libName, file.getParent(), libName);
+    }
+
+
+}
diff --git a/src/test/resources/testData/testGenerateAllSetterDefaultValue_AssertJ/after.java b/src/test/resources/testData/testGenerateAllSetterDefaultValue_AssertJ/after.java
new file mode 100644
index 0000000..39bbca5
--- /dev/null
+++ b/src/test/resources/testData/testGenerateAllSetterDefaultValue_AssertJ/after.java
@@ -0,0 +1,81 @@
+
+import static org.assertj.core.api.Assertions.assertThat;
+import Integer;
+import String;
+import Boolean;
+import Date;
+import BigDecimal;import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+public class AssertAllGetterWithDefault {
+
+    public static class People {
+
+        private String name;
+
+        private Integer age;
+
+        private Date birth;
+
+        private Boolean sex;
+
+        private BigDecimal length;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Integer getAge() {
+            return age;
+        }
+
+        public void setAge(Integer age) {
+            this.age = age;
+        }
+
+        public Date getBirth() {
+            return birth;
+        }
+
+        public void setBirth(Date birth) {
+            this.birth = birth;
+        }
+
+        public Boolean getSex() {
+            return sex;
+        }
+
+        public void setSex(Boolean sex) {
+            this.sex = sex;
+        }
+
+        public BigDecimal getLength() {
+            return length;
+        }
+
+        public void setLength(BigDecimal length) {
+            this.length = length;
+        }
+
+    }
+
+    @Test
+    void testMethod() {
+
+        People people = new People();
+        assertThat(people.getName()).isEqualTo(new String());
+        assertThat(people.getAge()).isEqualTo(new Integer());
+        assertThat(people.getBirth()).isEqualTo(new Date());
+        assertThat(people.getSex()).isEqualTo(new Boolean());
+        assertThat(people.getLength()).isEqualTo(new BigDecimal());
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/resources/testData/testGenerateAllSetterDefaultValue_AssertJ/before.java b/src/test/resources/testData/testGenerateAllSetterDefaultValue_AssertJ/before.java
new file mode 100644
index 0000000..78f9a6e
--- /dev/null
+++ b/src/test/resources/testData/testGenerateAllSetterDefaultValue_AssertJ/before.java
@@ -0,0 +1,69 @@
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+public class AssertAllGetterWithDefault {
+
+    public static class People {
+
+        private String name;
+
+        private Integer age;
+
+        private Date birth;
+
+        private Boolean sex;
+
+        private BigDecimal length;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Integer getAge() {
+            return age;
+        }
+
+        public void setAge(Integer age) {
+            this.age = age;
+        }
+
+        public Date getBirth() {
+            return birth;
+        }
+
+        public void setBirth(Date birth) {
+            this.birth = birth;
+        }
+
+        public Boolean getSex() {
+            return sex;
+        }
+
+        public void setSex(Boolean sex) {
+            this.sex = sex;
+        }
+
+        public BigDecimal getLength() {
+            return length;
+        }
+
+        public void setLength(BigDecimal length) {
+            this.length = length;
+        }
+
+    }
+
+    @Test
+    void testMethod() {
+
+        People peo<caret>ple = new People();
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/resources/testData/testGenerateAllSetterDefaultValue_IgnoresExistingImportWithPreferredEngine/after.java b/src/test/resources/testData/testGenerateAllSetterDefaultValue_IgnoresExistingImportWithPreferredEngine/after.java
new file mode 100644
index 0000000..2349234
--- /dev/null
+++ b/src/test/resources/testData/testGenerateAllSetterDefaultValue_IgnoresExistingImportWithPreferredEngine/after.java
@@ -0,0 +1,82 @@
+
+import Integer;
+import String;
+import Boolean;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import Date;
+import BigDecimal;import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import java.math.BigDecimal;
+import java.util.*;
+
+public class AssertAllGetterWithDefault {
+
+    public static class People {
+
+        private String name;
+
+        private Integer age;
+
+        private Date birth;
+
+        private Boolean sex;
+
+        private BigDecimal length;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Integer getAge() {
+            return age;
+        }
+
+        public void setAge(Integer age) {
+            this.age = age;
+        }
+
+        public Date getBirth() {
+            return birth;
+        }
+
+        public void setBirth(Date birth) {
+            this.birth = birth;
+        }
+
+        public Boolean getSex() {
+            return sex;
+        }
+
+        public void setSex(Boolean sex) {
+            this.sex = sex;
+        }
+
+        public BigDecimal getLength() {
+            return length;
+        }
+
+        public void setLength(BigDecimal length) {
+            this.length = length;
+        }
+
+    }
+
+    @Test
+    void testMethod() {
+
+        People people = new People();
+        assertEquals(new String(), people.getName());
+        assertEquals(new Integer(), people.getAge());
+        assertEquals(new Date(), people.getBirth());
+        assertEquals(new Boolean(), people.getSex());
+        assertEquals(new BigDecimal(), people.getLength());
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/resources/testData/testGenerateAllSetterDefaultValue_IgnoresExistingImportWithPreferredEngine/before.java b/src/test/resources/testData/testGenerateAllSetterDefaultValue_IgnoresExistingImportWithPreferredEngine/before.java
new file mode 100644
index 0000000..030ba1b
--- /dev/null
+++ b/src/test/resources/testData/testGenerateAllSetterDefaultValue_IgnoresExistingImportWithPreferredEngine/before.java
@@ -0,0 +1,70 @@
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import java.math.BigDecimal;
+import java.util.*;
+
+public class AssertAllGetterWithDefault {
+
+    public static class People {
+
+        private String name;
+
+        private Integer age;
+
+        private Date birth;
+
+        private Boolean sex;
+
+        private BigDecimal length;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Integer getAge() {
+            return age;
+        }
+
+        public void setAge(Integer age) {
+            this.age = age;
+        }
+
+        public Date getBirth() {
+            return birth;
+        }
+
+        public void setBirth(Date birth) {
+            this.birth = birth;
+        }
+
+        public Boolean getSex() {
+            return sex;
+        }
+
+        public void setSex(Boolean sex) {
+            this.sex = sex;
+        }
+
+        public BigDecimal getLength() {
+            return length;
+        }
+
+        public void setLength(BigDecimal length) {
+            this.length = length;
+        }
+
+    }
+
+    @Test
+    void testMethod() {
+
+        People peo<caret>ple = new People();
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/resources/testData/testGenerateAllSetterDefaultValue_Jupiter/after.java b/src/test/resources/testData/testGenerateAllSetterDefaultValue_Jupiter/after.java
new file mode 100644
index 0000000..8ff57d0
--- /dev/null
+++ b/src/test/resources/testData/testGenerateAllSetterDefaultValue_Jupiter/after.java
@@ -0,0 +1,81 @@
+
+import Integer;
+import String;
+import Boolean;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import Date;
+import BigDecimal;import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+public class AssertAllGetterWithDefault {
+
+    public static class People {
+
+        private String name;
+
+        private Integer age;
+
+        private Date birth;
+
+        private Boolean sex;
+
+        private BigDecimal length;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Integer getAge() {
+            return age;
+        }
+
+        public void setAge(Integer age) {
+            this.age = age;
+        }
+
+        public Date getBirth() {
+            return birth;
+        }
+
+        public void setBirth(Date birth) {
+            this.birth = birth;
+        }
+
+        public Boolean getSex() {
+            return sex;
+        }
+
+        public void setSex(Boolean sex) {
+            this.sex = sex;
+        }
+
+        public BigDecimal getLength() {
+            return length;
+        }
+
+        public void setLength(BigDecimal length) {
+            this.length = length;
+        }
+
+    }
+
+    @Test
+    void testMethod() {
+
+        People people = new People();
+        assertEquals(new String(), people.getName());
+        assertEquals(new Integer(), people.getAge());
+        assertEquals(new Date(), people.getBirth());
+        assertEquals(new Boolean(), people.getSex());
+        assertEquals(new BigDecimal(), people.getLength());
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/resources/testData/testGenerateAllSetterDefaultValue_Jupiter/before.java b/src/test/resources/testData/testGenerateAllSetterDefaultValue_Jupiter/before.java
new file mode 100644
index 0000000..78f9a6e
--- /dev/null
+++ b/src/test/resources/testData/testGenerateAllSetterDefaultValue_Jupiter/before.java
@@ -0,0 +1,69 @@
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+public class AssertAllGetterWithDefault {
+
+    public static class People {
+
+        private String name;
+
+        private Integer age;
+
+        private Date birth;
+
+        private Boolean sex;
+
+        private BigDecimal length;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Integer getAge() {
+            return age;
+        }
+
+        public void setAge(Integer age) {
+            this.age = age;
+        }
+
+        public Date getBirth() {
+            return birth;
+        }
+
+        public void setBirth(Date birth) {
+            this.birth = birth;
+        }
+
+        public Boolean getSex() {
+            return sex;
+        }
+
+        public void setSex(Boolean sex) {
+            this.sex = sex;
+        }
+
+        public BigDecimal getLength() {
+            return length;
+        }
+
+        public void setLength(BigDecimal length) {
+            this.length = length;
+        }
+
+    }
+
+    @Test
+    void testMethod() {
+
+        People peo<caret>ple = new People();
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/resources/testData/testGenerateAllSetterDefaultValue_SwitchesBetweenEnginesCorrectly/after.java b/src/test/resources/testData/testGenerateAllSetterDefaultValue_SwitchesBetweenEnginesCorrectly/after.java
new file mode 100644
index 0000000..f8aa228
--- /dev/null
+++ b/src/test/resources/testData/testGenerateAllSetterDefaultValue_SwitchesBetweenEnginesCorrectly/after.java
@@ -0,0 +1,88 @@
+
+import static org.assertj.core.api.Assertions.assertThat;
+import Integer;
+import String;
+import Boolean;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import Date;
+import BigDecimal;import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+public class AssertAllGetterWithDefault {
+
+    public static class People {
+
+        private String name;
+
+        private Integer age;
+
+        private Date birth;
+
+        private Boolean sex;
+
+        private BigDecimal length;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Integer getAge() {
+            return age;
+        }
+
+        public void setAge(Integer age) {
+            this.age = age;
+        }
+
+        public Date getBirth() {
+            return birth;
+        }
+
+        public void setBirth(Date birth) {
+            this.birth = birth;
+        }
+
+        public Boolean getSex() {
+            return sex;
+        }
+
+        public void setSex(Boolean sex) {
+            this.sex = sex;
+        }
+
+        public BigDecimal getLength() {
+            return length;
+        }
+
+        public void setLength(BigDecimal length) {
+            this.length = length;
+        }
+
+    }
+
+    @Test
+    void testMethod() {
+
+        People people = new People();
+        assertThat(people.getName()).isEqualTo(new String());
+        assertThat(people.getAge()).isEqualTo(new Integer());
+        assertThat(people.getBirth()).isEqualTo(new Date());
+        assertThat(people.getSex()).isEqualTo(new Boolean());
+        assertThat(people.getLength()).isEqualTo(new BigDecimal());
+
+        assertEquals(new String(), people.getName());
+        assertEquals(new Integer(), people.getAge());
+        assertEquals(new Date(), people.getBirth());
+        assertEquals(new Boolean(), people.getSex());
+        assertEquals(new BigDecimal(), people.getLength());
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/resources/testData/testGenerateAllSetterDefaultValue_SwitchesBetweenEnginesCorrectly/before.java b/src/test/resources/testData/testGenerateAllSetterDefaultValue_SwitchesBetweenEnginesCorrectly/before.java
new file mode 100644
index 0000000..78f9a6e
--- /dev/null
+++ b/src/test/resources/testData/testGenerateAllSetterDefaultValue_SwitchesBetweenEnginesCorrectly/before.java
@@ -0,0 +1,69 @@
+import org.junit.Test;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+public class AssertAllGetterWithDefault {
+
+    public static class People {
+
+        private String name;
+
+        private Integer age;
+
+        private Date birth;
+
+        private Boolean sex;
+
+        private BigDecimal length;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Integer getAge() {
+            return age;
+        }
+
+        public void setAge(Integer age) {
+            this.age = age;
+        }
+
+        public Date getBirth() {
+            return birth;
+        }
+
+        public void setBirth(Date birth) {
+            this.birth = birth;
+        }
+
+        public Boolean getSex() {
+            return sex;
+        }
+
+        public void setSex(Boolean sex) {
+            this.sex = sex;
+        }
+
+        public BigDecimal getLength() {
+            return length;
+        }
+
+        public void setLength(BigDecimal length) {
+            this.length = length;
+        }
+
+    }
+
+    @Test
+    void testMethod() {
+
+        People peo<caret>ple = new People();
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/resources/testData/testGenerateAllSetterDefaultValue_UsesExistingImportIfPreferredNotOnClasspath/after.java b/src/test/resources/testData/testGenerateAllSetterDefaultValue_UsesExistingImportIfPreferredNotOnClasspath/after.java
new file mode 100644
index 0000000..13bb817
--- /dev/null
+++ b/src/test/resources/testData/testGenerateAllSetterDefaultValue_UsesExistingImportIfPreferredNotOnClasspath/after.java
@@ -0,0 +1,81 @@
+
+import Integer;
+import String;
+import Boolean;
+import Date;
+import BigDecimal;import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+public class AssertAllGetterWithDefault {
+
+    public static class People {
+
+        private String name;
+
+        private Integer age;
+
+        private Date birth;
+
+        private Boolean sex;
+
+        private BigDecimal length;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Integer getAge() {
+            return age;
+        }
+
+        public void setAge(Integer age) {
+            this.age = age;
+        }
+
+        public Date getBirth() {
+            return birth;
+        }
+
+        public void setBirth(Date birth) {
+            this.birth = birth;
+        }
+
+        public Boolean getSex() {
+            return sex;
+        }
+
+        public void setSex(Boolean sex) {
+            this.sex = sex;
+        }
+
+        public BigDecimal getLength() {
+            return length;
+        }
+
+        public void setLength(BigDecimal length) {
+            this.length = length;
+        }
+
+    }
+
+    @Test
+    void testMethod() {
+
+        People people = new People();
+        assertEquals(new String(), people.getName());
+        assertEquals(new Integer(), people.getAge());
+        assertEquals(new Date(), people.getBirth());
+        assertEquals(new Boolean(), people.getSex());
+        assertEquals(new BigDecimal(), people.getLength());
+
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/resources/testData/testGenerateAllSetterDefaultValue_UsesExistingImportIfPreferredNotOnClasspath/before.java b/src/test/resources/testData/testGenerateAllSetterDefaultValue_UsesExistingImportIfPreferredNotOnClasspath/before.java
new file mode 100644
index 0000000..436e878
--- /dev/null
+++ b/src/test/resources/testData/testGenerateAllSetterDefaultValue_UsesExistingImportIfPreferredNotOnClasspath/before.java
@@ -0,0 +1,70 @@
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+public class AssertAllGetterWithDefault {
+
+    public static class People {
+
+        private String name;
+
+        private Integer age;
+
+        private Date birth;
+
+        private Boolean sex;
+
+        private BigDecimal length;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Integer getAge() {
+            return age;
+        }
+
+        public void setAge(Integer age) {
+            this.age = age;
+        }
+
+        public Date getBirth() {
+            return birth;
+        }
+
+        public void setBirth(Date birth) {
+            this.birth = birth;
+        }
+
+        public Boolean getSex() {
+            return sex;
+        }
+
+        public void setSex(Boolean sex) {
+            this.sex = sex;
+        }
+
+        public BigDecimal getLength() {
+            return length;
+        }
+
+        public void setLength(BigDecimal length) {
+            this.length = length;
+        }
+
+    }
+
+    @Test
+    void testMethod() {
+
+        People peo<caret>ple = new People();
+
+    }
+
+}
\ No newline at end of file