Skip to content

Commit daa066e

Browse files
author
Konstantin Bulavin
committed
Merge branch 'angular_rework_development' into 4916_refactor_Chips_element
# Conflicts: # jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java # jdi-light-angular-tests/src/main/java/io/github/com/pages/AngularPage.java # jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/ChipsAssert.java # jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/AutoComplete.java # jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Chips.java
2 parents 589fd64 + 6564bcc commit daa066e

File tree

542 files changed

+5117
-4798
lines changed

Some content is hidden

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

542 files changed

+5117
-4798
lines changed

‎.0pdd.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
alerts:
2+
suppress:
3+
- on-found-puzzle
4+
- on-lost-puzzle
5+
- on-scope
6+
tags:
7+
- Refactoring

‎.github/workflows/debug.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ jobs:
3838
strategy:
3939
fail-fast: false
4040
matrix:
41-
java: [11, 13, 14, 15, 17, 18] # by default we use only 11. can be changed to any, the full list is [8, 9, 10, 11, 12, 13]
41+
java: [11, 15, 17, 18] # all [11, 12, 13, 14, 15, 16, 17, 18, 21]
4242

4343
steps:
44-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v4
4545
- name: Set up JDK ${{ matrix.java }}
46-
uses: actions/setup-java@v3
46+
uses: actions/setup-java@v4
4747
with:
4848
java-version: ${{ matrix.java }}
4949
java-package: jdk
@@ -121,7 +121,7 @@ jobs:
121121
122122
- name: 'Upload allure report'
123123
if: steps.jdi-compile.outcome == 'success'
124-
uses: actions/upload-artifact@v3
124+
uses: actions/upload-artifact@v4
125125
with:
126126
name: allure-report-jdk${{ matrix.java }}
127127
path: ./allure-report.zip

‎.github/workflows/main.yml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ jobs:
5050
strategy:
5151
fail-fast: false
5252
matrix:
53-
java: [11, 13, 14, 15, 17, 18] # all [11, 12, 13, 14, 15, 16, 17, 18]
53+
java: [11, 15, 17, 18] # all [11, 12, 13, 14, 15, 16, 17, 18, 21]
5454

5555
steps:
56-
- uses: actions/checkout@v3
56+
- uses: actions/checkout@v4
5757
- name: Set up JDK ${{ matrix.java }}
58-
uses: actions/setup-java@v3
58+
uses: actions/setup-java@v4
5959
with:
6060
java-version: ${{ matrix.java }}
6161
java-package: jdk
@@ -217,7 +217,7 @@ jobs:
217217
218218
- name: 'Upload allure report'
219219
if: steps.jdi-compile.outcome == 'success'
220-
uses: actions/upload-artifact@v3
220+
uses: actions/upload-artifact@v4
221221
with:
222222
name: allure-report-jdk${{ matrix.java }}
223223
path: ./allure-report.zip
@@ -228,22 +228,26 @@ jobs:
228228
run: |
229229
echo BDD tests result: ${{ steps.tests-bdd.outcome }}
230230
echo BDD Firefox tests result: ${{ steps.tests-bdd-firefox.outcome }}
231-
echo Bootstrap tests result: ${{ steps.tests-bootstrap.outcome }}
232231
echo HTML tests result: ${{ steps.tests-html-func.outcome }}
233232
echo Example tests result: ${{ steps.tests-examples.outcome }}
234233
echo Material ui tests result: ${{ steps.tests-material-ui.outcome }}
235234
echo HTML Performance tests result: ${{ steps.tests-html-perf.outcome }}
236235
echo Performance tests result: ${{ steps.tests-perf.outcome }}
237236
echo Vuetify tests result: ${{ steps.tests-vuetify.outcome }}
238237
239-
- name: Check BDD and Bootstap are passed
240-
if: ${{ steps.tests-bdd.outcome != 'success' || steps.tests-bdd-firefox.outcome != 'success' || steps.tests-bootstrap.outcome != 'success' }}
238+
- name: Check BDD are passed
239+
if: ${{ steps.tests-bdd.outcome != 'success' || steps.tests-bdd-firefox.outcome != 'success' }}
241240
run: |
242241
echo BDD tests result: ${{ steps.tests-bdd.outcome }}
243242
echo BDD Firefox tests result: ${{ steps.tests-bdd-firefox.outcome }}
244-
echo Bootstrap tests result: ${{ steps.tests-bootstrap.outcome }}
245243
exit 1
246244
245+
- name: Check Bootstrap are passed
246+
if: ${{ steps.tests-bootstrap.outcome != 'success' }}
247+
run: |
248+
echo bootstrap tests result: ${{ steps.tests-bootstrap.outcome }}
249+
exit 1
250+
247251
- name: Check html tests are passed
248252
if: ${{ steps.tests-html-func.outcome != 'success' || steps.tests-examples.outcome != 'success' }}
249253
run: |

‎.pdd‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
--source=.
2+
--exclude README.md
3+
--exclude config/**/*
4+
--exclude Documents/**/*
5+
--exclude allure.tgz
6+
--exclude *.sh
7+
--exclude *.bat
8+
--exclude .idea/**.*

‎Documents/1.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dummy file, please ignore me

‎Documents/Инструктаж для новичков.docx‎

436 KB
Binary file not shown.

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://mit-license.org/)
44
[![stackoverflow](https://img.shields.io/badge/stackoverflow-jdi-blue.svg?style=flat)](http://stackoverflow.com/questions/tagged/jdi)
5+
[![PDD Status](https://www.0pdd.com/svg?name=jdi-testing/jdi-light)](https://www.0pdd.com/p?name=jdi-testing/jdi-light)
56
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fjdi-testing%2Fjdi-light.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fjdi-testing%2Fjdi-light?ref=badge_shield)
67
[![SLACK](https://img.shields.io/badge/slack-community-green.svg)](https://join.slack.com/t/jdi-family/shared_invite/zt-toag8fgg-ppPiW~lZDU9873JAiSwTJw)
78
## Important

‎config/checkstyle/checkstyle.xml‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
</module>
199199
<module name="ReturnCount">
200200
<property name="severity" value="error" />
201-
<property name="max" value="2" />
201+
<property name="max" value="3" />
202202
</module>
203203
<module name="StringLiteralEquality">
204204
<property name="severity" value="error" />
@@ -214,7 +214,7 @@
214214
</module>
215215
<module name="Indentation">
216216
<property name="severity" value="error" />
217-
<property name="caseIndent" value="0" />
217+
<property name="caseIndent" value="4" />
218218
</module>
219219
<module name="ExplicitInitialization">
220220
<property name="severity" value="error" />
@@ -227,11 +227,11 @@
227227
</module>
228228
<module name="ClassTypeParameterName">
229229
<property name="severity" value="error" />
230-
<property name="format" value="^[A-Z]+[_A-Z]*$" />
230+
<property name="format" value="^([A-Z]+[^_A-Z]*)+$" />
231231
</module>
232232
<module name="MethodTypeParameterName">
233233
<property name="severity" value="error" />
234-
<property name="format" value="^[A-Z]+[_A-Z]*$" />
234+
<property name="format" value="^([A-Z]+[^_A-Z]*)+$" />
235235
</module>
236236
<module name="PackageAnnotation">
237237
<property name="severity" value="error" />
@@ -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">
@@ -308,29 +308,55 @@
308308
<property name="format" value="\s+$" />
309309
<property name="message" value="Line has trailing spaces" />
310310
<property name="id" value="TrailingSpaces_Error" />
311+
<property name="fileExtensions" value="java"/>
311312
</module>
312313
<module name="RegexpSingleline">
313314
<property name="severity" value="error" />
314315
<property name="format" value="\.exit\(|\.halt\(|\.traceMethodCalls\(|\.traceInstructions\(|\.runFinalization\(|\.gc\(" />
315316
<property name="message" value="Suspicious invocation of dangerous JVM level operation" />
316317
<property name="id" value="DangerousJVMOperation_Error" />
318+
<property name="fileExtensions" value="java"/>
317319
</module>
318320
<module name="RegexpSingleline">
319321
<property name="severity" value="error" />
320322
<property name="format" value="long serialVersionUID" />
321323
<property name="message" value="Do not declare a serialVersionUID" />
322324
<property name="id" value="SerialVersionUIDDeclared_Error" />
325+
<property name="fileExtensions" value="java"/>
323326
</module>
324327
<module name="RegexpSingleline">
325328
<property name="severity" value="error" />
326329
<property name="format" value="\.printStackTrace\(\)|System\.out|System\.err|org\.apache\.commons\.logging\.Log|java\.util\.logging" />
327330
<property name="message" value="use SLF4J for logging" />
328331
<property name="id" value="InvalidLoggingMethod_Error" />
332+
<property name="fileExtensions" value="java"/>
329333
</module>
330334
<module name="RegexpSingleline">
331335
<property name="severity" value="error" />
332336
<property name="format" value="null !=|null ==" />
333337
<property name="message" value="Check for null in reverse order" />
334338
<property name="id" value="ReverseOrderNullCheck_Error" />
339+
<property name="fileExtensions" value="java"/>
340+
</module>
341+
<module name="RegexpSingleline">
342+
<property name="severity" value="error" />
343+
<property name="format" value="(?&lt;!\.)(css|hasClass|hasAttribute|attr|find|finds)\((?!@|\)|String)" />
344+
<property name="message" value="core() should be used with these methods" />
345+
<property name="id" value="CoreMethodsUnused_Error" />
346+
<property name="fileExtensions" value="java"/>
347+
</module>
348+
<module name="RegexpSingleline">
349+
<property name="severity" value="error" />
350+
<property name="format" value="\.is\((true|false)\)\)" />
351+
<property name="message" value="Matcher.is(true/false) should be used with error message" />
352+
<property name="id" value="MatcherBooleanWithoutMessage_Error" />
353+
<property name="fileExtensions" value="java"/>
354+
</module>
355+
<module name="RegexpSingleline">
356+
<property name="severity" value="error" />
357+
<property name="format" value="throw new RuntimeExc" />
358+
<property name="message" value="Use `throw runtimeException('Error Message')` or `throw exception('Error message')`" />
359+
<property name="id" value="MatcherThrowingExceptions_Error" />
360+
<property name="fileExtensions" value="java"/>
335361
</module>
336362
</module>

‎config/checkstyle/suppressions.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,8 @@
1515
<suppress checks="JavadocStyle" files=".*.java"/>
1616

1717
<!-- Minor, useless, not definite rules -->
18-
<suppress checks="NeedBraces" files=".*.java"/>
19-
<suppress checks="ParameterName" files=".*.java"/>
20-
<suppress checks="ReturnCount" files=".*.java"/>
21-
<suppress checks="ParameterNumber" files=".*.java"/>
22-
<suppress checks="RegexpSingleline" files=".*.java"/>
2318
<suppress checks="DeclarationOrder" files=".*.java"/>
2419
<suppress checks="VisibilityModifier" files=".*.java"/>
25-
<suppress checks="Indentation" files=".*.java"/>
2620
<suppress checks="AvoidStarImport" files=".*.java"/>
27-
<suppress checks="EqualsAvoidNull" files=".*.java"/>
28-
<suppress checks="MagicNumber" files=".*.java"/>
2921
<suppress checks="ExplicitInitialization" files=".*.java"/>
30-
<suppress checks="MissingSwitchDefault" files=".*.java"/>
31-
<suppress checks="SuperClone" files=".*.java"/>
32-
<suppress checks="NPathComplexity" files=".*.java"/>
33-
<suppress checks="IllegalThrows" files=".*.java"/>
34-
<suppress checks="InnerAssignment" files=".*.java"/>
35-
<suppress checks="LeftCurly" files=".*.java"/>
36-
<suppress checks="MissingDeprecated" files=".*.java"/>
3722
</suppressions>

‎jdi-bdd-tests/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
<groupId>com.epam.jdi</groupId>
88
<artifactId>jdi-bdd-tests</artifactId>
9-
<version>1.5.2-SNAPSHOT</version>
9+
<version>1.5.3-SNAPSHOT</version>
1010
<name>Tests: JDI BDD</name>
1111

1212
<properties>
13-
<jdi.version>1.5.2-SNAPSHOT</jdi.version>
13+
<jdi.version>1.5.3-SNAPSHOT</jdi.version>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<driver>chrome</driver>
1616
<jetty.version>9.4.12.RC2</jetty.version>
@@ -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>

0 commit comments

Comments
 (0)