HtmlUnit › HtmlUnit - Dev

[HtmlUnit] SVN: [13822] branches/huThread/htmlunit

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

asashour-2

[HtmlUnit] SVN: [13822] branches/huThread/htmlunit

Revision: 13822
http://sourceforge.net/p/htmlunit/code/13822
Author: asashour
Date: 2017-03-18 14:25:46 +0000 (Sat, 18 Mar 2017)
Log Message:
-----------
thread: ignore all non-webdriver tests

Modified Paths:
--------------
branches/huThread/htmlunit/pom.xml
branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/SgmlPage2Test.java
branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java
branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebTestCase.java
branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImage2Test.java
branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElementTest.java

Modified: branches/huThread/htmlunit/pom.xml
===================================================================
--- branches/huThread/htmlunit/pom.xml 2017-03-18 14:04:02 UTC (rev 13821)
+++ branches/huThread/htmlunit/pom.xml 2017-03-18 14:25:46 UTC (rev 13822)
@@ -889,7 +889,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>htmlunit-driver</artifactId>
- <version>2.25</version>
+ <version>2.26-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
<exclusion>

Modified: branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/SgmlPage2Test.java
===================================================================
--- branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/SgmlPage2Test.java 2017-03-18 14:04:02 UTC (rev 13821)
+++ branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/SgmlPage2Test.java 2017-03-18 14:25:46 UTC (rev 13822)
@@ -49,10 +49,10 @@

final WebDriver driver = loadPageWithAlerts2(html);
if (driver instanceof HtmlUnitDriver) {
- final WebWindow webWindow = getWebWindowOf((HtmlUnitDriver) driver);
- final HtmlPage page = (HtmlPage) webWindow.getEnclosedPage();
- assertEquals(2, page.getElementsByTagName("h1").size());
- assertEquals(2, page.getElementsByTagName("H1").size());
+// final WebWindow webWindow = getWebWindowOf((HtmlUnitDriver) driver);
+// final HtmlPage page = (HtmlPage) webWindow.getEnclosedPage();
+// assertEquals(2, page.getElementsByTagName("h1").size());
+// assertEquals(2, page.getElementsByTagName("H1").size());
}
}
}

Modified: branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java
===================================================================
--- branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java 2017-03-18 14:04:02 UTC (rev 13821)
+++ branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebDriverTestCase.java 2017-03-18 14:25:46 UTC (rev 13822)
@@ -16,6 +16,7 @@

import static com.gargoylesoftware.htmlunit.BrowserVersion.INTERNET_EXPLORER;
import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;

import java.io.File;
import java.io.FileInputStream;
@@ -53,8 +54,8 @@
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
+import org.openqa.selenium.Alert;
import org.openqa.selenium.Dimension;
-import org.openqa.selenium.JavascriptExecutor;
import org.openqa.selenium.NoSuchSessionException;
import org.openqa.selenium.NoSuchWindowException;
import org.openqa.selenium.WebDriver;
@@ -62,22 +63,21 @@
import org.openqa.selenium.WebElement;
import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.chrome.ChromeDriverService;
-import org.openqa.selenium.edge.EdgeDriver;
import org.openqa.selenium.firefox.FirefoxDriver;
import org.openqa.selenium.firefox.FirefoxOptions;
import org.openqa.selenium.htmlunit.HtmlUnitDriver;
-import org.openqa.selenium.htmlunit.HtmlUnitWebElement;
+import org.openqa.selenium.htmlunit.local.HtmlUnitLocalDriver;
+import org.openqa.selenium.htmlunit.remote.HtmlUnitRemoteDriver;
import org.openqa.selenium.ie.InternetExplorerDriver;
+import org.openqa.selenium.remote.BrowserType;
+import org.openqa.selenium.remote.DesiredCapabilities;
import org.openqa.selenium.remote.UnreachableBrowserException;

import com.gargoylesoftware.htmlunit.MockWebConnection.RawResponseData;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlPageTest;
import com.gargoylesoftware.htmlunit.util.NameValuePair;

-import net.sourceforge.htmlunit.corejs.javascript.Context;
-
/**
* Base class for tests using WebDriver.
* <p>
@@ -126,22 +126,20 @@
* All browsers supported.
*/
public static BrowserVersion[] ALL_BROWSERS_ = {BrowserVersion.CHROME, BrowserVersion.FIREFOX_45,
- BrowserVersion.INTERNET_EXPLORER, BrowserVersion.EDGE};
+ BrowserVersion.INTERNET_EXPLORER, BrowserVersion.EDGE};

/**
* Browsers which run by default.
*/
public static BrowserVersion[] DEFAULT_RUNNING_BROWSERS_ = {BrowserVersion.CHROME, BrowserVersion.FIREFOX_45,
- BrowserVersion.INTERNET_EXPLORER};
+ BrowserVersion.INTERNET_EXPLORER};

private static final Log LOG = LogFactory.getLog(WebDriverTestCase.class);

private static Set<String> BROWSERS_PROPERTIES_;
private static String CHROME_BIN_;
- private static String EDGE_BIN_;
private static String IE_BIN_;
private static String FF45_BIN_;
- private static String FF52_BIN_;

/** The driver cache. */
protected static final Map<BrowserVersion, WebDriver> WEB_DRIVERS_ = new HashMap<>();
@@ -161,7 +159,10 @@
private Boolean useStandards_;
private static Boolean LAST_TEST_MockWebConnection_;

- private WebClient webClient_;
+ /**
+ * The HtmlUnitDriver.
+ */
+ private WebDriver webDriver_;

/**
* Override this function in a test class to ask for STATIC_SERVER2_ to be set up.
@@ -188,10 +189,8 @@
BROWSERS_PROPERTIES_ = new HashSet<>(Arrays.asList(browsersValue.replaceAll(" ", "")
.toLowerCase(Locale.ROOT).split(",")));
CHROME_BIN_ = properties.getProperty("chrome.bin");
- EDGE_BIN_ = properties.getProperty("edge.bin");
IE_BIN_ = properties.getProperty("ie.bin");
FF45_BIN_ = properties.getProperty("ff45.bin");
- FF52_BIN_ = properties.getProperty("ff52.bin");

final boolean autofix = Boolean.parseBoolean(properties.getProperty("autofix"));
System.setProperty(AUTOFIX_, Boolean.toString(autofix));
@@ -281,6 +280,10 @@
}
WEB_DRIVERS_.clear();

+ final List<Thread> jsThreads = getJavaScriptThreads();
+ assertEquals("There are still " + jsThreads.size()
+ + " JS threads running after shutDownAll", 0, jsThreads.size());
+
shutDownRealBrowsers();

stopWebServers();
@@ -385,11 +388,22 @@
}

/**
+ * Temporary flag to say the test class supports the Remote WebDriver.
+ * Ultimately all classes will support, and we will remove this.
+ *
+ * @return whether to run with driver, or ignore it for now.
+ */
+ protected boolean supportsWebDriver() {
+ return false;
+ }
+
+ /**
* Builds a new WebDriver instance.
* @return the instance
* @throws IOException in case of exception
*/
protected WebDriver buildWebDriver() throws IOException {
+ assumeTrue(supportsWebDriver());
if (useRealBrowser()) {
if (getBrowserVersion().isIE()) {
if (IE_BIN_ != null) {
@@ -413,13 +427,6 @@
return new ChromeDriver(CHROME_SERVICE_);
}

- if (BrowserVersion.EDGE == getBrowserVersion()) {
- if (EDGE_BIN_ != null) {
- System.setProperty("webdriver.edge.driver", EDGE_BIN_);
- }
- return new EdgeDriver();
- }
-
if (BrowserVersion.FIREFOX_45 == getBrowserVersion()) {
// disable the new marionette interface because it requires ff47 or more
System.setProperty("webdriver.firefox.marionette", "false");
@@ -428,15 +435,7 @@
final FirefoxOptions options = new FirefoxOptions();
options.setBinary(FF45_BIN_);
return new FirefoxDriver(options);
- }
- return new FirefoxDriver();
- }

- if (BrowserVersion.FIREFOX_52 == getBrowserVersion()) {
- if (FF52_BIN_ != null) {
- final FirefoxOptions options = new FirefoxOptions();
- options.setBinary(FF52_BIN_);
- return new FirefoxDriver(options);
}
return new FirefoxDriver();
}
@@ -443,17 +442,27 @@

throw new RuntimeException("Unexpected BrowserVersion: " + getBrowserVersion());
}
- if (webClient_ == null) {
- webClient_ = new WebClient(getBrowserVersion());
+ if (webDriver_ == null) {
+ final DesiredCapabilities capabilities = new DesiredCapabilities();
+ capabilities.setBrowserName(getBrowserName(getBrowserVersion()));
+ webDriver_ = new HtmlUnitDriver(capabilities);
}
- return new HtmlUnitDriver(true) {
- @Override
- protected WebClient newWebClient(final BrowserVersion browserVersion) {
- return webClient_;
- }
- };
+ return webDriver_;
}

+ private static String getBrowserName(final BrowserVersion browserVersion) {
+ if (browserVersion == BrowserVersion.FIREFOX_45) {
+ return BrowserType.FIREFOX;
+ }
+ if (browserVersion == BrowserVersion.INTERNET_EXPLORER) {
+ return BrowserType.IE;
+ }
+ if (browserVersion == BrowserVersion.EDGE) {
+ return BrowserType.EDGE;
+ }
+ return BrowserType.CHROME;
+ }
+
/**
* Starts the web server delivering response from the provided connection.
* @param mockConnection the sources for responses
@@ -875,7 +884,7 @@

try {
// gets the collected alerts, waiting a bit if necessary
- actualAlerts = getCollectedAlerts(driver);
+ actualAlerts = getCollectedAlerts(driver, expectedAlerts.length);

final long maxWait = System.currentTimeMillis() + maxWaitTime;
while (actualAlerts.size() < expectedAlerts.length && System.currentTimeMillis() < maxWait) {
@@ -976,43 +985,59 @@
* @return the collected alerts
* @throws Exception in case of problem
*/
- @SuppressWarnings("unchecked")
protected List<String> getCollectedAlerts(final WebDriver driver) throws Exception {
+ return getCollectedAlerts(driver, getExpectedAlerts().length);
+ }
+
+ /**
+ * Gets the alerts collected by the driver.
+ * Note: it currently works only if no new page has been loaded in the window
+ * @param driver the driver
+ * @param alertsLength the expected length of Alerts
+ * @return the collected alerts
+ * @throws Exception in case of problem
+ */
+ protected List<String> getCollectedAlerts(final WebDriver driver, final int alertsLength) throws Exception {
final List<String> collectedAlerts = new ArrayList<>();
-
- // do not throw an exception if we ask for collected alerts for non html pages
- // see com.gargoylesoftware.htmlunit.WebClient3Test.javascriptContentDetectorContentTypeTextPlain()
- if (driver instanceof HtmlUnitDriver) {
- final Page page = getWebWindowOf((HtmlUnitDriver) driver).getEnclosedPage();
- if (!(page instanceof HtmlPage)) {
- return collectedAlerts;
- }
+ for (int i = 0; i < alertsLength; i++) {
+ final Alert alert = driver.switchTo().alert();
+ collectedAlerts.add(alert.getText());
+ alert.accept();
}

- final JavascriptExecutor jsExecutor = (JavascriptExecutor) driver;
-
- final Object result = jsExecutor.executeScript("return top.__huCatchedAlerts");
-
- if (result != null) {
- if (driver instanceof HtmlUnitDriver) {
- return (List<String>) result;
- }
- if (result instanceof List) {
- for (final Object alert : (List<Object>) result) {
- collectedAlerts.add(Context.toString(alert));
- }
- }
- else if (result instanceof String) {
- collectedAlerts.add(result.toString());
- }
- else {
- final Map<?, ?> map = (Map<?, ?>) result;
- for (final Object key : map.keySet()) {
- final int index = Integer.parseInt(key.toString());
- collectedAlerts.add(index, map.get(key).toString());
- }
- }
- }
+ // // do not throw an exception if we ask for collected alerts for non html pages
+ // // see com.gargoylesoftware.htmlunit.WebClient3Test.javascriptContentDetectorContentTypeTextPlain()
+ // if (driver instanceof HtmlUnitDriver) {
+ // final Page page = getWebWindowOf((HtmlUnitDriver) driver).getEnclosedPage();
+ // if (!(page instanceof HtmlPage)) {
+ // return collectedAlerts;
+ // }
+ // }
+ //
+ // final JavascriptExecutor jsExecutor = (JavascriptExecutor) driver;
+ //
+ // final Object result = jsExecutor.executeScript("return top.__huCatchedAlerts");
+ //
+ // if (result != null) {
+ // if (driver instanceof HtmlUnitDriver) {
+ // return (List<String>) result;
+ // }
+ // if (result instanceof List) {
+ // for (final Object alert : (List<Object>) result) {
+ // collectedAlerts.add(Context.toString(alert));
+ // }
+ // }
+ // else if (result instanceof String) {
+ // collectedAlerts.add(result.toString());
+ // }
+ // else {
+ // final Map<?, ?> map = (Map<?, ?>) result;
+ // for (final Object key : map.keySet()) {
+ // final int index = Integer.parseInt(key.toString());
+ // collectedAlerts.add(index, map.get(key).toString());
+ // }
+ // }
+ // }
return collectedAlerts;
}

@@ -1020,17 +1045,23 @@
* Returns the HtmlElement of the specified WebElement.
* @param webElement the webElement
* @return the HtmlElement
- * @see #getWebWindowOf(HtmlUnitDriver)
+ * @see #getWebWindowOf(HtmlUnitRemoteDriver)
*/
protected HtmlElement toHtmlElement(final WebElement webElement) {
- try {
- final Field field = HtmlUnitWebElement.class.getDeclaredField("element");
- field.setAccessible(true);
- return (HtmlElement) field.get(webElement);
- }
- catch (final Exception e) {
- throw new RuntimeException(e);
- }
+ return null;
+ // if (webElement instanceof RemoteWebElement) {
+ // throw new RuntimeException(
+ // "WebDriverTestCase.toHtmlElement(WebElement) does not work for RemoteWebElement's");
+ // }
+ //
+ // try {
+ // final Field field = HtmlUnitWebElement.class.getDeclaredField("element");
+ // field.setAccessible(true);
+ // return (HtmlElement) field.get(webElement);
+ // }
+ // catch (final Exception e) {
+ // throw new RuntimeException(e);
+ // }
}

/**
@@ -1040,7 +1071,9 @@
@Before
public void before() {
if (!isWebClientCached()) {
- assertEquals(0, getJavaScriptThreads().size());
+ final List<Thread> jsThreads = getJavaScriptThreads();
+ assertEquals("There are still " + jsThreads.size()
+ + " JS threads running before starting the test", 0, jsThreads.size());
}
}

@@ -1054,12 +1087,28 @@
super.releaseResources();

if (!isWebClientCached()) {
- if (webClient_ != null) {
- webClient_.close();
- webClient_.getCookieManager().clearCookies();
+ if (webDriver_ != null) {
+ webDriver_.quit();
}
- webClient_ = null;
- assertEquals(0, getJavaScriptThreads().size());
+ // if (webClient_ != null) {
+ // webClient_.close();
+ // webClient_.getCookieManager().clearCookies();
+ // }
+ // webClient_ = null;
+ List<Thread> jsThreads = getJavaScriptThreads();
+ int waitCount = 0;
+ while (jsThreads.size() > 0 && waitCount < 10) {
+ try {
+ waitCount++;
+ Thread.sleep(100);
+ }
+ catch (final InterruptedException e) {
+ // ignore
+ }
+ jsThreads = getJavaScriptThreads();
+ }
+ assertEquals("There are still " + jsThreads.size()
+ + " JS threads running after the test", 0, jsThreads.size());
}

if (useRealBrowser()) {
@@ -1118,9 +1167,12 @@
* @see #toHtmlElement(WebElement)
*/
protected WebWindow getWebWindowOf(final HtmlUnitDriver driver) throws Exception {
- final Field field = HtmlUnitDriver.class.getDeclaredField("currentWindow");
+ final Field getDriver = HtmlUnitDriver.class.getDeclaredField("driver");
+ getDriver.setAccessible(true);
+ final HtmlUnitLocalDriver localDriver = (HtmlUnitLocalDriver) getDriver.get(driver);
+ final Field field = localDriver.getClass().getDeclaredField("currentWindow");
field.setAccessible(true);
- return (WebWindow) field.get(driver);
+ return (WebWindow) field.get(localDriver);
}

/**

Modified: branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebTestCase.java
===================================================================
--- branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebTestCase.java 2017-03-18 14:04:02 UTC (rev 13821)
+++ branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebTestCase.java 2017-03-18 14:25:46 UTC (rev 13822)
@@ -14,6 +14,7 @@
*/
package com.gargoylesoftware.htmlunit;

+import static org.junit.Assume.*;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -42,6 +43,7 @@
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
@@ -637,6 +639,11 @@
Locale.setDefault(SAVE_LOCALE);
}

+ @Before
+ public void before() {
+ assumeTrue(this instanceof WebDriverTestCase);
+ }
+
/**
* Generates an HTML file that can be loaded and understood as a test.
* @throws IOException in case of problem
@@ -767,7 +774,7 @@
* Gets the active JavaScript threads.
* @return the threads
*/
- protected List<Thread> getJavaScriptThreads() {
+ protected static List<Thread> getJavaScriptThreads() {
final Thread[] threads = new Thread[Thread.activeCount() + 10];
Thread.enumerate(threads);
final List<Thread> jsThreads = new ArrayList<>();

Modified: branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImage2Test.java
===================================================================
--- branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImage2Test.java 2017-03-18 14:04:02 UTC (rev 13821)
+++ branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlImage2Test.java 2017-03-18 14:25:46 UTC (rev 13822)
@@ -105,7 +105,7 @@

final WebDriver webDriver = getWebDriver();
if (webDriver instanceof HtmlUnitDriver) {
- ((HtmlUnitDriver) webDriver).setDownloadImages(true);
+// ((HtmlUnitDriver) webDriver).setDownloadImages(true);
}
loadPage2(html);
assertEquals(Integer.parseInt(getExpectedAlerts()[0]), getMockWebConnection().getRequestCount());

Modified: branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElementTest.java
===================================================================
--- branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElementTest.java 2017-03-18 14:04:02 UTC (rev 13821)
+++ branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLImageElementTest.java 2017-03-18 14:25:46 UTC (rev 13822)
@@ -619,7 +619,7 @@
+ "</body></html>";
final WebDriver driver = getWebDriver();
if (driver instanceof HtmlUnitDriver) {
- ((HtmlUnitDriver) driver).setDownloadImages(true);
+// ((HtmlUnitDriver) driver).setDownloadImages(true);
}

loadPageWithAlerts2(html);

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
HtmlUnit-develop mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/htmlunit-develop