Merge branch 'develop'

Author: tobiasstamann

pogen4selenium-api/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.pogen4selenium</groupId>
         <artifactId>pogen4selenium</artifactId>
-        <version>0.11.0</version>
+        <version>0.12.0</version>
     </parent>
 
     <name>pogen4selenium-api</name>

pogen4selenium-api/src/main/java/io/toolisticon/pogen4selenium/api/Synchronized.java

@@ -0,0 +1,21 @@
+/**
+ * 
+ */
+package io.toolisticon.pogen4selenium.api;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+@Documented
+@Retention(RUNTIME)
+@Target(METHOD)
+/**
+ * This annotation is used to enforce page objects method to be synchronized
+ */
+public @interface Synchronized {
+
+}

pogen4selenium-example/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.pogen4selenium</groupId>
         <artifactId>pogen4selenium</artifactId>
-        <version>0.11.0</version>
+        <version>0.12.0</version>
     </parent>
 
     <name>pogen4selenium-example</name>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>io.toolisticon.pogen4selenium</groupId>
             <artifactId>pogen4selenium-api</artifactId>
-            <version>0.11.0</version>
+            <version>0.12.0</version>
         </dependency>
 
         <dependency>

pogen4selenium-processor/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>pogen4selenium</artifactId>
     <groupId>io.toolisticon.pogen4selenium</groupId>
-    <version>0.10.1-SNAPSHOT</version>
+    <version>0.11.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>pogen4selenium-processor</artifactId>

pogen4selenium-processor/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.toolisticon.pogen4selenium</groupId>
         <artifactId>pogen4selenium</artifactId>
-        <version>0.11.0</version>
+        <version>0.12.0</version>
     </parent>
 
     <name>pogen4selenium-processor</name>

pogen4selenium-processor/src/main/java/io/toolisticon/pogen4selenium/processor/common/MethodsToImplementHelper.java

@@ -16,6 +16,7 @@
 import io.toolisticon.aptk.tools.wrapper.TypeElementWrapper;
 import io.toolisticon.pogen4selenium.api.DataObject;
 import io.toolisticon.pogen4selenium.api.PageObject;
+import io.toolisticon.pogen4selenium.api.Synchronized;
 import io.toolisticon.pogen4selenium.processor.common.actions.ActionHelper;
 import io.toolisticon.pogen4selenium.processor.common.actions.LocateActionHandler;
 import io.toolisticon.pogen4selenium.processor.pageobject.ExtractDataValueWrapper;
@@ -38,6 +39,10 @@ public boolean returnsPageObject() {
 		return returnTypeElement.isPresent() && returnTypeElement.get().hasAnnotation(PageObject.class);
 	}
 
+	public boolean isSynchronized() {
+		return executableElementWrapper.hasAnnotation(Synchronized.class);
+	}
+	
 	public String getMethodSignature() {
 		return this.executableElementWrapper.getMethodSignature();
 	}

pogen4selenium-processor/src/main/resources/DataToExtract.tpl

@@ -38,7 +38,7 @@ public class ${ toImplementHelper.implementationClassName }  extends DataObjectP
 
 !{for method : methodsToImplement}
 	@Override
-	public ${method.methodSignature}{
+	public !{if method.isSynchronized}synchronized!{/if} ${method.methodSignature}{
 	
 		pause(Duration.ofMillis(${method.beforePause}L));
 

pogen4selenium-processor/src/main/resources/PageObject.tpl

@@ -52,7 +52,7 @@ public class ${ toImplementHelper.implementationClassName } ${toImplementHelper.
 	// implement methods
 !{for method : methodsToImplement}
 	@Override
-	public ${method.methodSignature}{
+	public !{if method.isSynchronized}synchronized!{/if} ${method.methodSignature}{
 	
 		pause(Duration.ofMillis(${method.beforePause}L));
 

pogen4selenium-processor/src/test/java/io/toolisticon/pogen4selenium/processor/pageobject/PageObjectProcessorTest.java

@@ -9,6 +9,7 @@
 import io.toolisticon.aptk.tools.MessagerUtils;
 import io.toolisticon.cute.Cute;
 import io.toolisticon.cute.CuteApi;
+import io.toolisticon.cute.matchers.CoreGeneratedFileObjectMatchers;
 import io.toolisticon.pogen4selenium.processor.datatoextract.DataObjectProcessor;
 import io.toolisticon.pogen4selenium.processor.pageobject.PageObjectProcessor;
 
@@ -94,6 +95,19 @@ public void test_valid_withLocatorInActions() {
                 .executeTest();
     }
 
+    @Test
+    public void test_valid_withSynchronizedAction() {
+
+        compileTestBuilder
+                .andSourceFiles("testcases/pageobject/synchronized/TestcaseValidUsage.java")
+                .whenCompiled()
+                .thenExpectThat()
+                .compilationSucceeds()
+                .andThat().generatedSourceFile("io.toolisticon.pogen4selenium.processor.tests.LoginPageImpl")
+                .matches(CoreGeneratedFileObjectMatchers.createContainsSubstringsMatcher("synchronized"))
+                .executeTest();
+    }
+    
     @Test
     public void test_valid_example() {
 

pogen4selenium-processor/src/test/resources/testcases/pageobject/synchronized/TestcaseValidUsage.java

@@ -0,0 +1,26 @@
+package io.toolisticon.pogen4selenium.processor.tests;
+
+import io.toolisticon.cute.PassIn;
+import io.toolisticon.pogen4selenium.api.ActionClick;
+import io.toolisticon.pogen4selenium.api.ActionWrite;
+import io.toolisticon.pogen4selenium.api._By;
+import io.toolisticon.pogen4selenium.api.ExtractDataValue;
+import io.toolisticon.pogen4selenium.api.PageObject;
+import io.toolisticon.pogen4selenium.api.PageObjectElement;
+import io.toolisticon.pogen4selenium.api.PageObjectParent;
+import io.toolisticon.pogen4selenium.api.Synchronized;
+
+
+public class TestcaseValidUsage {
+	
+	@PageObject	
+	public interface LoginPage extends PageObjectParent<LoginPage>{ 
+		
+		
+		@ActionClick(by = _By.XPATH, value = "//button[@type='submit']")
+		@Synchronized
+		LoginPage clickSubmitButton();
+		
+	}
+	
+}