截图部分重构

Author: LinuxSuRen

src/main/java/org/suren/autotest/web/framework/AutoApplicationConfig.java

@@ -16,16 +16,12 @@
 
 package org.suren.autotest.web.framework;
 
-import java.util.Properties;
-
-import org.springframework.beans.factory.annotation.Autowire;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.mail.MailSender;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.ImportResource;
+import org.suren.autotest.web.framework.log.Image4SearchLog;
+import org.suren.autotest.web.framework.mail.MailConfig;
 
 /**
  * Spring零配置
@@ -34,39 +30,11 @@
  */
 @Configuration
 @ComponentScan
-@PropertySource("classpath:application.properties")
+@ImportResource({"autoTestContext.xml", "beanScope.xml"})
+@Import({
+	Image4SearchLog.class,
+	MailConfig.class
+})
 public class AutoApplicationConfig
 {
-    @Value("${mail.host}")
-    private String mailHost;
-    @Value("${mail.username}")
-    private String mailUserName;
-    @Value("${mail.password}")
-    private String mailPassword;
-
-    @Bean(autowire = Autowire.BY_TYPE)
-    public MailSender mailBean()
-    {
-        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
-        mailSender.setHost(mailHost);
-        mailSender.setUsername(mailUserName);
-        mailSender.setPassword(mailPassword);
-        setUpMailPro(mailSender);
-
-        return mailSender;
-    }
-
-    /**
-     * 设置邮箱服务器配置
-     * @param mailSender
-     */
-    private void setUpMailPro(JavaMailSenderImpl mailSender)
-    {
-        Properties javaMailProperties = new Properties();
-        javaMailProperties.put("mail.smtp.auth", true);
-        javaMailProperties.put("mail.smtp.starttls.enable", true);
-        javaMailProperties.put("mail.smtp.timeout", 5000);
-
-        mailSender.setJavaMailProperties(javaMailProperties);
-    }
 }

src/main/java/org/suren/autotest/web/framework/log/BlankElementMark.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2002-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.suren.autotest.web.framework.log;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.openqa.selenium.WebElement;
+
+/**
+ * @author suren
+ * @date 2017年6月29日 下午3:55:04
+ */
+public class BlankElementMark implements ElementMark
+{
+
+	@Override
+	public void mark(WebElement ele, File file) throws IOException
+	{
+		//this is blank class, just for simple.
+	}
+
+}

src/main/java/org/suren/autotest/web/framework/log/ElementMark.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2002-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.suren.autotest.web.framework.log;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.openqa.selenium.WebElement;
+
+/**
+ * @author suren
+ * @date 2017年6月29日 下午3:51:18
+ */
+public interface ElementMark
+{
+	void mark(WebElement ele, File file) throws IOException;
+}

src/main/java/org/suren/autotest/web/framework/log/Image4SearchLog.java

@@ -16,8 +16,6 @@
 
 package org.suren.autotest.web.framework.log;
 
-import java.awt.Color;
-import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -28,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
 import javax.annotation.PostConstruct;
@@ -37,18 +36,16 @@
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
-import org.openqa.selenium.Dimension;
+import org.aspectj.lang.annotation.Before;
 import org.openqa.selenium.OutputType;
-import org.openqa.selenium.Point;
-import org.openqa.selenium.StaleElementReferenceException;
 import org.openqa.selenium.TakesScreenshot;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-import org.springframework.context.annotation.ScopedProxyMode;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 import org.suren.autotest.web.framework.selenium.SeleniumEngine;
 import org.suren.autotest.web.framework.util.AnimatedGifEncoder;
@@ -60,17 +57,18 @@
  */
 @Component
 @Aspect
-@Scope(value = "autotest", proxyMode = ScopedProxyMode.TARGET_CLASS)
+@Configuration
 public class Image4SearchLog
 {
 	private static final Logger LOGGER = LoggerFactory.getLogger(Image4SearchLog.class);
 
 	@Autowired
 	private SeleniumEngine engine;
+	@Autowired
+	private ElementMark elementMark;
 
-	private Properties pro = new Properties();
+	private Properties imagePro = new Properties();
 
-	private String progressIdentify;
 	private File outputDir;
 	private List<File> elementSearchImageFileList = new ArrayList<File>();
 
@@ -88,7 +86,7 @@ public Image4SearchLog()
 
 				try(InputStream imgCfgStream = url.openStream())
 				{
-					pro.load(imgCfgStream);
+					imagePro.load(imgCfgStream);
 				}
 			}
 		}
@@ -102,17 +100,19 @@ public File getOutputFile()
 	{
 		if(outputDir == null)
 		{
-			outputDir = new File(pro.getProperty(LoggerConstants.IMG_LOG_DIR, System.getProperty("java.io.tmpdir"))); 
+			outputDir = new File(imagePro.getProperty(LoggerConstants.IMG_LOG_DIR,
+					System.getProperty("java.io.tmpdir"))); 
 			if(!outputDir.isDirectory())
 			{
 				if(!outputDir.mkdirs())
 				{
 					LOGGER.error(String.format("Can not create img dir [%s].", outputDir));
 
 					outputDir = new File(System.getProperty("java.io.tmpdir"));
-					pro.setProperty(LoggerConstants.IMG_LOG_DIR, outputDir.getAbsolutePath());
 				}
 			}
+			
+			engine.setProgressId(LoggerConstants.IMG_LOG_DIR, outputDir.getAbsolutePath());
 		}
 
 		return outputDir;
@@ -122,23 +122,76 @@ public File getOutputFile()
 	public void init()
 	{
 		outputDir = getOutputFile(); 
+		Map<Object, Object> engineConfig = engine.getEngineConfig();
+		long currentTime = System.currentTimeMillis();
+		
+		String progressIdentify = (String) engineConfig.getOrDefault(
+				LoggerConstants.PROGRESS_IDENTIFY, String.valueOf(currentTime));
+		String applicationIdentify = (String) engineConfig.getOrDefault(LoggerConstants.APP_IDENTIFY,
+				"phoenix");
+		
+		outputDir = new File(outputDir, applicationIdentify);
+		outputDir.mkdirs();
+		outputDir = new File(outputDir, progressIdentify);
+		outputDir.mkdirs();
+		
+		String gifPath = new File(outputDir, currentTime + ".gif").getAbsolutePath();
 
-		progressIdentify = (String) engine.getEngineConfig().get("progress_identify");
+		engine.setProgressId(LoggerConstants.APP_IDENTIFY, applicationIdentify);
+		engine.setProgressId(LoggerConstants.PROGRESS_IDENTIFY, progressIdentify);
+		engine.setProgressId(LoggerConstants.GIF_CURRENT_PATH, gifPath);
 
 		animatedGifEncoder = new AnimatedGifEncoder();
-		animatedGifEncoder.start(new File(outputDir, progressIdentify + ".gif").getAbsolutePath());
+		animatedGifEncoder.start(gifPath);
 		animatedGifEncoder.setDelay(800);
 		animatedGifEncoder.setRepeat(0);
 	}
+	
+	@Before("within(org.suren.autotest.web.framework.core.ElementSearchStrategy)")
+	public void search()
+	{
+		System.out.println("sdds");
+	}
 
 	@Around("execution(* org.suren.autotest.web.framework.core.ElementSearchStrategy.search*(..))")
-	public Object hello(ProceedingJoinPoint joinPoint) throws Throwable
+	public Object imageLog(ProceedingJoinPoint joinPoint) throws Throwable
 	{
 		Object[] args = joinPoint.getArgs();
 
-		Object res = joinPoint.proceed(args);
+		Object res = null;
+		Throwable ea = null;
+		try
+		{
+			res = joinPoint.proceed(args);
+		}
+		catch(Throwable e)
+		{
+			ea = e;
+			
+			throw e;
+		}
+		finally
+		{
+			capture(res, ea);
+		}
+		
+		return res;
+	}
+	
+	/**
+	 * 截图捕捉
+	 * @param ele
+	 * @throws IOException
+	 */
+	private void capture(Object ele, Throwable e) throws IOException
+	{
+		if(ele == null)
+		{
+			return;
+		}
+		
 		WebDriver driver = engine.getDriver();
-		if(res instanceof WebElement && driver instanceof TakesScreenshot)
+		if(ele instanceof WebElement && driver instanceof TakesScreenshot)
 		{
 			TakesScreenshot shot = (TakesScreenshot) driver;
 
@@ -147,29 +200,46 @@ public Object hello(ProceedingJoinPoint joinPoint) throws Throwable
 
 			try
 			{
-				WebElement webEle = (WebElement) res;
-				Point loc = webEle.getLocation();
-				Dimension size = webEle.getSize();
-				
-				Graphics2D g = bufImg.createGraphics();
-				g.setColor(Color.red);
-				g.drawRect(loc.getX(), loc.getY(), size.getWidth(), size.getHeight());
+				elementMark.mark((WebElement) ele, file);
+			}
+			catch(IOException ioEx)
+			{
+				ioEx.printStackTrace();
+			}
+			
+			long currentTime =  System.currentTimeMillis();
+			String fileName = null;
+			if(e == null)
+			{
+				fileName = currentTime + ".png";
 			}
-			catch(StaleElementReferenceException e)
+			else
 			{
-				//
+				fileName = "ex_" + currentTime + ".png";
 			}
 
-			File elementSearchImageFile = new File(outputDir, progressIdentify + "_" + System.currentTimeMillis() + ".png");
+			File elementSearchImageFile = new File(outputDir, fileName);
 			try(OutputStream output = new FileOutputStream(elementSearchImageFile))
 			{
 				ImageIO.write(bufImg, "gif", output);
 				elementSearchImageFileList.add(elementSearchImageFile);
 				animatedGifEncoder.addFrame(bufImg);
 			}
 		}
-		
-		return res;
+	}
+
+	@Bean
+	public ElementMark createElementMark()
+	{
+		boolean mark = Boolean.valueOf(imagePro.getProperty("element.mark", "true"));
+		if(mark)
+		{
+			return new TargetElementMark();
+		}
+		else
+		{
+			return new BlankElementMark();
+		}
 	}
 
 	@PreDestroy