Skip to content

Commit ef26ef4

Browse files
committed
misc updates
1 parent af19b3d commit ef26ef4

31 files changed

+443
-249
lines changed

build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ dependencies {
2929

3030
testImplementation platform('org.junit:junit-bom:5.9.1')
3131
testImplementation 'org.junit.jupiter:junit-jupiter'
32+
testImplementation 'io.github.artsok:rerunner-jupiter:2.1.6'
3233
testImplementation 'org.slf4j:slf4j-simple:2.0.6'
3334
}
3435

@@ -40,3 +41,8 @@ test {
4041
includeTags group
4142
}
4243
}
44+
45+
tasks.register('playwright', JavaExec) {
46+
classpath = sourceSets.main.runtimeClasspath
47+
mainClass = 'com.microsoft.playwright.CLI'
48+
}

src/main/java/io/github/tahanima/config/Configuration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @author tahanima
99
*/
1010
@LoadPolicy(Config.LoadType.MERGE)
11-
@Sources({"system:properties", "classpath:general.properties", "classpath:allure.properties"})
11+
@Sources({"system:properties", "classpath:config.properties", "classpath:allure.properties"})
1212
public interface Configuration extends Config {
1313

1414
String browser();

src/main/java/io/github/tahanima/data/BaseTestData.java renamed to src/main/java/io/github/tahanima/data/BaseData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111
@Getter
1212
@ToString
13-
public class BaseTestData {
13+
public class BaseData {
1414

1515
@Parsed(field = "Test Case ID", defaultNullRead = "")
1616
private String testCaseId;

src/main/java/io/github/tahanima/data/login/LoginTestData.java renamed to src/main/java/io/github/tahanima/data/LoginData.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
package io.github.tahanima.data.login;
1+
package io.github.tahanima.data;
22

33
import com.univocity.parsers.annotations.Parsed;
44

5-
import io.github.tahanima.data.BaseTestData;
6-
75
import lombok.Getter;
86
import lombok.ToString;
97

@@ -12,10 +10,10 @@
1210
*/
1311
@Getter
1412
@ToString(callSuper = true)
15-
public class LoginTestData extends BaseTestData {
13+
public class LoginData extends BaseData {
1614

17-
@Parsed(field = "User Name", defaultNullRead = "")
18-
private String userName;
15+
@Parsed(field = "Username", defaultNullRead = "")
16+
private String username;
1917

2018
@Parsed(field = "Password", defaultNullRead = "")
2119
private String password;
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package io.github.tahanima.data;
2+
3+
import com.univocity.parsers.annotations.Parsed;
4+
5+
import lombok.Getter;
6+
import lombok.ToString;
7+
8+
/**
9+
* @author tahanima
10+
*/
11+
@Getter
12+
@ToString(callSuper = true)
13+
public final class ProductsData extends BaseData {
14+
15+
@Parsed(field = "Username", defaultNullRead = "")
16+
private String username;
17+
18+
@Parsed(field = "Password", defaultNullRead = "")
19+
private String password;
20+
21+
@Parsed(field = "URL", defaultNullRead = "")
22+
private String url;
23+
}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package io.github.tahanima.factory;
2+
3+
import com.microsoft.playwright.Page;
4+
5+
import io.github.tahanima.ui.page.BasePage;
6+
7+
/**
8+
* @author tahanima
9+
*/
10+
public final class BasePageFactory {
11+
12+
private BasePageFactory() {}
13+
14+
public static <T extends BasePage> T createInstance(final Page page, final Class<T> clazz) {
15+
try {
16+
BasePage instance = clazz.getDeclaredConstructor().newInstance();
17+
18+
instance.setAndConfigurePage(page);
19+
instance.initComponents();
20+
21+
return clazz.cast(instance);
22+
} catch (Exception e) {
23+
e.printStackTrace();
24+
}
25+
26+
throw new NullPointerException("Page class instantiation failed.");
27+
}
28+
}

src/main/java/io/github/tahanima/util/BrowserFactory.java renamed to src/main/java/io/github/tahanima/factory/BrowserFactory.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.tahanima.util;
1+
package io.github.tahanima.factory;
22

33
import static io.github.tahanima.config.ConfigurationManager.config;
44

@@ -14,19 +14,19 @@ public enum BrowserFactory {
1414

1515
CHROMIUM {
1616
@Override
17-
public Browser createInstance(Playwright playwright) {
17+
public Browser createInstance(final Playwright playwright) {
1818
return playwright.chromium().launch(options());
1919
}
2020
},
2121
FIREFOX {
2222
@Override
23-
public Browser createInstance(Playwright playwright) {
23+
public Browser createInstance(final Playwright playwright) {
2424
return playwright.firefox().launch(options());
2525
}
2626
},
2727
WEBKIT {
2828
@Override
29-
public Browser createInstance(Playwright playwright) {
29+
public Browser createInstance(final Playwright playwright) {
3030
return playwright.webkit().launch(options());
3131
}
3232
};
@@ -37,5 +37,5 @@ public LaunchOptions options() {
3737
.setSlowMo(config().slowMotion());
3838
}
3939

40-
public abstract Browser createInstance(Playwright playwright);
40+
public abstract Browser createInstance(final Playwright playwright);
4141
}

src/main/java/io/github/tahanima/page/BasePage.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/main/java/io/github/tahanima/page/BasePageFactory.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/main/java/io/github/tahanima/page/product/ProductsPage.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)