增加注解支持

Author: LinuxSuRen

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

@@ -0,0 +1,32 @@
+/*
+ * 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;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Spring零配置
+ * @author suren
+ * @date 2017年6月8日 上午8:21:10
+ */
+@Configuration
+@ComponentScan
+public class AutoApplication
+{
+
+}

src/main/java/org/suren/autotest/web/framework/annotation/AutoData.java

@@ -0,0 +1,36 @@
+/*
+ * 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.annotation;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * @author suren
+ * @date 2017年6月8日 下午12:40:15
+ */
+@Target(ElementType.FIELD)
+@Documented
+public @interface AutoData
+{
+	/**
+	 * 默认为空字符串
+	 * @return 数据
+	 */
+	String value() default "";
+}

src/main/java/org/suren/autotest/web/framework/annotation/AutoField.java

@@ -29,7 +29,7 @@
  * @author suren
  * @date 2017年6月7日 下午6:57:34
  */
-@Target({ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.METHOD, ElementType.ANNOTATION_TYPE})
+@Target(ElementType.FIELD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Autowired

src/main/java/org/suren/autotest/web/framework/annotation/AutoLocator.java

@@ -40,4 +40,9 @@
 	 * @return 定位的具体内容
 	 */
 	String value();
+	
+	/**
+	 * @return 显式的查找超时时间（单位：毫秒）
+	 */
+	long timeout() default 0;
 }

src/main/java/org/suren/autotest/web/framework/annotation/AutoPage.java

@@ -39,4 +39,9 @@
 	 * @return 关联配置路径
 	 */
 	String path() default "";
+	
+	/**
+	 * @return 当前页面的url地址
+	 */
+	String url() default "";
 }

src/main/java/org/suren/autotest/web/framework/core/LocatorType.java

@@ -0,0 +1,29 @@
+/*
+ * 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.core;
+
+/**
+ * 定位方法枚举
+ * @author suren
+ * @date 2017年6月7日 下午7:00:15
+ */
+public enum LocatorType
+{
+	BY_ID, BY_NAME, BY_XPATH, BY_TAGNAME, BY_CSS,
+	BY_LINK_TEXT,
+	BY_PARTIAL_LINK_TEXT;
+}

src/main/java/org/suren/autotest/web/framework/invoker/BatchOperationInvoker.java

@@ -0,0 +1,38 @@
+/*
+ * 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.invoker;
+
+import org.suren.autotest.web.framework.settings.SettingUtil;
+import org.suren.autotest.web.framework.util.ElementUtil;
+
+/**
+ * 批量操作执行器
+ * @author suren
+ * @date 2017年5月15日 上午7:01:27
+ */
+public class BatchOperationInvoker
+{
+	/**
+	 * 批量操作元素
+	 * @param util
+	 * @param params
+	 */
+	public static void execute(SettingUtil util, String[] params)
+	{
+//		ElementUtil.click(buttons);
+	}
+}

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

@@ -46,8 +46,11 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.suren.autotest.web.framework.AutoApplication;
+import org.suren.autotest.web.framework.annotation.AutoPage;
 import org.suren.autotest.web.framework.core.ConfigException;
 import org.suren.autotest.web.framework.core.ConfigNotFoundException;
 import org.suren.autotest.web.framework.core.Locator;
@@ -64,6 +67,7 @@
 import org.suren.autotest.web.framework.hook.ShutdownHook;
 import org.suren.autotest.web.framework.page.Page;
 import org.suren.autotest.web.framework.selenium.SeleniumEngine;
+import org.suren.autotest.web.framework.spring.AutotestScope;
 import org.suren.autotest.web.framework.util.BeanUtil;
 import org.suren.autotest.web.framework.util.StringUtils;
 import org.suren.autotest.web.framework.validation.Validation;
@@ -100,10 +104,18 @@ public SettingUtil()
 		context = SpringUtils.getApplicationContext();
 		if(context == null || !((AbstractApplicationContext) context).isActive())
 		{
-			context = new ClassPathXmlApplicationContext(new String[]{"classpath*:autoTestContext.xml",
+			ClassPathXmlApplicationContext xmlContext = new ClassPathXmlApplicationContext(new String[]{"classpath*:autoTestContext.xml",
 			"classpath*:applicationContext.xml", "classpath*:beanScope.xml"});
+			
+			context = new AnnotationConfigApplicationContext(AutoApplication.class);
+			((AnnotationConfigApplicationContext) context).setParent(xmlContext);
+			
+			((AnnotationConfigApplicationContext) context).getBeanFactory().registerScope("autotest", new AutotestScope());
 		}
 
+		//auto注解扫描
+		annotationScan();
+		
 		try
 		{
 			//设置页面上下文对象
@@ -136,6 +148,35 @@ public SettingUtil()
 		logger.info("init process done.");
 	}
 
+	/**
+	 * auto注解扫描
+	 */
+	private void annotationScan()
+	{
+		Map<String, Object> beanMap = context.getBeansWithAnnotation(AutoPage.class);
+		beanMap.forEach((name, bean) -> {
+			if(!(bean instanceof Page)) {
+				return;
+			}
+			
+			String clsName = bean.getClass().getName();
+			pageMap.put(clsName, (Page) bean);
+			
+			//属性上的注解处理
+			fieldAnnotationProcess((Page) bean);
+		});
+	}
+
+	/**
+	 * 属性上的注解处理
+	 * @param bean Page类
+	 */
+	private void fieldAnnotationProcess(Page bean)
+	{
+		// TODO Auto-generated method stub
+		
+	}
+
 	/**
 	 * 从本地文件中读取
 	 * 

src/main/resources/beanScope.xml

@@ -3,6 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 	http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	<!-- 
 	<p:bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
 		<p:property name="scopes">
 			<p:map>
@@ -11,4 +12,5 @@
 			</p:map>
 		</p:property>
 	</p:bean>
+	 -->
 </p:beans>

src/test/java/org/suren/autotest/web/framework/driver/AndroidTest.java

@@ -0,0 +1,63 @@
+///*
+// * 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.driver;
+//
+//import io.appium.java_client.AppiumDriver;
+//
+//import java.io.File;
+//import java.net.MalformedURLException;
+//import java.net.URL;
+//
+//import org.junit.Test;
+//import org.openqa.selenium.remote.CapabilityType;
+//import org.openqa.selenium.remote.DesiredCapabilities;
+//
+///**
+// * @author suren
+// * @date 2017年5月20日 下午5:42:00
+// */
+//public class AndroidTest
+//{
+//	@Test
+//	public void test() throws MalformedURLException
+//	{
+//        File appFile = new File("D:/suren.apk");
+//        
+//        //设置自动化相关参数
+//        DesiredCapabilities capabilities = new DesiredCapabilities();
+//        capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
+//        capabilities.setCapability("platformName", "Android");
+//        capabilities.setCapability("deviceName", "750BBKP23E75"); //该参数可通过adb命令来获取
+//        
+//        //设置安卓系统版本
+//        capabilities.setCapability("platformVersion", "4.3");
+//        //设置apk路径
+//        capabilities.setCapability("app", appFile.getAbsolutePath()); 
+//        
+//        //设置app的主包名和主类名
+//        capabilities.setCapability("appPackage", "com.example.android.contactmanager");
+//        capabilities.setCapability("appActivity", ".ContactManager");
+//        
+//        //初始化
+//        AppiumDriver driver = new AppiumDriver(
+//                new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
+//        
+//        System.out.println("started");
+//        
+//        driver.quit();
+//	}
+//}