Merge branch 'develop'

toolisticon · Jan 22, 2025 · 7079f70 · 7079f70
2 parents 0954e01 + 55268be
commit 7079f70
Show file tree

Hide file tree

Showing 31 changed files with 328 additions and 51 deletions.
diff --git a/pogen4selenium-api/pom.xml b/pogen4selenium-api/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.pogen4selenium</groupId>
         <artifactId>pogen4selenium</artifactId>
-        <version>0.7.1</version>
+        <version>0.8.0</version>
     </parent>
 
     <name>pogen4selenium-api</name>

diff --git a/pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/api/Action.java b/pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/api/Action.java
@@ -27,5 +27,5 @@
 	 */
 	Class<? extends ActionImpl> value();
 
-
+	String[] attributeNameToConstructorMapping () default {};
 }
diff --git a/pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/api/ActionFileUpload.java b/pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/api/ActionFileUpload.java
@@ -0,0 +1,5 @@
+package io.toolisticon.pogen4selenium.api;
+
+public @interface ActionFileUpload {
+
+}
diff --git a/pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/CommonByLocators.java b/pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/CommonByLocators.java
@@ -1,12 +1,15 @@
 package io.toolisticon.pogen4selenium.runtime;
 
 import org.openqa.selenium.By;
+import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebElement;
 
 /**
  * These are the locators which should be used by actions, that are both available in {@link DataObjectParentImpl} and {@link PageObjectParentImpl}.
  */
 public interface CommonByLocators {
+
+	SearchContext getSearchContext();
 
 	 WebElement waitForElementToBeInteractable(By by);
 

diff --git a/...elenium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/DataObjectParentImpl.java b/...elenium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/DataObjectParentImpl.java
@@ -5,6 +5,7 @@
 import org.openqa.selenium.By;
 import org.openqa.selenium.ElementNotInteractableException;
 import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
@@ -110,6 +111,13 @@ public WebElement waitForElementToBePresent(By by) {
 
 	}
 
+
+
+	@Override
+	public SearchContext getSearchContext() {
+		return this.relativeParentWebElement;
+	}
+
 	public void pause(Duration duration) {
 		new Actions(driver).pause(duration).perform();
 	}

diff --git a/...elenium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/PageObjectParentImpl.java b/...elenium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/PageObjectParentImpl.java
@@ -9,6 +9,7 @@
 import org.openqa.selenium.ElementNotInteractableException;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
@@ -155,6 +156,10 @@ public WebElement waitForElementToBePresent(ExpectedCondition<WebElement> expect
 	}
 
 
+	@Override
+	public SearchContext getSearchContext() {
+		return this.driver;
+	}
 
 
 

diff --git a/...nium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/actions/ActionClickImpl.java b/...nium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/actions/ActionClickImpl.java
@@ -4,16 +4,16 @@
 import java.util.Collection;
 
 import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.ui.ExpectedConditions;
 
 import io.toolisticon.pogen4selenium.runtime.LocatorCondition;
 
 public class ActionClickImpl extends BaseAction {
 
-	public ActionClickImpl(WebDriver driver, LocatorCondition sideCondition) {
-		super(driver, sideCondition);
+	public ActionClickImpl(WebDriver driver, SearchContext searchContext, LocatorCondition sideCondition) {
+		super(driver, searchContext, sideCondition);
 
 	}
 

diff --git a/...src/main/java/io/toolisticon/pogen4selenium/runtime/actions/ActionMoveToAndClickImpl.java b/...src/main/java/io/toolisticon/pogen4selenium/runtime/actions/ActionMoveToAndClickImpl.java
@@ -4,6 +4,7 @@
 import java.util.Collection;
 
 import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
@@ -13,8 +14,8 @@
 public class ActionMoveToAndClickImpl extends BaseAction {
 
 
-	public ActionMoveToAndClickImpl(WebDriver driver, LocatorCondition sideCondition) {
-		super(driver, sideCondition);
+	public ActionMoveToAndClickImpl(WebDriver driver, SearchContext searchContext, LocatorCondition sideCondition) {
+		super(driver, searchContext, sideCondition);
 	}
 
 	@Override

diff --git a/...nium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/actions/ActionWriteImpl.java b/...nium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/actions/ActionWriteImpl.java
@@ -5,6 +5,7 @@
 
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
@@ -15,8 +16,8 @@ public class ActionWriteImpl extends BaseAction {
 
 	private final String toSet;
 
-	public ActionWriteImpl(WebDriver driver, LocatorCondition sideCondition, String toSet) {
-		super(driver, sideCondition);
+	public ActionWriteImpl(WebDriver driver, SearchContext searchContext, LocatorCondition sideCondition, String toSet) {
+		super(driver, searchContext, sideCondition);
 
 		this.toSet = toSet;
 	}

diff --git a/...4selenium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/actions/BaseAction.java b/...4selenium-api/src/main/java/io/toolisticon/pogen4selenium/runtime/actions/BaseAction.java
@@ -2,12 +2,12 @@
 
 import java.time.Duration;
 import java.util.Collection;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.StaleElementReferenceException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -22,10 +22,12 @@ public abstract class BaseAction  implements LocatorCondition, ActionImpl{
 
 
 	protected final WebDriver driver;
+	protected final SearchContext searchContext;
 	private final LocatorCondition sideCondition;
 
-	protected BaseAction(WebDriver driver, LocatorCondition sideCondition) {
+	protected BaseAction(WebDriver driver, SearchContext searchContext, LocatorCondition sideCondition) {
 		this.driver = driver;
+		this.searchContext = searchContext;
 		this.sideCondition = sideCondition;
 	}
 
@@ -57,7 +59,7 @@ public void executeAction(By locator) {
     	            .withMessage("Locator '" + locator.toString() + "'  based action '" + this.getClass().getCanonicalName() + "' with side condition '" + this.sideCondition.getClass().getCanonicalName() + "'")
     	            .ignoreAll(getExceptionsToIgnore());
 
-    	applyAction(wait.until(new WithLocatorCondition(locator)));
+    	applyAction(wait.until(new WithLocatorCondition(this.searchContext, locator)));
 
 	}
 
@@ -73,7 +75,7 @@ class OnElementCondition implements ExpectedCondition<WebElement> {
 		private OnElementCondition(
 				WebElement webElement) {
 
-			this.webElement = webElement;
+				this.webElement = webElement;
 
 		}
 
@@ -90,10 +92,12 @@ public WebElement apply(WebDriver input) {
 
 	class WithLocatorCondition implements ExpectedCondition<WebElement> {
 
+		private final SearchContext searchContext;
 		private final By locator;
 
-		private WithLocatorCondition(By locator) {
+		private WithLocatorCondition(SearchContext searchContext, By locator) {
 
+			this.searchContext = searchContext;
 			this.locator = locator;
 
 		}
@@ -103,7 +107,7 @@ public WebElement apply(WebDriver input) {
 
 			try {
 
-				WebElement element = input.findElement(locator);
+				WebElement element = searchContext.findElement(locator);
 				return new OnElementCondition(element).apply(input);
 
 			} catch (NoSuchElementException | StaleElementReferenceException e) {

diff --git a/pogen4selenium-example/pom.xml b/pogen4selenium-example/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.pogen4selenium</groupId>
         <artifactId>pogen4selenium</artifactId>
-        <version>0.7.1</version>
+        <version>0.8.0</version>
     </parent>
 
     <name>pogen4selenium-example</name>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>io.toolisticon.pogen4selenium</groupId>
             <artifactId>pogen4selenium-api</artifactId>
-            <version>0.7.1</version>
+            <version>0.8.0</version>
         </dependency>
 
         <dependency>

diff --git a/.../src/main/java/io/toolisticon/pogen4selenium/example/withoutpagefactory/ExternalPage.java b/.../src/main/java/io/toolisticon/pogen4selenium/example/withoutpagefactory/ExternalPage.java
@@ -0,0 +1,9 @@
+package io.toolisticon.pogen4selenium.example.withoutpagefactory;
+
+import io.toolisticon.pogen4selenium.api.PageObject;
+import io.toolisticon.pogen4selenium.api.PageObjectParent;
+
+@PageObject
+public interface ExternalPage extends PageObjectParent<ExternalPage>{
+
+}
diff --git a/...ain/java/io/toolisticon/pogen4selenium/example/withoutpagefactory/TestPageTableEntry.java b/...ain/java/io/toolisticon/pogen4selenium/example/withoutpagefactory/TestPageTableEntry.java
@@ -1,6 +1,8 @@
 package io.toolisticon.pogen4selenium.example.withoutpagefactory;
 
 import io.toolisticon.pogen4selenium.api._By;
+import io.toolisticon.pogen4selenium.api.ActionMoveToAndClick;
+import io.toolisticon.pogen4selenium.api.ActionWrite;
 import io.toolisticon.pogen4selenium.api.DataObject;
 import io.toolisticon.pogen4selenium.api.ExtractDataValue;
 import io.toolisticon.pogen4selenium.api.ExtractDataValue.Kind;
@@ -17,7 +19,16 @@ public interface TestPageTableEntry {
 	@ExtractDataValue(by = _By.XPATH, value = "./td[3]/a",  kind = Kind.ATTRIBUTE, name = "href")
 	String link();
 
+	@ActionMoveToAndClick(by = _By.XPATH, value = "./td[3]/a")
+	ExternalPage clickLink();
+
 	@ExtractDataValue(by = _By.XPATH, value = "./td[3]/a", kind = Kind.TEXT)
 	String linkText();
 
+	@ExtractDataValue(by = _By.XPATH, value = "./td[4]/input[@name='inputField']", kind = Kind.ATTRIBUTE, name = "value")
+	String inputField();
+
+	TestPageTableEntry writeToInputField(@ActionWrite(by = _By.XPATH, value = "./td[4]/input[@name='inputField']") String text);
+
+
 }
diff --git a/...ple/src/main/java/io/toolisticon/pogen4selenium/example/withpagefactory/ExternalPage.java b/...ple/src/main/java/io/toolisticon/pogen4selenium/example/withpagefactory/ExternalPage.java
@@ -0,0 +1,9 @@
+package io.toolisticon.pogen4selenium.example.withpagefactory;
+
+import io.toolisticon.pogen4selenium.api.PageObject;
+import io.toolisticon.pogen4selenium.api.PageObjectParent;
+
+@PageObject
+public interface ExternalPage extends PageObjectParent<ExternalPage>{
+
+}
diff --git a/...c/main/java/io/toolisticon/pogen4selenium/example/withpagefactory/TestPageTableEntry.java b/...c/main/java/io/toolisticon/pogen4selenium/example/withpagefactory/TestPageTableEntry.java
@@ -1,6 +1,8 @@
 package io.toolisticon.pogen4selenium.example.withpagefactory;
 
 import io.toolisticon.pogen4selenium.api._By;
+import io.toolisticon.pogen4selenium.api.ActionMoveToAndClick;
+import io.toolisticon.pogen4selenium.api.ActionWrite;
 import io.toolisticon.pogen4selenium.api.DataObject;
 import io.toolisticon.pogen4selenium.api.ExtractDataValue;
 import io.toolisticon.pogen4selenium.api.ExtractDataValue.Kind;
@@ -17,7 +19,16 @@ public interface TestPageTableEntry {
 	@ExtractDataValue(by = _By.XPATH, value = "./td[3]/a",  kind = Kind.ATTRIBUTE, name = "href")
 	String link();
 
+	@ActionMoveToAndClick(by = _By.XPATH, value = "./td[3]/a")
+	ExternalPage clickLink();
+
 	@ExtractDataValue(by = _By.XPATH, value = "./td[3]/a", kind = Kind.TEXT)
 	String linkText();
 
+	@ExtractDataValue(by = _By.XPATH, value = "./td[4]/input", kind = Kind.ATTRIBUTE, name = "value")
+	String inputField();
+
+	TestPageTableEntry writeToInputField(@ActionWrite(by = _By.XPATH, value = "./td[4]/input") String text);
+
+
 }
diff --git a/pogen4selenium-example/src/test/java/io/toolisticon/pogen4selenium/example/JettyServer.java b/pogen4selenium-example/src/test/java/io/toolisticon/pogen4selenium/example/JettyServer.java
@@ -26,6 +26,9 @@ public void start() throws Exception {
         server.setHandler(servletHandler);
 
         servletHandler.addServletWithMapping(TestPage.class, "/start");
+        servletHandler.addServletWithMapping(LinkedPageA.class, "/linkA");
+        servletHandler.addServletWithMapping(LinkedPageB.class, "/linkB");
+
 
         server.start();
     }
@@ -63,6 +66,72 @@ protected void doGet(
 
 	}
 
+     public static class LinkedPageA extends HttpServlet {
+
+ 		private static final long serialVersionUID = 547644172712833066L;
+
+ 		final String content;
+
+      	public LinkedPageA (){
+      		String tmpContent = null;
+      		try {
+      			tmpContent = new String(getClass().getResourceAsStream("/LinkedPageA.html").readAllBytes());
+      		} catch (IOException e) {
+      			e.printStackTrace();
+      			tmpContent = e.toString();
+      		}
+      		content = tmpContent;
+      	}
+
+
+
+ 	    protected void doGet(
+ 	      HttpServletRequest request, 
+ 	      HttpServletResponse response)
+ 	      throws ServletException, IOException {
+
+ 	        response.setContentType("text/html");
+ 	        response.setStatus(HttpServletResponse.SC_OK);
+ 	        response.getWriter().println(content);
+ 	    }
+
+
+
+ 	}
+
+     public static class LinkedPageB extends HttpServlet {
+
+  		private static final long serialVersionUID = 547644172712833066L;
+
+  		final String content;
+
+       	public LinkedPageB (){
+       		String tmpContent = null;
+       		try {
+       			tmpContent = new String(getClass().getResourceAsStream("/LinkedPageB.html").readAllBytes());
+       		} catch (IOException e) {
+       			e.printStackTrace();
+       			tmpContent = e.toString();
+       		}
+       		content = tmpContent;
+       	}
+
+
+
+  	    protected void doGet(
+  	      HttpServletRequest request, 
+  	      HttpServletResponse response)
+  	      throws ServletException, IOException {
+
+  	        response.setContentType("text/html");
+  	        response.setStatus(HttpServletResponse.SC_OK);
+  	        response.getWriter().println(content);
+  	    }
+
+
+
+  	}
+
     public void stop() throws Exception {
     	server.stop();
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,5 +27,5 @@ @@
     	 */
     	Class<? extends ActionImpl> value();
+    	String[] attributeNameToConstructorMapping () default {};
     }