Throw specific exceptions based on the method under testFeature/zfj/add exception on actual

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

@@ -1,6 +1,8 @@
 package com.weirddev.testme.intellij.generator;
 
 
+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;
 
@@ -43,5 +45,9 @@ public void testSettersOverCtor() throws Exception{
     public void testCtorOverSetters() throws Exception{
         doTest(true,true,true,67, false, false);
     }
-
+    public void testDeclareSpecificTestMethodThrownExceptionTypes() {
+        final TestMeConfig testMeConfig = new TestMeConfig();
+        testMeConfig.setThrowSpecificExceptionTypes(false);
+        doTest(new FileTemplateConfig(testMeConfig));
+    }
 }

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

@@ -54,4 +54,9 @@ public void testFileTemplateCustomization() {
         doTest(fileTemplateConfig, customization);
     }
 
+    public void testDeclareSpecificTestMethodThrownExceptionTypes() {
+        final TestMeConfig testMeConfig = new TestMeConfig();
+        testMeConfig.setThrowSpecificExceptionTypes(true);
+        doTest(new FileTemplateConfig(testMeConfig));
+    }
 }

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

@@ -7,7 +7,6 @@
 import com.weirddev.testme.intellij.template.context.Language;
 import com.weirddev.testme.intellij.ui.customizedialog.FileTemplateCustomization;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -207,6 +206,12 @@ public void testFileTemplateCustomization() {
         doTest(fileTemplateConfig, customization);
     }
 
+    public void testDeclareSpecificTestMethodThrownExceptionTypes() {
+        final TestMeConfig testMeConfig = new TestMeConfig();
+        testMeConfig.setThrowSpecificExceptionTypes(true);
+        doTest(new FileTemplateConfig(testMeConfig));
+    }
+
     //todo TC - use static init method when constructor not available
 
      // TODO TC different test target dir

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

@@ -26,6 +26,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class MethodFactory {
@@ -56,7 +57,8 @@ public static Method createMethod(PsiMethod psiMethod, PsiClass srcClass, int ma
         Optional<PsiSubstitutor> methodSubstitutor = findMethodSubstitutor(psiMethod, srcClass, ownerClassPsiType);
         Type returnType = resolveReturnType(psiMethod, maxRecursionDepth, typeDictionary, methodSubstitutor);
         List<Param> methodParams = extractMethodParams(psiMethod, isPrimaryConstructor, maxRecursionDepth, typeDictionary, methodSubstitutor);
-        return new Method(methodId, methodName, returnType,   ownerClassCanonicalType, methodParams, isPrivate, isProtected, isDefault, isPublic, isAbstract, isNative,
+        String throwsExceptions = extractMethodExceptionTypes(psiMethod,typeDictionary.isThrowSpecificExceptionTypes(),testable);
+        return new Method(methodId, methodName, returnType,   ownerClassCanonicalType, methodParams, throwsExceptions,isPrivate, isProtected, isDefault, isPublic, isAbstract, isNative,
                 isStatic, isSetter, isGetter, isConstructor,  overriddenInChild, inherited, isInterface, syntheticMethod, propertyName1, accessible,
                 isPrimaryConstructor,   testable);
 
@@ -169,6 +171,25 @@ private static List<Param> extractMethodParams(PsiMethod psiMethod, boolean shou
         return params;
     }
 
+
+    //analyze the exception types of the method
+    private static String extractMethodExceptionTypes(PsiMethod psiMethod ,Boolean throwSpecificExceptionTypes,boolean testable) {
+        if(!testable){
+            return null;
+        }
+        String throwsExceptions = null;
+        if(throwSpecificExceptionTypes){
+            PsiReferenceList throwsList = psiMethod.getThrowsList();
+            PsiClassType[] referencedTypes = throwsList.getReferencedTypes();
+            throwsExceptions = Arrays.stream(referencedTypes)
+                    .map(PsiClassType::resolve)
+                    .filter(Objects::nonNull)
+                    .map(PsiClass::getQualifiedName)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.joining(","));
+        }
+        return throwsExceptions == null ? "Exception" : throwsExceptions;
+    }
     private static ArrayList<Field> findMatchingFields(PsiParameter psiParameter, PsiMethod psiMethod) {
         final ArrayList<Field> fields = new ArrayList<>();
         try {

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. Declare specific test method thrown exception types
+     * Valid values:true,false
+     * Default:false
+     */
+    private boolean throwSpecificExceptionTypes = false;
     /**
      * Test generator behavior option. open user check dialog
      * Valid values:true,false
@@ -92,4 +99,11 @@ public boolean isOpenCustomizeTestDialog() {
     public void setOpenCustomizeTestDialog(boolean openCustomizeTestDialog) {
         this.openCustomizeTestDialog = openCustomizeTestDialog;
     }
+    public boolean isThrowSpecificExceptionTypes() {
+        return throwSpecificExceptionTypes;
+    }
+
+    public void setThrowSpecificExceptionTypes(boolean throwSpecificExceptionTypes) {
+        this.throwSpecificExceptionTypes = throwSpecificExceptionTypes;
+    }
 }

src/main/java/com/weirddev/testme/intellij/generator/TestTemplateContextBuilder.java

@@ -46,7 +46,7 @@ public Map<String, Object> build(FileTemplateContext context, Properties default
         int maxRecursionDepth = context.getFileTemplateConfig().getMaxRecursionDepth();
         ctxtParams.put(TestMeTemplateParams.MAX_RECURSION_DEPTH, maxRecursionDepth);
         ctxtParams.put(TestMeTemplateParams.StringUtils, new StringUtils());
-        final TypeDictionary typeDictionary = TypeDictionary.create(context.getSrcClass(), context.getTargetPackage());
+        final TypeDictionary typeDictionary = TypeDictionary.create(context.getSrcClass(), context.getTargetPackage(),context.getFileTemplateConfig().isThrowSpecificExceptionTypes());
         JavaVersion javaVersion = getJavaVersion(context.getTestModule());
         ctxtParams.put(TestMeTemplateParams.JAVA_VERSION, javaVersion);
         ctxtParams.put(TestMeTemplateParams.TestBuilder, new TestBuilderImpl(context.getLanguage(), context.getSrcModule(), typeDictionary, context.getFileTemplateConfig(), javaVersion));

src/main/java/com/weirddev/testme/intellij/template/FileTemplateConfig.java

@@ -90,6 +90,14 @@ public class FileTemplateConfig {
      */
     private boolean renderInternalMethodCallStubs = false;
 
+
+    /**
+     * Test generator behavior option. Declare specific test method thrown exception types
+     * Valid values:true,false
+     * Default:false
+     */
+    private boolean throwSpecificExceptionTypes = false;
+
     public FileTemplateConfig(TestMeConfig testMeConfig)  {
         this(
                 Integer.valueOf(System.getProperties().getProperty("testMe.generator.maxRecursionDepth", FileTemplateConfig.DEFAULT_MAX_RECURSION_DEPTH + "")),
@@ -98,6 +106,7 @@ public FileTemplateConfig(TestMeConfig testMeConfig)  {
                 testMeConfig == null || testMeConfig.getOptimizeImports(),
                 testMeConfig == null || testMeConfig.getGenerateTestsForInheritedMethods(),
                 testMeConfig == null || testMeConfig.isRenderInternalMethodCallStubs(),
+                testMeConfig == null || testMeConfig.isThrowSpecificExceptionTypes(),
                 Boolean.valueOf(System.getProperties().getProperty("testMe.generator.ignoreUnusedProperties", "true")),
                 Boolean.valueOf(System.getProperties().getProperty("testMe.generator.replaceInterfaceParamsWithConcreteTypes", "true")),
                 Boolean.valueOf(System.getProperties().getProperty("testMe.generator.stubMockMethodCallsReturnValues", "true")),
@@ -109,7 +118,7 @@ public FileTemplateConfig(TestMeConfig testMeConfig)  {
     }
 
     private FileTemplateConfig(int maxRecursionDepth, boolean reformatCode, boolean replaceFqn, boolean optimizeImports,
-            boolean generateTestsForInheritedMethods, boolean renderInternalMethodCallStubs,
+            boolean generateTestsForInheritedMethods, boolean renderInternalMethodCallStubs,boolean throwSpecificExceptionTypes,
             boolean ignoreUnusedProperties, boolean replaceInterfaceParamsWithConcreteTypes,
             boolean stubMockMethodCallsReturnValues, int maxNumOfConcreteCandidatesToReplaceInterfaceParam,
             int minPercentOfExcessiveSettersToPreferMapCtor,
@@ -120,6 +129,7 @@ private FileTemplateConfig(int maxRecursionDepth, boolean reformatCode, boolean
         this.optimizeImports = optimizeImports;
         this.generateTestsForInheritedMethods = generateTestsForInheritedMethods;
         this.renderInternalMethodCallStubs = renderInternalMethodCallStubs;
+        this.throwSpecificExceptionTypes = throwSpecificExceptionTypes;
         this.stubMockMethodCallsReturnValues = stubMockMethodCallsReturnValues;
         this.ignoreUnusedProperties = ignoreUnusedProperties;
         this.replaceInterfaceParamsWithConcreteTypes = replaceInterfaceParamsWithConcreteTypes;
@@ -208,4 +218,8 @@ public boolean isRenderInternalMethodCallStubs() {
     public void setRenderInternalMethodCallStubs(boolean renderInternalMethodCallStubs) {
         this.renderInternalMethodCallStubs = renderInternalMethodCallStubs;
     }
+
+    public boolean isThrowSpecificExceptionTypes() {
+        return throwSpecificExceptionTypes;
+    }
 }

src/main/java/com/weirddev/testme/intellij/template/TypeDictionary.java

@@ -35,15 +35,17 @@ public class TypeDictionary {
     private final List<String> testSubjectMethodParamsType;
     private AtomicInteger newTypeCounter = new AtomicInteger();
     private AtomicInteger existingTypeHitsCounter = new AtomicInteger();
+    private boolean throwSpecificExceptionTypes;
 
-    private TypeDictionary(PsiClass srcClass, PsiPackage targetPackage, Set<ResolvedMethodCall> methodCallsFromTestSubject, List<String> testSubjectMethodParamsType) {
+    private TypeDictionary(PsiClass srcClass, PsiPackage targetPackage, Set<ResolvedMethodCall> methodCallsFromTestSubject, List<String> testSubjectMethodParamsType,boolean throwSpecificExceptionTypes) {
         this.testSubjectClass = srcClass;
         this.testSubjectTypesNames = resolveTypesNames(srcClass);
         this.targetPackage = targetPackage;
         this.methodCallsFromTestSubject = methodCallsFromTestSubject;
         this.testSubjectMethodParamsType = testSubjectMethodParamsType;
         this.relevantMethodIdsCache = new LruCache<>(MAX_RELEVANT_METHOD_IDS_CACHE);
         startTimestamp = System.currentTimeMillis();
+        this.throwSpecificExceptionTypes = throwSpecificExceptionTypes;
     }
 
     private Set<String> resolveTypesNames(PsiClass srcClass) {
@@ -54,7 +56,7 @@ private Set<String> resolveTypesNames(PsiClass srcClass) {
         return typesNames;
     }
 
-    public static TypeDictionary create(PsiClass srcClass, PsiPackage targetPackage){
+    public static TypeDictionary create(PsiClass srcClass, PsiPackage targetPackage,boolean throwSpecificExceptionTypes){
         Set<ResolvedMethodCall> methodCallsFromTestSubject = new HashSet<>();
         if (srcClass != null) {
             for (PsiMethod method : srcClass.getAllMethods()) {
@@ -64,7 +66,7 @@ public static TypeDictionary create(PsiClass srcClass, PsiPackage targetPackage)
             }
         }
         List<String> testSubjectMethodParamsType = srcClass == null ? List.of() :  Arrays.stream(srcClass.getAllMethods()).flatMap(psiMethod1 -> Arrays.stream(psiMethod1.getParameterList().getParameters()).map(p -> p.getType().getCanonicalText()).filter(TypeUtils::isBasicType)).toList();
-        return new TypeDictionary(srcClass, targetPackage, methodCallsFromTestSubject, testSubjectMethodParamsType);
+        return new TypeDictionary(srcClass, targetPackage, methodCallsFromTestSubject, testSubjectMethodParamsType,throwSpecificExceptionTypes);
     }
 
     /**
@@ -165,4 +167,12 @@ public void logStatistics() {
         LOG.info("**** Statistics: took %dms. type hits/req:%d/%d method relevancy cache %s".formatted(
                 startTimestamp - System.currentTimeMillis(),newTypeCounter.get(), newTypeCounter.get() + existingTypeHitsCounter.get(), relevantMethodIdsCache.getUsageStats()));
     }
+
+    public boolean isThrowSpecificExceptionTypes() {
+        return throwSpecificExceptionTypes;
+    }
+
+    public void setThrowSpecificExceptionTypes(boolean throwSpecificExceptionTypes) {
+        this.throwSpecificExceptionTypes = throwSpecificExceptionTypes;
+    }
 }

src/main/java/com/weirddev/testme/intellij/template/context/Method.java

@@ -38,6 +38,11 @@ public class Method {
      * method arguments
      */
     private final List<Param> methodParams;
+
+    /**
+     * method exception types
+     */
+    private final String methodExceptionTypes;
     /**
      * true - if method has private modifier
      */
@@ -151,5 +156,5 @@ public boolean hasReturn(){
     public boolean hasParams() {
         return !methodParams.isEmpty();
     }
-
 }
+

src/main/java/com/weirddev/testme/intellij/ui/settings/TestMeSettingsForm.form

@@ -13,7 +13,7 @@
           <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
       </hspacer>
-      <grid id="a18c4" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="a18c4" layout-manager="GridLayoutManager" row-count="4" 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>
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="true">
@@ -50,6 +50,14 @@
               <text value="Open customization dialog before test generation"/>
             </properties>
           </component>
+          <component id="7cd0d" class="javax.swing.JCheckBox" binding="throwSpecificExceptionTypesCheckBox">
+            <constraints>
+              <grid row="3" 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="Declare specific test method thrown exception types"/>
+            </properties>
+          </component>
         </children>
       </grid>
       <grid id="4c6fe" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">

src/main/java/com/weirddev/testme/intellij/ui/settings/TestMeSettingsForm.java

@@ -19,6 +19,7 @@ public class TestMeSettingsForm implements Disposable {
     private JPanel rootPanel;
     private JCheckBox renderInternalMethodCallStubsBox;
     private JCheckBox openUserCheckDialogBox;
+    private JCheckBox throwSpecificExceptionTypesCheckBox;
 
     public JPanel getRootPanel() {
         return rootPanel;
@@ -37,6 +38,7 @@ public void persistState(TestMeConfig testMeConfig) {
             testMeConfig.setReplaceFullyQualifiedNames(replaceFullyQualifiedNamesCheckBox.isSelected());
             testMeConfig.setRenderInternalMethodCallStubs(renderInternalMethodCallStubsBox.isSelected());
             testMeConfig.setOpenCustomizeTestDialog(openUserCheckDialogBox.isSelected());
+            testMeConfig.setThrowSpecificExceptionTypes(throwSpecificExceptionTypesCheckBox.isSelected());
         }
     }
 
@@ -48,6 +50,7 @@ public void reset(TestMeConfig state) {
             replaceFullyQualifiedNamesCheckBox.setSelected(state.getReplaceFullyQualifiedNames());
             renderInternalMethodCallStubsBox.setSelected(state.isRenderInternalMethodCallStubs());
             openUserCheckDialogBox.setSelected(state.isOpenCustomizeTestDialog());
+            throwSpecificExceptionTypesCheckBox.setSelected(state.isThrowSpecificExceptionTypes());
         }
     }
 
@@ -58,7 +61,8 @@ public boolean isDirty(TestMeConfig state) {
                         reformatCodeCheckBox.isSelected() != state.getReformatCode() ||
                         replaceFullyQualifiedNamesCheckBox.isSelected() != state.getReplaceFullyQualifiedNames() ||
                         renderInternalMethodCallStubsBox.isSelected() != state.isRenderInternalMethodCallStubs() ||
-                        openUserCheckDialogBox.isSelected() != state.isOpenCustomizeTestDialog()
+                        openUserCheckDialogBox.isSelected() != state.isOpenCustomizeTestDialog()||
+                        throwSpecificExceptionTypesCheckBox.isSelected() != state.isThrowSpecificExceptionTypes()
                 );
     }
 }

src/main/resources/fileTemplates/testMeTests/JUnit4 & Mockito.java.ft

@@ -29,7 +29,7 @@ public class ${CLASS_NAME} {
 #if($TestSubjectUtils.shouldBeTested($method))
 
     @Test
-    public void #renderTestMethodName($method.name)() throws Exception {
+    public void #renderTestMethodName($method.name)()#if($method.methodExceptionTypes) throws $method.methodExceptionTypes#end {
 #if($hasMocks && $MockitoMockBuilder.shouldStub($method,$TESTED_CLASS))
 #renderMockStubs($method,$TESTED_CLASS)
 

src/main/resources/fileTemplates/testMeTests/JUnit4 & Powermock.java.ft

@@ -40,7 +40,7 @@ public class ${CLASS_NAME} {
     #foreach($method in $TESTED_CLASS.methods)
         #if($TestSubjectUtils.shouldBeTested($method))
             @Test
-            public void #renderTestMethodName($method.name)() throws Exception {
+            public void #renderTestMethodName($method.name)()#if($method.methodExceptionTypes) throws $method.methodExceptionTypes#end {
                 #if($hasMocks && $PowerMockBuilder.shouldStub($method, $TESTED_CLASS))
                     #renderMockStubs($method, $TESTED_CLASS)
                 #end

testData/testMeGenerator/declareSpecificTestMethodThrownExceptionTypes/src/com/example/services/impl/Foo.java

@@ -0,0 +1,13 @@
+package com.example.services.impl;
+
+import com.example.foes.Fire;
+
+public class Foo
+{
+    public Fire hasException(Fire tee) throws Exception {
+        return tee;
+    }
+    public Fire hasNoException(Fire tee) {
+        return tee;
+    }
+}

testData/testMeGenerator/declareSpecificTestMethodThrownExceptionTypes/test/com/example/services/impl/FooTest.java

@@ -0,0 +1,26 @@
+package com.example.services.impl;
+
+import com.example.foes.Fire;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * created by TestMe integration test on MMXVI
+ */
+public class FooTest {
+    Foo foo = new Foo();
+
+    @Test
+    public void testHasException() throws Exception {
+        Fire result = foo.hasException(new Fire());
+        Assert.assertEquals(new Fire(), result);
+    }
+
+    @Test
+    public void testHasNoException() {
+        Fire result = foo.hasNoException(new Fire());
+        Assert.assertEquals(new Fire(), result);
+    }
+}
+
+//Generated with love by TestMe :) Please raise issues & feature requests at: https://weirddev.com/forum#!/testme

testData/testMeGenerator/declareSpecificTestMethodThrownExceptionTypes/testGroovy/com/example/services/impl/FooTest.groovy

@@ -0,0 +1,23 @@
+package com.example.services.impl
+
+import com.example.foes.Fire
+import org.junit.Test
+
+/** created by TestMe integration test on MMXVI */
+class FooTest {
+    Foo foo = new Foo()
+
+    @Test
+    void testHasException() {
+        Fire result = foo.hasException(new Fire())
+        assert result == new Fire()
+    }
+
+    @Test
+    void testHasNoException() {
+        Fire result = foo.hasNoException(new Fire())
+        assert result == new Fire()
+    }
+}
+
+//Generated with love by TestMe :) Please raise issues & feature requests at: https://weirddev.com/forum#!/testme