You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2017/06/11 20:40:59 UTC
archiva git commit: Trying to stabilize htmlunit tests
Repository: archiva
Updated Branches:
refs/heads/master 7abf55967 -> a674bda12
Trying to stabilize htmlunit tests
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/a674bda1
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/a674bda1
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/a674bda1
Branch: refs/heads/master
Commit: a674bda129314af2a601cdde7f28905e5f423c15
Parents: 7abf559
Author: Martin Stockhammer <ma...@apache.org>
Authored: Sun Jun 11 22:40:32 2017 +0200
Committer: Martin Stockhammer <ma...@apache.org>
Committed: Sun Jun 11 22:40:32 2017 +0200
----------------------------------------------------------------------
.../archiva/web/test/parent/AbstractArchivaTest.java | 6 +++---
.../archiva/web/test/parent/AbstractSeleniumTest.java | 10 ++++++++--
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/a674bda1/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractArchivaTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
index 44907ab..66696bc 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
@@ -116,11 +116,11 @@ public abstract class AbstractArchivaTest
el.click();
- wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("user-messages"),"User " + userName + " created." ));
- assertElementPresent( "users-grid-user-id-" + userName );
-
if ( valid )
{
+ wait.until(ExpectedConditions.textToBePresentInElementLocated(By.id("user-messages"),"User " + userName + " created." ));
+ wait.until(ExpectedConditions.visibilityOfElementLocated( By.id("users-grid-user-id-" + userName) ));
+
//String[] columnValues = { userName, fullName, emailAd };
//assertElementPresent( XPathExpressionUtil.getTableRow( columnValues ) );
http://git-wip-us.apache.org/repos/asf/archiva/blob/a674bda1/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
index b6741b1..4d51fa2 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
@@ -647,8 +647,14 @@ public abstract class AbstractSeleniumTest
} catch (Exception e) {
logger.info("Error: {}, {}, {}",count,e.getClass().getName(), e.getMessage());
if (el!=null) {
- Point elLoc = el.getLocation();
- logger.info("Location: x={} y={}", elLoc.getX(), elLoc.getY());
+ // Elements may be stale and throw an exception, if the location is requested
+ try
+ {
+ Point elLoc = el.getLocation();
+ logger.info( "Location: x={} y={}", elLoc.getX(), elLoc.getY() );
+ } catch (Throwable e2) {
+ logger.info("Could not determine location");
+ }
}
ex = e;
count--;