增加对动态参数的支持

Author: LinuxSuRen

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

@@ -1,6 +1,19 @@
-/**
- * http://surenpi.com
+/*
+ * 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.settings;
 
 /**

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

@@ -24,6 +24,7 @@
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -57,6 +58,7 @@
 import org.suren.autotest.web.framework.data.ClasspathResource;
 import org.suren.autotest.web.framework.data.DataResource;
 import org.suren.autotest.web.framework.data.DataSource;
+import org.suren.autotest.web.framework.data.DynamicDataSource;
 import org.suren.autotest.web.framework.data.FileResource;
 import org.suren.autotest.web.framework.hook.ShutdownHook;
 import org.suren.autotest.web.framework.page.Page;
@@ -77,6 +79,7 @@ public class SettingUtil implements Closeable
 
 	private Map<String, Page>			pageMap	= new HashMap<String, Page>();
 	private Map<String, DataSourceInfo>	dataSourceMap = new HashMap<String, DataSourceInfo>();
+	private Map<String, DynamicDataSource> dynamicDataSourceMap;
 	private ApplicationContext			context;
 
 	/** 系统配置路径 */
@@ -241,9 +244,11 @@ public void initData()
 	/**
 	 * 从数据源中加载指定的数据组，设置到所有page类中
 	 * @param 数据组序号（从1开始）
+	 * @return 如果没有数据源，则返回空列表
 	 */
-	public void initData(int row)
+	public List<DynamicDataSource> initData(int row)
 	{
+		List<DynamicDataSource> dynamicDataSourceList = new ArrayList<DynamicDataSource>();
 		Iterator<String> pageIterator = pageMap.keySet().iterator();
 		while(pageIterator.hasNext())
 		{
@@ -256,8 +261,15 @@ public void initData(int row)
 			}
 
 			Page page = pageMap.get(pageKey);
-			initPageData(page, row);
+			
+			DynamicDataSource dynamicDataSource = initPageData(page, row);
+			if(dynamicDataSource != null)
+			{
+				dynamicDataSourceList.add(dynamicDataSource);
+			}
 		}
+		
+		return dynamicDataSourceList;
 	}
 
 	/**
@@ -266,16 +278,17 @@ public void initData(int row)
 	 * @param row 数据组序号（从1开始）
 	 * @return
 	 */
-	public boolean initPageData(Page page, int row)
+	public DynamicDataSource initPageData(Page page, int row)
 	{
 		String dataSourceStr = page.getDataSource();
 		final DataSourceInfo dataSourceInfo = dataSourceMap.get(dataSourceStr);
 		if(dataSourceInfo == null)
 		{
-			return false;
+			return null;
 		}
 
-		DataSource dataSource = context.getBean(dataSourceInfo.getType(), DataSource.class);
+		getDynamicDataSources();
+		DataSource dataSource = (DataSource) dynamicDataSourceMap.get(dataSourceInfo.getType());//context.getBean(dataSourceInfo.getType(), DataSource.class);
 		DataResource clzResource = new ClasspathResource(
 				SettingUtil.class, dataSourceInfo.getResource());
 		try
@@ -296,7 +309,26 @@ public boolean initPageData(Page page, int row)
 			e.printStackTrace();
 		}
 
-		return dataSource.loadData(clzResource, row, page);
+		dataSource.loadData(clzResource, row, page);
+		
+		return dataSource;
+	}
+	
+	public Collection<DynamicDataSource> getDynamicDataSources()
+	{
+		if(dynamicDataSourceMap == null)
+		{
+			dynamicDataSourceMap = context.getBeansOfType(DynamicDataSource.class);
+		}
+		
+		if(dynamicDataSourceMap != null)
+		{
+			return dynamicDataSourceMap.values();
+		}
+		else
+		{
+			return null;
+		}
 	}
 
 	/**
@@ -356,7 +388,7 @@ private void parse(Document doc) throws IOException, DocumentException, SAXExcep
 		simpleNamespaceContext.addNamespace("ns", "http://surenpi.com");
 
 		SeleniumEngine seleniumEngine = getEngine();
-		if(seleniumEngine.getDriverStr() == null || "".equals(seleniumEngine.getDriverStr()))
+		if(StringUtils.isBlank(seleniumEngine.getDriverStr()))
 		{
 			XPath xpath = new DefaultXPath("/ns:autotest/ns:engine");
 			xpath.setNamespaceContext(simpleNamespaceContext);
@@ -650,6 +682,11 @@ private String convertBeanName(final String pageClsStr)
 			result = pageClsStr.substring(index + 1);
 		}
 
+		if(result.length() > 1 && result.charAt(1) >= 'A' && result.charAt(1) <= 'Z')
+		{
+			return result;
+		}
+		
 		return StringUtils.uncapitalize(result);
 	}
 

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

@@ -1,6 +1,19 @@
-/**
- * http://surenpi.com
+/*
+ * 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.settings;
 
 import org.springframework.beans.BeansException;

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

@@ -1,10 +1,24 @@
-/**
- * http://surenpi.com
+/*
+ * 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.settings;
 
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.dom4j.Document;
@@ -26,6 +40,11 @@
  */
 public class SuiteParser
 {
+	/** 命名空间地址 */
+	public static final String NS_URI = "http://suite.surenpi.com";
+	
+	/** 支持的文件后缀 */
+	private final List<String> supportList = new ArrayList<String>(1);
 	private SimpleNamespaceContext simpleNamespaceContext = new SimpleNamespaceContext();
 
 	/**
@@ -41,14 +60,14 @@ public Suite parse(InputStream suiteInputStream) throws DocumentException
 
 		Document document = reader.read(suiteInputStream);
 
-		simpleNamespaceContext.addNamespace("ns", "http://suite.surenpi.com");
+		simpleNamespaceContext.addNamespace("ns", NS_URI);
 
 		XPath xpath = new DefaultXPath("/ns:suite");
 		xpath.setNamespaceContext(simpleNamespaceContext);
 		Element suiteEle = (Element) xpath.selectSingleNode(document);
 		if (suiteEle == null)
 		{
-			throw new RuntimeException("can not found suite config.");
+			throw new RuntimeException("Can not found suite config.");
 		}
 
 		Suite suite = new Suite();
@@ -70,6 +89,20 @@ public Suite parse(InputStream suiteInputStream) throws DocumentException
 
 		return suite;
 	}
+	
+	/**
+	 * 返回结果不允许修改
+	 * @return 支持的文件后缀
+	 */
+	public List<String> getSupport()
+	{
+		if(supportList.size() == 0)
+		{
+			supportList.add(".xml");
+		}
+		
+		return Collections.unmodifiableList(supportList);
+	}
 
 	/**
 	 * 解析page配置
@@ -93,7 +126,7 @@ private void pagesParse(Document document, Suite suite)
 		List<Element> pageNodes = xpath.selectNodes(document);
 		if(pageNodes == null || pageNodes.size() == 0)
 		{
-			throw new RuntimeException("can not found page config.");
+			throw new RuntimeException("Can not found page config.");
 		}
 
 		for(Element pageEle : pageNodes)
@@ -106,7 +139,7 @@ private void pagesParse(Document document, Suite suite)
 			Element actionsEle = (Element) xpath.selectSingleNode(pageEle);
 			if(actionsEle == null)
 			{
-				throw new RuntimeException("can not found actions config.");
+				throw new RuntimeException("Can not found actions config.");
 			}
 
 			String disable = actionsEle.attributeValue("disable", "false");