代码整理

Author: LinuxSuRen

pom.xml

@@ -120,6 +120,11 @@
             <artifactId>autotest.report</artifactId>
             <version>1.0.0-20170618</version>
         </dependency>
+        <dependency>
+		    <groupId>com.surenpi.autotest</groupId>
+		    <artifactId>autotest.webui</artifactId>
+		    <version>1.0-SNAPSHOT</version>
+        </dependency>
 
 		<!-- Selenium依赖 -->
 		<dependency>

src/main/java/org/suren/autotest/web/framework/page/Page.java

@@ -34,9 +34,11 @@
 
 /**
  * 对HTML页面的逻辑封装，不一定是一一对应
+ * @deprecated 建议使用WebPage类来代替
  * @author suren
  * @date Jul 17, 2016 9:06:52 AM
  */
+@Deprecated
 public class Page
 {
 	/** 页面唯一标示 */

src/main/java/org/suren/autotest/web/framework/selenium/WebPage.java

@@ -0,0 +1,100 @@
+/*
+ * 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.selenium;
+
+import org.openqa.selenium.Alert;
+import org.openqa.selenium.UnhandledAlertException;
+import org.openqa.selenium.WebDriver;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.surenpi.autotest.webui.Page;
+
+/**
+ * @author suren
+ * @date 2017年7月4日 下午7:51:57
+ */
+public class WebPage extends Page
+{
+	@Autowired
+	private SeleniumEngine	engine;
+
+	@Override
+	public void open()
+	{
+		String paramUrl = paramTranslate(getUrl());
+		
+		engine.openUrl(paramUrl);
+		
+		try
+		{
+			engine.computeToolbarHeight();
+		}
+		catch(UnhandledAlertException e)
+		{
+			Alert alert = engine.getDriver().switchTo().alert();
+			if(alert != null)
+			{
+				alert.dismiss();
+
+				engine.computeToolbarHeight();
+			}
+		}
+	}
+
+	@Override
+	public void close()
+	{
+		engine.close();
+	}
+
+	@Override
+	public void closeOthers()
+	{
+		String currentTitle = getTitle();
+		String currentWinHandle = engine.getDriver().getWindowHandle();
+		
+		for(String winHandle : engine.getDriver().getWindowHandles())
+		{
+			WebDriver itemDrive = engine.getDriver().switchTo().window(winHandle);
+			if(!itemDrive.getTitle().equals(currentTitle))
+			{
+				itemDrive.close();
+			}
+		}
+		
+		engine.getDriver().switchTo().window(currentWinHandle);
+	}
+
+	@Override
+	public String getCurrentUrl()
+	{
+		return engine.getDriver().getCurrentUrl();
+	}
+
+	@Override
+	public String getPageSource()
+	{
+		return engine.getDriver().getPageSource();
+	}
+
+	@Override
+	public String getTitle()
+	{
+		return engine.getDriver().getTitle();
+	}
+
+}