Skip to content

Commit ac4f921

Browse files
pnatashappnatashap
committed
Merge branch 'master' into angular_rework_development
# Conflicts: # jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/common/InputTests.java
2 parents 944b23b + 680dbe2 commit ac4f921

File tree

121 files changed

+719
-522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+719
-522
lines changed

‎config/checkstyle/checkstyle.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@
288288
<property name="id" value="FileLength_Error" />
289289
</module>
290290
<module name="LineLength">
291-
<property name="severity" value="error" />
291+
<property name="severity" value="warning" />
292292
<property name="max" value="180" />
293293
</module>
294294
<module name="RegexpHeader">
@@ -335,7 +335,7 @@
335335
</module>
336336
<module name="RegexpSingleline">
337337
<property name="severity" value="error" />
338-
<property name="format" value="(?&lt;!\.)(css|hasClass|hasAttribute|attr|find|finds)\(" />
338+
<property name="format" value="(?&lt;!\.)(css|hasClass|hasAttribute|attr|find|finds)\((?!@|\)|String)" />
339339
<property name="message" value="core() should be used with these methods" />
340340
<property name="id" value="CoreMethodsUnused_Error" />
341341
</module>

‎jdi-bdd-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<profile>
2727
<id>jdk16</id>
2828
<activation>
29-
<jdk>[16, 20]</jdk>
29+
<jdk>[16,)</jdk>
3030
</activation>
3131
<properties>
3232
<aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED</aspectj.args>

‎jdi-bdd-tests/src/main/java/io/github/com/pages/HtmlElementsPage.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ public class HtmlElementsPage extends WebPage {
8888
//endregion
8989

9090
//region Complex Elements
91-
// TODO add Enum
9291

9392
public static DropdownSelect dressCode;
9493
@UI("#dress-code") public static Dropdown dressCode2;

‎jdi-bdd-tests/src/test/resources/features/WebPage.feature‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ Feature: Checking Basic WebPage Actions
2828
When I scroll "10" px right
2929
And I scroll "5" px left
3030
Then the page scrolled by "5" px right
31-
# TODO
32-
#Scenario: zoom test
33-
# When I zoom in "2" times
34-
# Then the page is zoomed "2" times
3531

3632
Scenario: go back test
3733
When I go back

‎jdi-eyes-demo/src/test/java/com/jdi/testng/TestNGListener.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
* Email: [email protected]; Skype: roman.iovlev
66
*/
77

8-
import com.jdiai.tools.Safe;
98
import org.testng.IInvokedMethod;
109
import org.testng.IInvokedMethodListener;
1110
import org.testng.ITestNGMethod;
@@ -22,7 +21,7 @@
2221
import static java.lang.System.currentTimeMillis;
2322

2423
public class TestNGListener implements IInvokedMethodListener {
25-
private Safe<Long> start = new Safe<>(0L);
24+
private Long start = currentTimeMillis();
2625

2726
@Override
2827
public void beforeInvocation(IInvokedMethod m, ITestResult tr) {
@@ -31,7 +30,7 @@ public void beforeInvocation(IInvokedMethod m, ITestResult tr) {
3130
if (testMethod.getConstructorOrMethod().getMethod().isAnnotationPresent(Test.class)) {
3231
TEST_NAME.set( last(testMethod.getTestClass().getName().split("\\.")) +
3332
"." + testMethod.getMethodName());
34-
start.set(currentTimeMillis());
33+
start = currentTimeMillis();
3534
logger.step("== Test '%s' START ==", TEST_NAME.get());
3635
}
3736
}
@@ -43,7 +42,7 @@ public void afterInvocation(IInvokedMethod method, ITestResult tr) {
4342
String result = getTestResult(tr);
4443
logger.step("=== Test '%s' %s [%s] ===", TEST_NAME.get(), result,
4544
new SimpleDateFormat("mm:ss.SS")
46-
.format(new Date(currentTimeMillis() - start.get())));
45+
.format(new Date(currentTimeMillis() - start)));
4746
if ("FAILED".equals(result)) {
4847
try {
4948
screenshotStep("On Fail Screenshot");

‎jdi-light-angular-tests-with-mocks/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<profile>
2626
<id>jdk16</id>
2727
<activation>
28-
<jdk>[16, 20]</jdk>
28+
<jdk>[16,)</jdk>
2929
</activation>
3030
<properties>
3131
<aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>

‎jdi-light-angular-tests-with-mocks/src/test/java/io/github/epam/testng/TestNGListener.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.github.epam.testng;
22

3-
import com.jdiai.tools.Safe;
43
import org.testng.IInvokedMethod;
54
import org.testng.IInvokedMethodListener;
65
import org.testng.ITestResult;
@@ -17,7 +16,7 @@
1716

1817
public class TestNGListener implements IInvokedMethodListener {
1918

20-
private Safe<Long> start = new Safe<>(0L);
19+
private Long start = currentTimeMillis();
2120

2221
@Override
2322
public void beforeInvocation(IInvokedMethod m, ITestResult tr) {
@@ -26,7 +25,7 @@ public void beforeInvocation(IInvokedMethod m, ITestResult tr) {
2625
if (testMethod.isAnnotationPresent(Test.class)) {
2726
TEST_NAME.set(
2827
tr.getTestClass().getRealClass().getSimpleName() + "." + testMethod.getName());
29-
start.set(currentTimeMillis());
28+
start = currentTimeMillis();
3029
logger.step("== Test '%s' START ==", TEST_NAME.get());
3130
}
3231
}
@@ -38,7 +37,7 @@ public void afterInvocation(IInvokedMethod method, ITestResult r) {
3837
String result = getTestResult(r);
3938
logger.step("=== Test '%s' %s [%s] ===", TEST_NAME.get(), result,
4039
new SimpleDateFormat("mm:ss.SS")
41-
.format(new Date(currentTimeMillis() - start.get())));
40+
.format(new Date(currentTimeMillis() - start)));
4241
if ("FAILED".equals(result)) {
4342
try {
4443
screenshotStep("On Fail Screenshot");

‎jdi-light-angular-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<profile>
135135
<id>jdk16</id>
136136
<activation>
137-
<jdk>[16, 20]</jdk>
137+
<jdk>[16,)</jdk>
138138
</activation>
139139
<properties>
140140
<aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>

‎jdi-light-angular-tests/src/test/java/io/github/epam/testng/TestNGListener.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.github.epam.testng;
22

3-
import com.jdiai.tools.Safe;
43
import org.testng.IInvokedMethod;
54
import org.testng.IInvokedMethodListener;
65
import org.testng.ITestNGMethod;
@@ -17,7 +16,7 @@
1716
import static java.lang.System.currentTimeMillis;
1817

1918
public class TestNGListener implements IInvokedMethodListener {
20-
private Safe<Long> start = new Safe<>(0L);
19+
private Long start = currentTimeMillis();
2120

2221
@Override
2322
public void beforeInvocation(IInvokedMethod m, ITestResult tr) {
@@ -26,7 +25,7 @@ public void beforeInvocation(IInvokedMethod m, ITestResult tr) {
2625
if (testMethod.getConstructorOrMethod().getMethod().isAnnotationPresent(Test.class)) {
2726
TEST_NAME.set( last(testMethod.getTestClass().getName().split("\\.")) +
2827
"." + testMethod.getMethodName());
29-
start.set(currentTimeMillis());
28+
start = currentTimeMillis();
3029
logger.step("== Test '%s' START ==", TEST_NAME.get());
3130
}
3231
}
@@ -38,7 +37,7 @@ public void afterInvocation(IInvokedMethod method, ITestResult tr) {
3837
String result = getTestResult(tr);
3938
logger.step("=== Test '%s' %s [%s] ===", TEST_NAME.get(), result,
4039
new SimpleDateFormat("mm:ss.SS")
41-
.format(new Date(currentTimeMillis() - start.get())));
40+
.format(new Date(currentTimeMillis() - start)));
4241
if ("FAILED".equals(result)) {
4342
try {
4443
screenshotStep("On Fail Screenshot");

‎jdi-light-applitools-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<profile>
3131
<id>jdk16</id>
3232
<activation>
33-
<jdk>[16, 20]</jdk>
33+
<jdk>[16,)</jdk>
3434
</activation>
3535
<properties>
3636
<aspectj.args>--add-opens java.base/java.lang=ALL-UNNAMED</aspectj.args>

0 commit comments

Comments
 (0)