Skip to content

Commit 62b096f

Browse files
author
Tomasz Napieralski
committed
XW-655 | add @execute annotation to classes
1 parent 0f9a73c commit 62b096f

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

src/test/java/com/wikia/webdriver/common/core/annotations/Execute.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* This annotation serves as a holder to test general parameters
1010
*/
1111
@Retention(value = RetentionPolicy.RUNTIME)
12-
@Target(value = {ElementType.METHOD})
12+
@Target(value = {ElementType.METHOD, ElementType.TYPE})
1313
public @interface Execute {
1414

1515
User asUser() default User.ANONYMOUS;

src/test/java/com/wikia/webdriver/common/templates/NewTestTemplate.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,22 @@ private boolean isTestExcludedFromEnv(Method method){
4343
@BeforeMethod(alwaysRun = true)
4444
public void start(Method method, Object[] data) {
4545
Configuration.clearCustomTestProperties();
46+
Class<?> methodClass = method.getDeclaringClass();
47+
48+
if (methodClass.isAnnotationPresent(Execute.class)) {
49+
setTestProperty("wikiName", methodClass.getAnnotation(Execute.class).onWikia());
50+
setTestProperty("disableFlash", methodClass.getAnnotation(Execute.class).disableFlash());
51+
setTestProperty("browser", methodClass.getAnnotation(Execute.class).browser());
52+
setTestProperty("browserSize", methodClass.getAnnotation(Execute.class).browserSize());
53+
}
54+
4655
if (method.isAnnotationPresent(Execute.class)) {
4756
setTestProperty("wikiName", method.getAnnotation(Execute.class).onWikia());
4857
setTestProperty("disableFlash", method.getAnnotation(Execute.class).disableFlash());
4958
setTestProperty("browser", method.getAnnotation(Execute.class).browser());
5059
setTestProperty("browserSize", method.getAnnotation(Execute.class).browserSize());
5160
}
61+
5262
prepareURLs();
5363

5464
if(isTestExcludedFromEnv(method)){

0 commit comments

Comments
 (0)