add user check dialog

src/integrationTest/java/com/weirddev/testme/intellij/generator/TestMeGeneratorJunit4PowerMockTest.java

@@ -5,6 +5,10 @@
 import com.weirddev.testme.intellij.template.FileTemplateConfig;
 import com.weirddev.testme.intellij.template.TemplateRegistry;
 import com.weirddev.testme.intellij.template.context.Language;
+import com.weirddev.testme.intellij.ui.customizedialog.FileTemplateCustomization;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class TestMeGeneratorJunit4PowerMockTest extends TestMeGeneratorTestBase {
 
@@ -39,4 +43,18 @@ public void testRenderInternalMethodCallStubsIgnored() {
         doTest(new FileTemplateConfig(TestMeConfigPersistent.getInstance().getState()));
     }
 
+    public void testFileTemplateCustomization() {
+        final TestMeConfig testMeConfig = new TestMeConfig();
+        testMeConfig.setOpenCustomizeTestDialog(true);
+        final FileTemplateConfig fileTemplateConfig = new FileTemplateConfig(testMeConfig);
+        List<String> selectedFieldNameList = new ArrayList<>();
+        selectedFieldNameList.add("result");
+        selectedFieldNameList.add("techFighter");
+        List<String> selectedMethodIdList = new ArrayList<>();
+        selectedMethodIdList.add("com.example.services.impl.Foo#fight(com.example.foes.Fire,java.lang.String)");
+        final FileTemplateCustomization customization =
+            new FileTemplateCustomization(selectedFieldNameList, selectedMethodIdList, true);
+        doTest(fileTemplateConfig, customization);
+    }
+
 }

src/integrationTest/java/com/weirddev/testme/intellij/generator/TestMeGeneratorJunit4Test.java

@@ -5,6 +5,10 @@
 import com.weirddev.testme.intellij.template.FileTemplateConfig;
 import com.weirddev.testme.intellij.template.TemplateRegistry;
 import com.weirddev.testme.intellij.template.context.Language;
+import com.weirddev.testme.intellij.ui.customizedialog.FileTemplateCustomization;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Date: 10/20/2016
@@ -192,6 +196,20 @@ public void testMockFieldsInDiWithCtor() {
         doTest(new FileTemplateConfig(TestMeConfigPersistent.getInstance().getState()));
     }
 
+    public void testFileTemplateCustomization() {
+        final TestMeConfig testMeConfig = new TestMeConfig();
+        testMeConfig.setOpenCustomizeTestDialog(true);
+        final FileTemplateConfig fileTemplateConfig = new FileTemplateConfig(testMeConfig);
+        List<String> selectedFieldNameList = new ArrayList<>();
+        selectedFieldNameList.add("result");
+        selectedFieldNameList.add("techFighter");
+        List<String> selectedMethodIdList = new ArrayList<>();
+        selectedMethodIdList.add("com.example.services.impl.Foo#fight(com.example.foes.Fire,java.lang.String)");
+        final FileTemplateCustomization customization =
+            new FileTemplateCustomization(selectedFieldNameList, selectedMethodIdList, true);
+        doTest(fileTemplateConfig, customization);
+    }
+
     //todo TC - use static init method when constructor not available
 
      // TODO TC different test target dir

src/integrationTest/java/com/weirddev/testme/intellij/generator/TestMeGeneratorJunit5Test.java

@@ -1,9 +1,14 @@
 package com.weirddev.testme.intellij.generator;
 
+import com.weirddev.testme.intellij.configuration.TestMeConfig;
 import com.weirddev.testme.intellij.configuration.TestMeConfigPersistent;
 import com.weirddev.testme.intellij.template.FileTemplateConfig;
 import com.weirddev.testme.intellij.template.TemplateRegistry;
 import com.weirddev.testme.intellij.template.context.Language;
+import com.weirddev.testme.intellij.ui.customizedialog.FileTemplateCustomization;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Date: 13/12/2016
@@ -48,4 +53,18 @@ public void testMockFieldsInDiWithSetter() {
     public void testMockFieldsInDiWithCtor() {
         doTest(new FileTemplateConfig(TestMeConfigPersistent.getInstance().getState()));
     }
+
+    public void testFileTemplateCustomization() {
+        final TestMeConfig testMeConfig = new TestMeConfig();
+        testMeConfig.setOpenCustomizeTestDialog(true);
+        final FileTemplateConfig fileTemplateConfig = new FileTemplateConfig(testMeConfig);
+        List<String> selectedFieldNameList = new ArrayList<>();
+        selectedFieldNameList.add("result");
+        selectedFieldNameList.add("techFighter");
+        List<String> selectedMethodIdList = new ArrayList<>();
+        selectedMethodIdList.add("com.example.services.impl.Foo#fight(com.example.foes.Fire,java.lang.String)");
+        final FileTemplateCustomization customization =
+            new FileTemplateCustomization(selectedFieldNameList, selectedMethodIdList, true);
+        doTest(fileTemplateConfig, customization);
+    }
 }

src/integrationTest/java/com/weirddev/testme/intellij/generator/TestMeGeneratorSpecs2Test.java

@@ -13,8 +13,11 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.IdeaTestUtil;
 import com.intellij.testFramework.LightProjectDescriptor;
+import com.weirddev.testme.intellij.configuration.TestMeConfig;
+import com.weirddev.testme.intellij.template.FileTemplateConfig;
 import com.weirddev.testme.intellij.template.TemplateRegistry;
 import com.weirddev.testme.intellij.template.context.Language;
+import com.weirddev.testme.intellij.ui.customizedialog.FileTemplateCustomization;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

src/integrationTest/java/com/weirddev/testme/intellij/generator/TestMeGeneratorSpockTest.java

@@ -1,9 +1,14 @@
 package com.weirddev.testme.intellij.generator;
 
+import com.weirddev.testme.intellij.configuration.TestMeConfig;
 import com.weirddev.testme.intellij.configuration.TestMeConfigPersistent;
 import com.weirddev.testme.intellij.template.FileTemplateConfig;
 import com.weirddev.testme.intellij.template.TemplateRegistry;
 import com.weirddev.testme.intellij.template.context.Language;
+import com.weirddev.testme.intellij.ui.customizedialog.FileTemplateCustomization;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Date: 24/02/2017
@@ -41,4 +46,18 @@ public void testMockFieldsInDiWithSetter() {
     public void testMockFieldsInDiWithCtor() {
         doTest(new FileTemplateConfig(TestMeConfigPersistent.getInstance().getState()));
     }
+
+    public void testFileTemplateCustomization() {
+        final TestMeConfig testMeConfig = new TestMeConfig();
+        testMeConfig.setOpenCustomizeTestDialog(true);
+        final FileTemplateConfig fileTemplateConfig = new FileTemplateConfig(testMeConfig);
+        List<String> selectedFieldNameList = new ArrayList<>();
+        selectedFieldNameList.add("result");
+        selectedFieldNameList.add("techFighter");
+        List<String> selectedMethodIdList = new ArrayList<>();
+        selectedMethodIdList.add("com.example.services.impl.Foo#fight(com.example.foes.Fire,java.lang.String)");
+        final FileTemplateCustomization customization =
+            new FileTemplateCustomization(selectedFieldNameList, selectedMethodIdList, true);
+        doTest(fileTemplateConfig, customization);
+    }
 }

src/integrationTest/java/com/weirddev/testme/intellij/generator/TestMeGeneratorTestBase.java

@@ -10,12 +10,11 @@
 import com.weirddev.testme.intellij.template.FileTemplateConfig;
 import com.weirddev.testme.intellij.template.FileTemplateContext;
 import com.weirddev.testme.intellij.template.context.Language;
+import com.weirddev.testme.intellij.ui.customizedialog.FileTemplateCustomization;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Assert;
 
-import java.util.GregorianCalendar;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
 
 /**
  * Date: 13/12/2016
@@ -78,6 +77,10 @@ protected void doTest(FileTemplateConfig fileTemplateConfig) {
         doTest("com.example.services.impl", "Foo", "FooTest", fileTemplateConfig);
     }
 
+    protected void doTest(FileTemplateConfig fileTemplateConfig, FileTemplateCustomization fileTemplateCustomization) {
+        doTest("com.example.services.impl", "Foo", "FooTest", fileTemplateConfig, fileTemplateCustomization);
+    }
+
     protected void doTest(final String packageName, String testSubjectClassName, final String expectedTestClassName, final boolean reformatCode, final boolean optimizeImports, final boolean replaceFqn, final boolean ignoreUnusedProperties, final int minPercentOfExcessiveSettersToPreferDefaultCtor, boolean stubMockMethodCallsReturnValues) {
         final TestMeConfig testMeConfig = new TestMeConfig();
         testMeConfig.setGenerateTestsForInheritedMethods(true);
@@ -97,7 +100,13 @@ protected void doTest(final String packageName, String testSubjectClassName, fin
         doTest(packageName, testSubjectClassName, expectedTestClassName, fileTemplateConfig);
     }
 
-    protected void doTest(final String packageName, String testSubjectClassName, final String expectedTestClassName, final FileTemplateConfig fileTemplateConfig) {
+    protected void doTest(final String packageName, String testSubjectClassName, final String expectedTestClassName,
+        final FileTemplateConfig fileTemplateConfig) {
+        doTest(packageName, testSubjectClassName, expectedTestClassName, fileTemplateConfig, null);
+    }
+
+    protected void doTest(final String packageName, String testSubjectClassName, final String expectedTestClassName,
+        final FileTemplateConfig fileTemplateConfig, final FileTemplateCustomization fileTemplateCustomization) {
         if (!testEnabled) {
             System.out.println(expectedTestClassExtension+ " idea plugin disabled. Skipping test");
             return;
@@ -106,17 +115,21 @@ protected void doTest(final String packageName, String testSubjectClassName, fin
         final PsiDirectory srcDir = fooClass.getContainingFile().getContainingDirectory();
         final PsiPackage targetPackage = JavaDirectoryService.getInstance().getPackage(srcDir);
 
+        FileTemplateCustomization customization = null != fileTemplateCustomization ? fileTemplateCustomization
+            : new FileTemplateCustomization(new ArrayList<>(), new ArrayList<>(), false);
+
         CommandProcessor.getInstance().executeCommand(getProject(), () -> {
             myFixture.openFileInEditor(fooClass.getContainingFile().getVirtualFile());
 
             PsiElement result = new TestMeGenerator(new TestClassElementsLocator(), testTemplateContextBuilder,new CodeRefactorUtil()).generateTest(new FileTemplateContext(new FileTemplateDescriptor(templateFilename), language, getProject(),
-                    expectedTestClassName,
-                    targetPackage,
-                    getModule(),
-                    getModule(),
-                    srcDir,
-                    fooClass,
-                    fileTemplateConfig));
+                expectedTestClassName,
+                targetPackage,
+                getModule(),
+                getModule(),
+                srcDir,
+                fooClass,
+                fileTemplateConfig,
+                customization));
             System.out.println("result:"+result);
             verifyGeneratedTest(packageName, expectedTestClassName);
         }, CodeInsightBundle.message("intention.create.test"), this);
@@ -157,7 +170,7 @@ public void setUp() throws Exception {
         ignoreTrailingWhitespaces = false;
     }
     //    @Override //relevant when JavaCodeInsightFixtureTestCase is used
-//    protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
-//        moduleBuilder.addJdk(new File(System.getProperty("java.home")).getParentContainerClass());
-//    }
+    //    protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
+    //        moduleBuilder.addJdk(new File(System.getProperty("java.home")).getParentContainerClass());
+    //    }
 }

src/integrationTest/java/com/weirddev/testme/intellij/generator/TestMeGeneratorTestNgTest.java

@@ -1,9 +1,14 @@
 package com.weirddev.testme.intellij.generator;
 
+import com.weirddev.testme.intellij.configuration.TestMeConfig;
 import com.weirddev.testme.intellij.configuration.TestMeConfigPersistent;
 import com.weirddev.testme.intellij.template.FileTemplateConfig;
 import com.weirddev.testme.intellij.template.TemplateRegistry;
 import com.weirddev.testme.intellij.template.context.Language;
+import com.weirddev.testme.intellij.ui.customizedialog.FileTemplateCustomization;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Date: 23/05/2017
@@ -49,4 +54,18 @@ public void testMockFieldsInDiWithCtor() {
         doTest(new FileTemplateConfig(TestMeConfigPersistent.getInstance().getState()));
     }
 
+    public void testFileTemplateCustomization() {
+        final TestMeConfig testMeConfig = new TestMeConfig();
+        testMeConfig.setOpenCustomizeTestDialog(true);
+        final FileTemplateConfig fileTemplateConfig = new FileTemplateConfig(testMeConfig);
+        List<String> selectedFieldNameList = new ArrayList<>();
+        selectedFieldNameList.add("result");
+        selectedFieldNameList.add("techFighter");
+        List<String> selectedMethodIdList = new ArrayList<>();
+        selectedMethodIdList.add("com.example.services.impl.Foo#fight(com.example.foes.Fire,java.lang.String)");
+        final FileTemplateCustomization customization =
+            new FileTemplateCustomization(selectedFieldNameList, selectedMethodIdList, true);
+        doTest(fileTemplateConfig, customization);
+    }
+
 }

src/main/java/com/weirddev/testme/intellij/action/CreateTestMeAction.java

@@ -26,6 +26,8 @@
 import com.weirddev.testme.intellij.template.FileTemplateConfig;
 import com.weirddev.testme.intellij.template.FileTemplateContext;
 import com.weirddev.testme.intellij.template.TemplateDescriptor;
+import com.weirddev.testme.intellij.ui.customizedialog.CustomizeTestDialog;
+import com.weirddev.testme.intellij.ui.customizedialog.FileTemplateCustomization;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes;
@@ -107,23 +109,42 @@ public void invoke(@NotNull final Project project, Editor editor, @NotNull PsiEl
         }
         LOG.debug("targetDirectory:"+targetDirectory.getVirtualFile().getUrl());
         final ClassNameSelection classNameSelection = generatedClassNameResolver.resolveClassName(project, targetDirectory, srcClass, templateDescriptor);
-        if (classNameSelection.getUserDecision() != ClassNameSelection.UserDecision.Abort) {
-            final Module finalTestModule = testModule;
-            CommandProcessor.getInstance().executeCommand(project, new Runnable() {
-                @Override
-                public void run() {
-                    testMeGenerator.generateTest(
-                            new FileTemplateContext(
-                                    new FileTemplateDescriptor(templateDescriptor.getFilename()),templateDescriptor.getLanguage(),project, classNameSelection.getClassName(), srcPackage, srcModule, finalTestModule,targetDirectory, srcClass,
-                                    new FileTemplateConfig(TestMeConfigPersistent.getInstance().getState())
-                            )
-                    );
-                }
-            }, "TestMe Generate Test", this);
+        if (classNameSelection.getUserDecision().equals(ClassNameSelection.UserDecision.Abort)) {
+            return;
+        }
+
+        FileTemplateConfig fileTemplateConfig = new FileTemplateConfig(TestMeConfigPersistent.getInstance().getState());
+        final Module finalTestModule = testModule;
+        boolean openUserCheckDialog = TestMeConfigPersistent.getInstance().getState().isOpenCustomizeTestDialog();
+        FileTemplateContext fileTemplateContext = new FileTemplateContext(
+            new FileTemplateDescriptor(templateDescriptor.getFilename()), templateDescriptor.getLanguage(), project,
+            classNameSelection.getClassName(), srcPackage, srcModule, finalTestModule, targetDirectory, srcClass,
+            fileTemplateConfig, new FileTemplateCustomization(new ArrayList<>(), new ArrayList<>(), openUserCheckDialog));
+        if (openUserCheckDialog) {
+            // create filed and method check dialog
+            final CustomizeTestDialog dialog = createTestMeDialog(project, srcClass, fileTemplateContext);
+            // if not ok button selected the return
+            if (dialog.isModal() && !dialog.showAndGet()) {
+                return;
+            }
         }
+
+        CommandProcessor.getInstance().executeCommand(project, new Runnable() {
+            @Override
+            public void run() {
+                testMeGenerator.generateTest(fileTemplateContext);
+            }
+        }, "TestMe Generate Test", this);
         LOG.debug("End CreateTestMeAction.invoke");
     }
 
+    /**
+     * create user check dialog to decide fields to mock and methods to test
+     */
+    private CustomizeTestDialog createTestMeDialog(Project project, PsiClass srcClass, FileTemplateContext fileTemplateContext) {
+        return new CustomizeTestDialog(project, "Select fields/methods to be mocked/tested", srcClass, fileTemplateContext);
+    }
+
     /**
      * @see CreateTestAction#computeSuitableTestRootUrls
      */
@@ -150,7 +171,7 @@ private static List<SourceFolder> suitableTestSourceFolders(@NotNull Module modu
         return sourceFolders;
     }
     /**
-     * @see JavaProjectRootsUtil#isForGeneratedSources(com.intellij.openapi.roots.SourceFolder)
+     * @see JavaProjectRootsUtil#isForGeneratedSources(SourceFolder)
      */
     private static boolean isForGeneratedSources(SourceFolder sourceFolder) {
         JavaSourceRootProperties properties = sourceFolder.getJpsElement().getProperties(JavaModuleSourceRootTypes.SOURCES);

src/main/java/com/weirddev/testme/intellij/builder/MethodFactory.java

@@ -249,7 +249,7 @@ private static String resolveOwnerClassName(PsiMethod psiMethod) {
         return psiMethod.getContainingClass() == null ? null : psiMethod.getContainingClass().getQualifiedName();
     }
 
-    private static boolean isTestable(PsiMethod psiMethod, @Nullable PsiClass srcClass){
+    public static boolean isTestable(PsiMethod psiMethod, @Nullable PsiClass srcClass){
         return !TypeUtils.isLanguageBaseClass(resolveOwnerClassName(psiMethod))  && !PropertyUtils.isPropertySetter(psiMethod) && (!PropertyUtils.isPropertyGetter(psiMethod) || srcClass!=null && srcClass.isEnum()) &&
                 !psiMethod.isConstructor() && isVisibleForTest(psiMethod, srcClass) && !isOverriddenInChild(psiMethod, srcClass)
                 && !isInterface(psiMethod) && !psiMethod.hasModifierProperty(PsiModifier.ABSTRACT) && !isSyntheticMethod(psiMethod);

src/main/java/com/weirddev/testme/intellij/configuration/TestMeConfig.java

@@ -38,6 +38,13 @@ public class TestMeConfig {
      */
     private boolean renderInternalMethodCallStubs = false;
 
+    /**
+     * Test generator behavior option. open user check dialog
+     * Valid values:true,false
+     * Default:false
+     */
+    private boolean openCustomizeTestDialog = false;
+
     public boolean getGenerateTestsForInheritedMethods() {
         return generateTestsForInheritedMethods;
     }
@@ -77,4 +84,12 @@ public boolean isRenderInternalMethodCallStubs() {
     public void setRenderInternalMethodCallStubs(boolean renderInternalMethodCallStubs) {
         this.renderInternalMethodCallStubs = renderInternalMethodCallStubs;
     }
+
+    public boolean isOpenCustomizeTestDialog() {
+        return openCustomizeTestDialog;
+    }
+
+    public void setOpenCustomizeTestDialog(boolean openCustomizeTestDialog) {
+        this.openCustomizeTestDialog = openCustomizeTestDialog;
+    }
 }