代码整理

Author: LinuxSuRen

src/main/java/org/suren/autotest/web/framework/settings/AutoModuleProxy.java

@@ -18,12 +18,10 @@
 
 package org.suren.autotest.web.framework.settings;
 
-import net.sf.cglib.core.GeneratorStrategy;
-import net.sf.cglib.core.NamingPolicy;
 import net.sf.cglib.proxy.Enhancer;
 import net.sf.cglib.proxy.MethodInterceptor;
 import net.sf.cglib.proxy.MethodProxy;
-import org.springframework.cglib.core.SpringNamingPolicy;
+import org.suren.autotest.web.framework.annotation.AutoExpect;
 import org.suren.autotest.web.framework.annotation.AutoModule;
 import org.suren.autotest.web.framework.report.RecordReportWriter;
 import org.suren.autotest.web.framework.report.record.ExceptionRecord;
@@ -65,6 +63,7 @@ public Object intercept(Object obj, Method method, Object[] args,
         Object result = null;
         Class<?> superCls = obj.getClass().getSuperclass();
         AutoModule autoModule = superCls.getAnnotation(AutoModule.class);
+        AutoExpect autoExpect = method.getAnnotation(AutoExpect.class);
 
         NormalRecord normalRecord = new NormalRecord();
         normalRecord.setBeginTime(beginTime);
@@ -84,17 +83,51 @@ public Object intercept(Object obj, Method method, Object[] args,
                 write(normalRecord);
             }
         }
-        catch(Exception e)
+        catch(Exception | AssertionError e)
         {
+            boolean acceptException = exceptionHandle(autoExpect, e);
+
             normalRecord.setEndTime(System.currentTimeMillis());
             write(new ExceptionRecord(e, normalRecord));
 
-            throw e;
+            if(acceptException)
+            {
+                e.printStackTrace();
+            }
+            else
+            {
+                throw e;
+            }
         }
 
         return result;
     }
 
+    /**
+     * 根据注解配置，是否要对异常进行处理
+     * @param autoExpect
+     * @return
+     */
+    private boolean exceptionHandle(AutoExpect autoExpect, Throwable e)
+    {
+        if(autoExpect != null)
+        {
+            Class<?>[] acceptArray = autoExpect.accept();
+            if(acceptArray != null && acceptArray.length > 0)
+            {
+                for(Class<?> clz : acceptArray)
+                {
+                     if(clz.equals(e.getClass()))
+                    {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
     private boolean isNotExcludeMethod(Method method)
     {
         String name = method.getName();

src/test/java/org/suren/autotest/web/framework/mail/MailTest.java

@@ -21,14 +21,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.mail.MailSender;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.suren.autotest.web.framework.AutoApplicationConfig;
 import org.suren.autotest.web.framework.AutoTestConfig;
-import org.suren.autotest.web.framework.util.EncryptorUtil;
 
 /**
  * @author suren
@@ -44,8 +42,8 @@ public class MailTest
     public void mailSend()
     {
         SimpleMailMessage msg = new SimpleMailMessage();
-        msg.setFrom("361981269@qq.com");
-        msg.setTo("361981269@qq.com");
+        msg.setFrom("123456@qq.com");
+        msg.setTo("123456@qq.com");
         msg.setText("context");
         msg.setSubject("subject");
         mailSender.send(msg);