#593: correct UT

bhecquet · Mar 13, 2024 · 04d7b19 · 04d7b19
1 parent 515a5d5
commit 04d7b19
Show file tree

Hide file tree

Showing 6 changed files with 414 additions and 313 deletions.
diff --git a/core/src/main/java/com/seleniumtests/core/aspects/LogAction.java b/core/src/main/java/com/seleniumtests/core/aspects/LogAction.java
@@ -330,10 +330,14 @@ public static String buildArgString(JoinPoint joinPoint, List<String> stringToRe
 				// add arguments to the name of the method
 				if (arg instanceof Object[]) {
 					argValue.append("[");
-					for (Object obj: (Object[])arg) {
+					for (Object obj : (Object[]) arg) {
 						argValue.append(obj.toString() + ",");
 					}
 					argValue.append("]");
+				} else if (arg instanceof Element) {
+					argValue.append(((Element) arg).toString());
+				} else if (arg instanceof WebElement) {
+					argValue.append(new SeleniumElement((WebElement)arg).getName());
 				} else {
 					argValue.append((arg == null ? "null": arg.toString()));
 				}
@@ -653,8 +657,8 @@ public void logCompositeAction(JoinPoint joinPoint)  {
 			targetClass = targetElement.getOriginClass();
 		// for Selenium WebElement
 		} else if (joinPoint.getArgs().length > 0 && (joinPoint.getArgs()[0] instanceof WebElement)) {
-			targetElement = new SeleniumElement((WebElement)joinPoint.getTarget());
-			targetClass = ((PageObject)joinPoint.getTarget()).getClass();
+			targetElement = new SeleniumElement((WebElement)joinPoint.getArgs()[0]);
+			targetClass = ((PageObject)joinPoint.getThis()).getClass();
 		}
 
 		TestAction currentAction = new TestAction(actionName, false, pwdToReplace, joinPoint.getSignature().getName(), targetElement, targetClass);
@@ -695,6 +699,22 @@ public Object logPerformCompositeAction(ProceedingJoinPoint joinPoint) throws Th
 		} finally {
 			if (compositeActionStep != null) {
 				compositeActionStep.setFailed(actionFailed);
+
+				// change the name of composite action
+				StringBuilder name = new StringBuilder(TestStep.COMPOSITE_STEP_PREFIX);
+				Element mainElement = null; // the last element on which we act
+
+				for (TestAction action: compositeActionStep.getStepActions()) {
+					name.append(action.getAction() + ",");
+					if (action.getElement() != null) {
+						mainElement = action.getElement();
+					}
+					action.setFailed(actionFailed);
+				}
+				String elementName = mainElement instanceof SeleniumElement ? mainElement.getName(): mainElement.toString();
+				name.append("on element '" + elementName + "'");
+				compositeActionStep.setName(name.toString());
+
 				scenarioLogger.logActionError(currentException);
 				TestStepManager.setParentTestStep((TestStep)compositeActionStep.getParent());
 			}

diff --git a/core/src/main/java/com/seleniumtests/reporter/logger/TestAction.java b/core/src/main/java/com/seleniumtests/reporter/logger/TestAction.java
@@ -45,7 +45,7 @@ public class TestAction {
 
 
 	protected static final Logger logger = SeleniumRobotLogger.getLogger(TestAction.class);
-	
+
 	protected String name;
 	protected TestAction parent = null;
 	protected int position = 0;
@@ -136,6 +136,10 @@ public String getName() {
 		return newName;
 	}
 
+	public void setName(String name) {
+		this.name = name;
+	}
+
 	public LocalDateTime getTimestamp() {
 		return timestamp;
 	}

diff --git a/core/src/main/java/com/seleniumtests/uipage/htmlelements/SeleniumElement.java b/core/src/main/java/com/seleniumtests/uipage/htmlelements/SeleniumElement.java
@@ -48,14 +48,19 @@ private String getElementLocator(WebElement el) {
 
         if (el.toString().contains("->")) {
             try {
-                return el.toString().split("->")[1].replace("]", "").replace("}", "");
+                return el.toString().split("->")[1].replace("]", "").replace("}", "").trim();
             } catch (IndexOutOfBoundsException e) {
                 // we should never go here
             }
         }
         return  el.toString();
     }
 
+    @Override
+    public String toString() {
+        return webElement.toString();
+    }
+
     @Override
     protected void findElement(boolean waitForVisibility) {