From 32f04ff0abf700608512f6bbe3b8e21628b1121b Mon Sep 17 00:00:00 2001 From: Roman Iovlev Date: Fri, 17 Sep 2021 17:56:18 +0200 Subject: [PATCH] 1.3.15 windows manager (#3323) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update names * 1.3.12 * fix nested forms issue * correct menu locator * switch to 3.0.2 * update Keyboard * fix data table cache * add dropdown tests * optimize imports * fix table no cache issues * fix table inRow * add new features to WindowsManager * switch to lightsaber 3.0.6 add direction validatiosn * optimize i,ports * ашч шьзщкеы ащк фтпгдк * update aspectj to 1.9.6 * update aspectj to 1.9.6 * fix ambigous sert * fix ambigous sert * remove kill chrome --- .github/workflows/main.yml | 20 +-- CHANGELOG.md | 148 ------------------ jdi-bdd-tests/pom.xml | 4 +- .../java/io/github/com/entities/Contacts.java | 2 +- .../github/com/entities/MarvelUserInfo.java | 2 +- .../github/com/entities/MarvelUserSimple.java | 2 +- .../java/io/github/com/entities/User.java | 2 +- .../cucumberTests/stepdefs/UserStepdefs.java | 2 +- jdi-bdd/pom.xml | 4 +- .../main/java/com/epam/jdi/bdd/BDDUtils.java | 2 +- .../epam/jdi/bdd/stepdefs/CheckListSteps.java | 2 +- .../epam/jdi/bdd/stepdefs/FileInputSteps.java | 2 +- .../com/epam/jdi/bdd/stepdefs/FormSteps.java | 4 +- .../jdi/bdd/stepdefs/MultiDropDownSteps.java | 2 +- .../com/epam/jdi/bdd/stepdefs/TableSteps.java | 6 +- .../epam/jdi/bdd/stepdefs/WebPageSteps.java | 2 +- jdi-eyes-demo/pom.xml | 11 +- .../main/java/jdisite/custom/MultiSelect.java | 2 +- .../java/jdisite/entities/ContactInfo.java | 2 +- .../java/jdisite/entities/MarvelUserInfo.java | 2 +- .../src/main/java/jdisite/entities/User.java | 2 +- .../com/jdi/testng/RetryListenerClass.java | 6 +- .../java/com/jdi/testng/TestNGListener.java | 4 +- jdi-light-angular-tests-with-mocks/pom.xml | 8 +- .../io/github/epam/testng/TestNGListener.java | 2 +- jdi-light-angular-tests/pom.xml | 6 +- .../main/java/io/github/com/StaticSite.java | 2 +- .../java/io/github/com/entities/User.java | 2 +- .../angular/tests/BaseValidationsUtils.java | 8 +- .../tests/elements/BaseValidationsUtils.java | 2 +- .../tests/elements/common/SpinnerTests.java | 2 +- .../tests/elements/common/TooltipTests.java | 2 +- .../tests/elements/complex/ChipsTests.java | 5 +- .../elements/complex/RadioButtonTests.java | 3 +- .../tests/elements/complex/SideNavTests.java | 3 +- .../tests/elements/complex/SnackbarTests.java | 2 +- .../datepicker/BasicDatepickerTests.java | 5 +- .../datepicker/MinMaxDatepickerTests.java | 5 +- .../datepicker/TestsDatepickerBase.java | 2 +- .../complex/tabgroup/TabsBasicTests.java | 3 +- .../TabsWIthAsyncLoadingContentTests.java | 3 +- .../TabsWihLazilyLoadedContentTests.java | 3 +- .../TabsWithCustomLabelTemplateTests.java | 3 +- .../TabsWithCustomizingThemesTests.java | 3 +- .../TabsWithDynamicallyChangingTabsTests.java | 3 +- .../TabsWithHeadersOnTheBottomTests.java | 3 +- .../complex/tabgroup/TabsWithNavBarTests.java | 3 +- .../tests/unit/AutocompleteUnitTests.java | 2 +- .../unit/DatepickerContainerUnitTests.java | 9 +- .../tests/unit/DatepickerUnitTests.java | 5 +- .../tests/unit/PaginatorUnitTests.java | 3 +- .../angular/tests/unit/TabGroupUnitTests.java | 3 +- .../io/github/epam/testng/TestNGListener.java | 4 +- jdi-light-angular/pom.xml | 6 +- .../light/angular/actions/AngularActions.java | 2 +- .../angular/asserts/BottomSheetAssert.java | 2 +- .../asserts/MaterialSelectorAssert.java | 4 +- .../angular/asserts/NativeSelectorAssert.java | 4 +- .../angular/asserts/PaginatorAssert.java | 3 +- .../angular/asserts/ProgressBarAssert.java | 2 +- .../elements/complex/AutoComplete.java | 2 +- .../elements/complex/ButtonToggle.java | 4 +- .../angular/elements/complex/Datepicker.java | 19 +-- .../elements/complex/ExpansionPanel.java | 23 +-- .../angular/elements/complex/FormField.java | 2 +- .../elements/complex/MaterialSelector.java | 7 +- .../elements/complex/NativeSelector.java | 11 +- .../angular/elements/complex/Ripple.java | 15 +- .../composite/DatepickerContainer.java | 15 +- .../composite/MaterialSelectorContainer.java | 4 +- jdi-light-applitools-tests/pom.xml | 12 +- .../main/java/jdisite/custom/MultiSelect.java | 2 +- .../java/jdisite/entities/ContactInfo.java | 2 +- .../java/jdisite/entities/MarvelUserInfo.java | 2 +- .../src/main/java/jdisite/entities/User.java | 2 +- .../example/entities/MarvelUserInfo.java | 2 +- .../uiobjects/example/entities/User.java | 2 +- .../com/jdi/testng/RetryListenerClass.java | 6 +- jdi-light-bootstrap-tests/pom.xml | 11 +- .../java/io/github/com/custom/FullName.java | 2 +- .../io/github/com/entities/SlideInfo.java | 4 +- .../java/io/github/com/entities/User.java | 2 +- .../java/io/github/com/sections/Slide.java | 2 +- .../bootstrap/tests/BaseValidationsUtils.java | 8 +- .../bootstrap/tests/common/ButtonTests.java | 2 +- .../tests/complex/DropdownMenuSplitTests.java | 2 +- .../tests/complex/DropdownMenuTests.java | 2 +- .../github/epam/test/data/CardImageData.java | 2 +- .../epam/testng/RetryListenerClass.java | 6 +- .../io/github/epam/testng/TestNGListener.java | 2 +- jdi-light-bootstrap/pom.xml | 4 +- .../light/ui/bootstrap/actions/BSActions.java | 2 +- .../bootstrap/elements/common/Progress.java | 2 +- .../bootstrap/elements/complex/Carousel.java | 4 +- .../elements/complex/RadioButtons.java | 2 +- jdi-light-eyes/pom.xml | 4 +- .../java/com/epam/jdi/eyes/EyesConfig.java | 8 +- .../main/java/com/epam/jdi/eyes/JDIEyes.java | 6 +- jdi-light-html-tests/pom.xml | 8 +- .../java/io/github/com/GoogleDuckSite.java | 7 + .../main/java/io/github/com/StaticSite.java | 1 + .../java/io/github/com/custom/Result.java | 2 +- .../io/github/com/custom/SearchResult.java | 2 +- .../java/io/github/com/entities/Contacts.java | 2 +- .../io/github/com/entities/Furniture.java | 2 +- .../github/com/entities/MarvelUserInfo.java | 2 +- .../github/com/entities/MarvelUserSimple.java | 2 +- .../java/io/github/com/entities/User.java | 2 +- .../java/io/github/com/entities/UserInfo.java | 2 +- .../main/java/pseudo/site/entities/User.java | 2 +- .../html/tests/elements/BaseValidations.java | 8 +- .../tests/elements/common/ButtonTests.java | 3 +- .../elements/common/FileUploadTests.java | 2 +- .../elements/common/PerformanceTests.java | 2 +- .../elements/complex/MultiSelectorTests.java | 2 +- .../complex/dropdown/DropdownCustomTests.java | 2 +- .../complex/dropdown/DropdownDressTests.java | 2 +- .../complex/dropdown/DropdownEx2Tests.java | 2 +- .../complex/dropdown/DropdownEx3Tests.java | 2 +- .../complex/dropdown/DropdownEx4Tests.java | 2 +- .../complex/dropdown/DropdownEx5Tests.java | 2 +- .../complex/dropdown/DropdownExTests.java | 2 +- .../complex/dropdown/DropdownITests.java | 2 +- .../complex/dropdown/DropdownListTests.java | 2 +- .../complex/dropdown/DropdownRootTests.java | 2 +- .../complex/dropdown/DropdownSelectTests.java | 2 +- .../complex/list/ElementsGoogleTests.java | 2 +- .../complex/list/JListSearchTests.java | 2 +- .../elements/complex/list/SearchTests.java | 2 +- .../elements/complex/table/BasicTests.java | 2 +- .../complex/table/DataConversionTests.java | 6 +- .../complex/table/DataTableTests.java | 2 +- .../complex/table/FurnitureTests.java | 2 +- .../complex/table/GridDoubleHiddenTests.java | 4 +- .../complex/table/GridHiddenTests.java | 4 +- .../complex/table/GridJTableTests.java | 4 +- .../complex/table/GridSharpHeaderTests.java | 4 +- .../complex/table/GridSharpTests.java | 4 +- .../elements/complex/table/GridTHTests.java | 4 +- .../elements/complex/table/GridTests.java | 4 +- .../elements/complex/table/PrimitiveData.java | 2 +- .../complex/table/TableInteractTests.java | 2 +- .../html/tests/issues/issue69/Paragraph.java | 2 +- .../tests/issues/issue69/ParagraphData.java | 2 +- .../tests/performance/BeforeNewPageTests.java | 2 +- .../tests/performance/DataTableTests.java | 4 +- .../performance/ListPerformanceTests.java | 8 +- .../html/tests/performance/PerfStatistic.java | 10 +- .../epam/html/tests/site/FormsTests.java | 2 +- .../html/tests/site/MultiSiteExample.java | 21 ++- .../epam/testng/RetryListenerClass.java | 6 +- .../io/github/epam/testng/TestNGListener.java | 4 +- jdi-light-html/pom.xml | 4 +- .../light/ui/html/actions/HtmlActions.java | 2 +- .../ui/html/elements/common/FileInput.java | 13 +- .../ui/html/elements/common/FileUpload.java | 2 +- .../light/ui/html/elements/common/Link.java | 2 +- .../html/elements/common/NumberSelector.java | 6 +- .../elements/complex/DataListOptions.java | 6 +- .../ui/html/elements/complex/Menu2D.java | 8 +- .../light/ui/html/elements/complex/Tabs.java | 2 +- .../html/elements/complex/vue/ChartData.java | 4 +- .../ui/html/elements/complex/vue/DataSet.java | 2 +- jdi-light-mobile-bootstrap-web-tests/pom.xml | 10 +- jdi-light-mobile-html-web-tests/pom.xml | 10 +- jdi-light-mobile-tests/pom.xml | 12 +- jdi-light-mobile/pom.xml | 8 +- .../mobile/AllurePropertiesGenerator.java | 5 +- .../epam/jdi/light/mobile/MobileUtils.java | 13 +- .../light/mobile/actions/MobileActions.java | 2 +- .../light/mobile/driver/MobileDriverData.java | 2 +- .../elements/base/MobileAppUIElement.java | 6 +- .../mobile/elements/base/MobileTextTypes.java | 2 +- .../mobile/elements/base/MobileUIElement.java | 8 +- .../elements/complex/MobileWebList.java | 30 ++-- .../mobile/elements/init/PageFactory.java | 6 +- .../settings/MobileElementSettings.java | 8 +- .../light/mobile/settings/MobileSettings.java | 2 +- jdi-light/pom.xml | 8 +- .../epam/jdi/light/actions/ActionHelper.java | 31 ++-- .../epam/jdi/light/actions/ActionObject.java | 14 +- .../jdi/light/actions/ActionOverride.java | 8 +- .../jdi/light/actions/ActionProcessor.java | 4 +- .../light/asserts/core/DataListAssert.java | 6 +- .../jdi/light/asserts/core/FileAssert.java | 4 +- .../jdi/light/asserts/core/SoftAssert.java | 6 +- .../jdi/light/asserts/generic/BaseAssert.java | 6 +- .../light/asserts/generic/CommonAssert.java | 2 +- .../jdi/light/asserts/generic/ListAssert.java | 8 +- .../jdi/light/asserts/generic/UIAssert.java | 8 +- .../light/asserts/generic/UISelectAssert.java | 8 +- .../generic/table/BaseTableAssert.java | 6 +- .../generic/table/DataTableAssert.java | 10 +- .../generic/table/IDataGridAssert.java | 10 +- .../asserts/generic/table/IGridAssert.java | 6 +- .../com/epam/jdi/light/common/Exceptions.java | 6 +- .../jdi/light/common/LinuxProcessUtils.java | 2 +- .../light/common/ListElementNameTypes.java | 2 +- .../epam/jdi/light/common/NameToLocator.java | 10 +- .../jdi/light/common/OutputTemplates.java | 2 +- .../jdi/light/common/SearchStrategies.java | 4 +- .../epam/jdi/light/common/SetTextTypes.java | 2 +- .../com/epam/jdi/light/common/TextTypes.java | 2 +- .../com/epam/jdi/light/common/Timeout.java | 2 +- .../com/epam/jdi/light/common/UIUtils.java | 16 +- .../jdi/light/common/UnixProcessUtils.java | 2 +- .../jdi/light/driver/ScreenshotMaker.java | 6 +- .../jdi/light/driver/WebDriverByUtils.java | 20 +-- .../jdi/light/driver/WebDriverFactory.java | 14 +- .../epam/jdi/light/driver/WebDriverUtils.java | 4 +- .../driver/get/DownloadDriverManager.java | 9 +- .../epam/jdi/light/driver/get/DriverData.java | 20 +-- .../epam/jdi/light/driver/get/DriverInfo.java | 10 +- .../light/driver/get/RemoteDriverInfo.java | 2 +- .../jdi/light/driver/sauce/SauceSettings.java | 2 +- .../jdi/light/elements/base/Condition.java | 2 +- .../jdi/light/elements/base/Conditions.java | 53 +++++++ .../jdi/light/elements/base/DriverBase.java | 18 ++- .../epam/jdi/light/elements/base/JDIBase.java | 46 +++--- .../jdi/light/elements/base/JDILocator.java | 8 +- .../jdi/light/elements/base/JdiSettings.java | 18 +-- .../light/elements/base/SeleniumSettings.java | 2 +- .../light/elements/base/UIBaseElement.java | 12 +- .../jdi/light/elements/common/Direction.java | 44 ++++++ .../jdi/light/elements/common/Directions.java | 53 +++++++ .../jdi/light/elements/common/Keyboard.java | 8 +- .../epam/jdi/light/elements/common/Mouse.java | 2 +- .../jdi/light/elements/common/UIElement.java | 62 ++++++-- .../light/elements/common/WindowsManager.java | 45 +++++- .../jdi/light/elements/complex/Checklist.java | 8 +- .../jdi/light/elements/complex/DataList.java | 10 +- .../jdi/light/elements/complex/IList.java | 12 +- .../jdi/light/elements/complex/ISelector.java | 6 +- .../jdi/light/elements/complex/JList.java | 2 +- .../jdi/light/elements/complex/ListBase.java | 8 +- .../jdi/light/elements/complex/Selector.java | 8 +- .../jdi/light/elements/complex/WebList.java | 30 ++-- .../elements/complex/dropdown/Dropdown.java | 2 + .../complex/dropdown/DropdownExpand.java | 31 ++-- .../complex/dropdown/DropdownSelect.java | 9 +- .../elements/complex/table/BaseTable.java | 22 +-- .../elements/complex/table/CacheAll.java | 6 +- .../light/elements/complex/table/Column.java | 2 +- .../elements/complex/table/DataGrid.java | 10 +- .../elements/complex/table/DataTable.java | 18 +-- .../light/elements/complex/table/Grid.java | 6 +- .../elements/complex/table/IDataGrid.java | 4 +- .../light/elements/complex/table/IGrid.java | 12 +- .../light/elements/complex/table/Line.java | 22 +-- .../light/elements/complex/table/NameNum.java | 6 +- .../jdi/light/elements/complex/table/Row.java | 2 +- .../light/elements/complex/table/Table.java | 2 +- .../elements/complex/table/TableMatcher.java | 2 +- .../complex/table/matchers/ColumnMatcher.java | 2 +- .../table/matchers/TableMatcherSettings.java | 8 +- .../jdi/light/elements/composite/Form.java | 20 +-- .../jdi/light/elements/composite/WebPage.java | 53 ++++--- .../jdi/light/elements/init/InitActions.java | 22 +-- .../epam/jdi/light/elements/init/JDITalk.java | 2 +- .../jdi/light/elements/init/PageFactory.java | 47 ++++-- .../jdi/light/elements/init/SiteInfo.java | 40 +++-- .../collection/EntitiesCollection.java | 22 +-- .../elements/init/rules/AnnotationRule.java | 4 +- .../light/elements/init/rules/InitRule.java | 4 +- .../light/elements/init/rules/SetupRule.java | 4 +- .../interfaces/base/IBaseElement.java | 5 +- .../interfaces/base/ICoreElement.java | 37 ++++- .../interfaces/complex/IsChecklist.java | 2 +- .../interfaces/complex/IsDropdown.java | 2 +- .../annotations/WebAnnotationsUtil.java | 3 +- .../objects/FillFromAnnotationRules.java | 2 +- .../epam/jdi/light/logger/AllureLogger.java | 16 +- .../com/epam/jdi/light/logger/ILogger.java | 2 +- .../com/epam/jdi/light/logger/JDILogger.java | 18 +-- .../com/epam/jdi/light/logger/LogLevels.java | 2 +- .../jdi/light/settings/CommonSettings.java | 4 +- .../jdi/light/settings/DriverSettings.java | 13 +- .../jdi/light/settings/ElementSettings.java | 16 +- .../epam/jdi/light/settings/LogSettings.java | 4 +- .../epam/jdi/light/settings/PageSettings.java | 3 +- .../jdi/light/settings/ScreenSettings.java | 10 +- .../epam/jdi/light/settings/ScreenSize.java | 2 +- .../epam/jdi/light/settings/Strategies.java | 6 +- .../epam/jdi/light/settings/WebSettings.java | 37 +++-- pom.xml | 2 +- test-examples/jdi-bdd-no-po-tests/pom.xml | 4 +- .../java/cucumberTests/test/data/User.java | 2 +- test-examples/jdi-light-examples/pom.xml | 10 +- .../java/io/github/com/custom/Result.java | 2 +- .../io/github/com/custom/SearchResult.java | 2 +- .../java/io/github/epam/entities/User.java | 2 +- .../io/github/epam/entities/UserInfo.java | 2 +- .../src/main/java/selenium/entities/User.java | 2 +- .../java/selenium/site/data/ContactInfo.java | 2 +- .../io/github/epam/testng/TestNGListener.java | 4 +- .../github/epam/tests/google/SearchTests.java | 2 +- .../epam/tests/recommended/TableTests.java | 2 +- .../epam/tests/smart/path/PathTests.java | 2 +- test-examples/jdi-performance/pom.xml | 10 +- .../uiobjects/example/entities/Contacts.java | 2 +- .../example/entities/MarvelUserInfo.java | 2 +- .../uiobjects/example/entities/User.java | 2 +- .../uiobjects/example/knection/Workspace.java | 8 +- .../example/site/custom/MultiDropdown.java | 4 +- .../example/site/sections/ContactForm.java | 2 +- .../java/org/mytests/tests/PerfStatistic.java | 10 +- .../java/org/mytests/tests/TestsInit.java | 4 +- .../mytests/tests/example/DataTableTests.java | 2 +- .../tests/testng/RetryListenerClass.java | 6 +- .../mytests/tests/testng/TestNGListener.java | 4 +- .../jdi-light-junit-template/pom.xml | 2 +- .../uiobjects/example/entities/Contacts.java | 2 +- .../example/entities/MarvelUserInfo.java | 2 +- .../uiobjects/example/entities/User.java | 2 +- .../example/site/custom/MultiDropdown.java | 4 +- .../example/site/sections/ContactForm.java | 2 +- .../mytests/tests/example/DataTableTests.java | 2 +- .../jdi-light-testng-template/pom.xml | 6 +- .../uiobjects/example/entities/Contacts.java | 2 +- .../example/entities/MarvelUserInfo.java | 2 +- .../uiobjects/example/entities/User.java | 2 +- .../example/site/custom/MultiDropdown.java | 4 +- .../example/site/sections/ContactForm.java | 2 +- .../mytests/tests/example/DataTableTests.java | 2 +- .../tests/testng/RetryListenerClass.java | 6 +- .../mytests/tests/testng/TestNGListener.java | 4 +- 326 files changed, 1307 insertions(+), 1077 deletions(-) delete mode 100644 CHANGELOG.md create mode 100644 jdi-light/src/main/java/com/epam/jdi/light/elements/common/Direction.java create mode 100644 jdi-light/src/main/java/com/epam/jdi/light/elements/common/Directions.java diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 86a16deb30..70847ec35e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -109,8 +109,8 @@ jobs: - name: Check Chrome run: ps -aux | grep chrome - - name: Kill Chrome - run: pkill -f "chrome" +# - name: Kill Chrome +# run: pkill -f "chrome" ##### Example for original allure data upload # - name: 'Upload BDD results' @@ -130,8 +130,8 @@ jobs: - name: Check Chrome run: ps -aux | grep chrome - - name: Kill Chrome - run: pkill -f "chrome" +# - name: Kill Chrome +# run: pkill -f "chrome" # - name: Run tests - Angular Unit tests # id: tests-angular-unit @@ -176,8 +176,8 @@ jobs: - name: Check Chrome run: ps -aux | grep chrome - - name: Kill Chrome - run: pkill -f "chrome" +# - name: Kill Chrome +# run: pkill -f "chrome" - name: Run tests - HTML performace id: tests-html-perf @@ -189,8 +189,8 @@ jobs: - name: Check Chrome run: ps -aux | grep chrome - - name: Kill Chrome - run: pkill -f "chrome" +# - name: Kill Chrome +# run: pkill -f "chrome" - name: Run tests - Test Examples id: tests-examples @@ -202,8 +202,8 @@ jobs: - name: Check Chrome run: ps -aux | grep chrome - - name: Kill Chrome - run: pkill -f "chrome" +# - name: Kill Chrome +# run: pkill -f "chrome" - name: Run tests - Performance id: tests-perf diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 309c9be6ed..0000000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,148 +0,0 @@ -# Changelog - -## 1.3.15 (planed March 2021) -* Support [Angular materials](https://material.angular.io/components/categories) elements -* All tasks [angular](https://github.com/jdi-testing/jdi-light/issues?q=is%3Aissue+label%3AAngular+) - -## 1.3.14 (19.08.2021) -* TBD -* -## 1.3.13 (22.04.2021) -* Extend Form capability added - -## 1.3.12 (04.04.2021) -* update log names -* add description for First capital and As Is options for smart locators - -## 1.3.11 (03.03.2021) -* Switch to Lightsaber 2.1.13 -* Fix print column in a table matchers -* Move Table Matchers to com.epam.jdi.light.elements.complex.table.matchers and rename TableMatcher > ColumnMatcher; Single > ValueMatcher -* Make constructors public and fields protected -* Add TableMatchersSettings -* Set Deprecated for old matchers -* Fix few table logs - -## 1.3.10 (01.03.2021) -* Fix issue with actions -* Fix Grid header locators validation - -## 1.3.9 (28.02.2021) -* Fix beforeNewPage issue -* Fix issues with getting private fields by forms and other elements -* Fix print enum values in reports -* Fix print conditions - -## 1.3.8 (21.02.2021) -* Fix print table search filters -* Fix using default and Firefox capabilities from properties file -* Add makeScreenshot and attach to allure step for elements and WebPage -* Add checkIsNotChanged() method for WebPage -* Fix headless from properties issue - -##1.3.7 (17.02.2021) -* Small bug fixing in Actions helper - -## 1.3.5-6 (09.02.2021) -* Stability fixes for collections: Switch to Lightsaber 2.1.11 - -## 1.3.4 (04.02.2021) -* Switch to Lightsaber 2.1.8 -* Correct allure WebSettings -* Add AllureLogger steps -* Fix issue with version of junit-provider - -## 1.3.3 (28.01.2021) -* Add should verifications and Conditions to ICoreElement -* Add NAME_TO_LOCATOR, DEFAULT_CONTEXT, MAP_FORM -* Improve Allure Logging -* Improve attachments to Allure log: Html Code, Screenshots, Error HTTP. Add infoStep() for after log data in any place (for example after test end) -* Add "As Is" and "First capital" options for smart.name.to.locator -* Add Selenoid remote run support -* Add @MapToField annotation to map fields in forms - -## 1.3.2 (04.01.2021) -* Fix small add to WebList issue - -## 1.3.1 (09.11.2020) -* Fixed few small internal map issues - -## 1.3.0 (25.10.2020) -* Important parallelization and stability fix - -## 1.2.24 (16.10.2020) -* Bug fix for browserstack - -## 1.2.22-23 (release 01.10.2020) -* Fix table indexing for thead tbody tables - -## 1.2.21 (release 01.10.2020) -* Make Tables and Data Tables iterable -* Fix @Step issue with JList -* Fix and unify startIndex 0 or 1 for all iterable elements (WebList, JList, DataList, Table, DataTable etc.) -* Add the interface HasStartIndex - -## 1.2.20 (release 04.09.2020) -* Add flow strategies for screenshots -* Add flow strategies for elements highlights - -## 1.2.19 (release 04.09.2020) -* Bug fix - -## 1.2.18 (release 28.08.2020) -* Fix JDITalk -* Fix some error messages -* Improve WebList capabilities -* Update aspectj to 1.9.5 -* Prepare 1.2.18 version -* Add WaitAfterAction function (@WaitAfterAction) -* Improve Allure steps logging - -## 1.2.17 (release 13.08.2020) -* Bug fix - -## 1.2.16 (release 17.05.2020) -* Add keyboard commands (press, command, commands, pasteText) to UIElement -* Add option to take screenshot via Robot - -## 1.2.15 (release 08.06.2020) -* Fix list issue with multiple same values - -## 1.2.14 (release 31.05.2020) -* Update test properties description and capabilities - -## 1.2.13 (release 25.05.2020) -* Update version of AspectJ to 1.9.5. Support JDK 11 - -## 1.2.11 (release 23.05.2020) -* Technical release - -## 1.2.10 (release 21.05.2020) -* Improve tables add footer support and few more locators in JTable #2009 - -## 1.2.9 (release 05.15.2020) -* Improve bdd steps implementation - -## 1.2.8 (release 05.09.2020) -* While test fail Log current page url (if possible) and arguments values in fallen chain - -## 1.2.7 (release 05.05.2020) -* Add log option 'log.info.details' for different levels of the element details in logs #1917 -* Use methods in JDIAction (Step) in logs #1920 -* Fix issue #1916 - -## 1.2.6 (release 03.05.2020) -* Add Menu2D - -## 1.2.5 (release 01.05.2020) -* Add is().expand() / is().collapsed() functionality for all dropdowns -* Fix Smart Search identification for UI_AND_ELEMENTS option -* Add click() method for all Sections -* Add doubleClick(), rightClick(), dragAndDrop() methods for all elements (fot ICoreElement) - -## 1.2.4 (release 31.04.2020) -* Fix small issues with dropdowns isEmpty and isNotEmpty for invisible elements - -## 1.2.3 (release 22.04.2020) -* Add StartIndex setting #1888 -* Fix Download Driver issue. Always set X32 version for Windows #1889 diff --git a/jdi-bdd-tests/pom.xml b/jdi-bdd-tests/pom.xml index 85e5fb90f3..9974e6cf09 100644 --- a/jdi-bdd-tests/pom.xml +++ b/jdi-bdd-tests/pom.xml @@ -6,7 +6,7 @@ com.epam.jdi jdi-bdd-tests - 1.3.14 + 1.3.15 Tests: JDI BDD @@ -22,7 +22,7 @@ com.epam.jdi jdi-bdd - 1.3.14 + 1.3.15 info.cukes diff --git a/jdi-bdd-tests/src/main/java/io/github/com/entities/Contacts.java b/jdi-bdd-tests/src/main/java/io/github/com/entities/Contacts.java index ca8a168487..8679876428 100644 --- a/jdi-bdd-tests/src/main/java/io/github/com/entities/Contacts.java +++ b/jdi-bdd-tests/src/main/java/io/github/com/entities/Contacts.java @@ -1,7 +1,7 @@ package io.github.com.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class Contacts extends DataClass { public String firstName; diff --git a/jdi-bdd-tests/src/main/java/io/github/com/entities/MarvelUserInfo.java b/jdi-bdd-tests/src/main/java/io/github/com/entities/MarvelUserInfo.java index f8cb395df8..56b7327feb 100644 --- a/jdi-bdd-tests/src/main/java/io/github/com/entities/MarvelUserInfo.java +++ b/jdi-bdd-tests/src/main/java/io/github/com/entities/MarvelUserInfo.java @@ -1,6 +1,6 @@ package io.github.com.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class MarvelUserInfo extends DataClass { public String number, type, user, description; diff --git a/jdi-bdd-tests/src/main/java/io/github/com/entities/MarvelUserSimple.java b/jdi-bdd-tests/src/main/java/io/github/com/entities/MarvelUserSimple.java index 0744fed662..bb92a7cd36 100644 --- a/jdi-bdd-tests/src/main/java/io/github/com/entities/MarvelUserSimple.java +++ b/jdi-bdd-tests/src/main/java/io/github/com/entities/MarvelUserSimple.java @@ -1,6 +1,6 @@ package io.github.com.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; import java.util.Objects; diff --git a/jdi-bdd-tests/src/main/java/io/github/com/entities/User.java b/jdi-bdd-tests/src/main/java/io/github/com/entities/User.java index 8b21337e30..531d44c448 100644 --- a/jdi-bdd-tests/src/main/java/io/github/com/entities/User.java +++ b/jdi-bdd-tests/src/main/java/io/github/com/entities/User.java @@ -1,7 +1,7 @@ package io.github.com.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class User extends DataClass { public String name = "Roman"; diff --git a/jdi-bdd-tests/src/test/java/cucumberTests/stepdefs/UserStepdefs.java b/jdi-bdd-tests/src/test/java/cucumberTests/stepdefs/UserStepdefs.java index 7cac2f1bf2..19ed48d7d9 100644 --- a/jdi-bdd-tests/src/test/java/cucumberTests/stepdefs/UserStepdefs.java +++ b/jdi-bdd-tests/src/test/java/cucumberTests/stepdefs/UserStepdefs.java @@ -8,7 +8,7 @@ import static com.epam.jdi.bdd.stepdefs.CheckListSteps.multiSelect; import static com.epam.jdi.light.elements.init.entities.collection.EntitiesCollection.getUI; import static com.epam.jdi.light.settings.JDISettings.COMMON; -import static com.epam.jdi.tools.PathUtils.mergePath; +import static com.jdiai.tools.PathUtils.mergePath; import static io.github.com.StaticSite.homePage; import static io.github.com.entities.Users.DEFAULT_USER; import static io.github.com.pages.Header.*; diff --git a/jdi-bdd/pom.xml b/jdi-bdd/pom.xml index f2ac2f0b3c..d4b8222135 100644 --- a/jdi-bdd/pom.xml +++ b/jdi-bdd/pom.xml @@ -6,7 +6,7 @@ com.epam.jdi jdi-bdd - 1.3.14 + 1.3.15 JDI BDD @@ -18,7 +18,7 @@ com.epam.jdi jdi-light-html - 1.3.14 + 1.3.15 info.cukes diff --git a/jdi-bdd/src/main/java/com/epam/jdi/bdd/BDDUtils.java b/jdi-bdd/src/main/java/com/epam/jdi/bdd/BDDUtils.java index 6f32af92a9..48ae673255 100644 --- a/jdi-bdd/src/main/java/com/epam/jdi/bdd/BDDUtils.java +++ b/jdi-bdd/src/main/java/com/epam/jdi/bdd/BDDUtils.java @@ -6,7 +6,7 @@ import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.interfaces.base.HasLabel; import com.epam.jdi.light.elements.interfaces.common.IsInput; -import com.epam.jdi.tools.map.MapArray; +import com.jdiai.tools.map.MapArray; import cucumber.api.DataTable; import static com.epam.jdi.light.elements.init.entities.collection.EntitiesCollection.getUI; diff --git a/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/CheckListSteps.java b/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/CheckListSteps.java index d2e5073a7c..99719a6439 100644 --- a/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/CheckListSteps.java +++ b/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/CheckListSteps.java @@ -7,7 +7,7 @@ import java.util.List; import static com.epam.jdi.light.elements.init.entities.collection.EntitiesCollection.getUI; -import static com.epam.jdi.tools.LinqUtils.toIntArray; +import static com.jdiai.tools.LinqUtils.toIntArray; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasSize; diff --git a/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/FileInputSteps.java b/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/FileInputSteps.java index 34820fc1ae..387a23ec20 100644 --- a/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/FileInputSteps.java +++ b/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/FileInputSteps.java @@ -5,7 +5,7 @@ import static com.epam.jdi.light.elements.init.entities.collection.EntitiesCollection.getUI; import static com.epam.jdi.light.settings.JDISettings.COMMON; -import static com.epam.jdi.tools.PathUtils.mergePath; +import static com.jdiai.tools.PathUtils.mergePath; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/FormSteps.java b/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/FormSteps.java index b2d4296436..d890a31192 100644 --- a/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/FormSteps.java +++ b/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/FormSteps.java @@ -1,7 +1,7 @@ package com.epam.jdi.bdd.stepdefs; import com.epam.jdi.light.elements.composite.Form; -import com.epam.jdi.tools.Safe; +import com.jdiai.tools.Safe; import cucumber.api.DataTable; import cucumber.api.java.en.Then; import cucumber.api.java.en.When; @@ -9,7 +9,7 @@ import static com.epam.jdi.bdd.BDDUtils.getMapFromTable; import static com.epam.jdi.light.common.Exceptions.exception; import static com.epam.jdi.light.elements.init.entities.collection.EntitiesCollection.getUI; -import static com.epam.jdi.tools.JsonUtils.getMapFromJson; +import static com.jdiai.tools.JsonUtils.getMapFromJson; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/MultiDropDownSteps.java b/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/MultiDropDownSteps.java index f9f7bb1df9..f7fad74f35 100644 --- a/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/MultiDropDownSteps.java +++ b/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/MultiDropDownSteps.java @@ -8,7 +8,7 @@ import static com.epam.jdi.bdd.BDDUtils.selectAssert; import static com.epam.jdi.light.elements.init.entities.collection.EntitiesCollection.getUI; -import static com.epam.jdi.tools.LinqUtils.toIntArray; +import static com.jdiai.tools.LinqUtils.toIntArray; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.not; import static org.hamcrest.core.IsIterableContaining.hasItem; diff --git a/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/TableSteps.java b/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/TableSteps.java index 3ab18129e5..58ff3905d9 100644 --- a/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/TableSteps.java +++ b/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/TableSteps.java @@ -13,9 +13,9 @@ import static com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher.containsValue; import static com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher.hasValue; import static com.epam.jdi.light.elements.init.entities.collection.EntitiesCollection.getUI; -import static com.epam.jdi.tools.LinqUtils.map; -import static com.epam.jdi.tools.LinqUtils.safeException; -import static com.epam.jdi.tools.PrintUtils.print; +import static com.jdiai.tools.LinqUtils.map; +import static com.jdiai.tools.LinqUtils.safeException; +import static com.jdiai.tools.PrintUtils.print; import static java.lang.Integer.parseInt; import static org.hamcrest.Matchers.*; diff --git a/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/WebPageSteps.java b/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/WebPageSteps.java index 605084e870..53036dc6c9 100644 --- a/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/WebPageSteps.java +++ b/jdi-bdd/src/main/java/com/epam/jdi/bdd/stepdefs/WebPageSteps.java @@ -5,7 +5,7 @@ import static com.epam.jdi.light.driver.WebDriverFactory.jsExecute; import static com.epam.jdi.light.elements.composite.WebPage.*; -import static com.epam.jdi.tools.JsonUtils.getInt; +import static com.jdiai.tools.JsonUtils.getInt; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; diff --git a/jdi-eyes-demo/pom.xml b/jdi-eyes-demo/pom.xml index 6cd34eddbe..c18af730be 100644 --- a/jdi-eyes-demo/pom.xml +++ b/jdi-eyes-demo/pom.xml @@ -6,7 +6,7 @@ com.epam.jdi jdi-eyes-demo - 1.3.14 + 1.3.15 Selenium to JDI Example with Eyes jar @@ -23,18 +23,19 @@ com.epam.jdi jdi-light-eyes - 1.3.14 + 1.3.15 com.epam.jdi jdi-light-html - 1.3.14 + 1.3.15 org.testng testng - 6.14.3 + 7.4.0 + test io.qameta.allure @@ -113,4 +114,4 @@ - \ No newline at end of file + diff --git a/jdi-eyes-demo/src/main/java/jdisite/custom/MultiSelect.java b/jdi-eyes-demo/src/main/java/jdisite/custom/MultiSelect.java index 77bca2656f..91eb0815c9 100644 --- a/jdi-eyes-demo/src/main/java/jdisite/custom/MultiSelect.java +++ b/jdi-eyes-demo/src/main/java/jdisite/custom/MultiSelect.java @@ -13,7 +13,7 @@ import java.util.List; import static com.epam.jdi.light.logger.LogLevels.DEBUG; -import static com.epam.jdi.tools.LinqUtils.map; +import static com.jdiai.tools.LinqUtils.map; import static org.apache.commons.lang3.StringUtils.isBlank; public class MultiSelect extends UIListBase> implements HasLabel { diff --git a/jdi-eyes-demo/src/main/java/jdisite/entities/ContactInfo.java b/jdi-eyes-demo/src/main/java/jdisite/entities/ContactInfo.java index 4697fb2736..45334f5fc2 100644 --- a/jdi-eyes-demo/src/main/java/jdisite/entities/ContactInfo.java +++ b/jdi-eyes-demo/src/main/java/jdisite/entities/ContactInfo.java @@ -5,7 +5,7 @@ * Email: roman.iovlev.jdi@gmail.com; Skype: roman.iovlev */ -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class ContactInfo extends DataClass { public String firstName, lastName, position, gender, religion, weather, description; diff --git a/jdi-eyes-demo/src/main/java/jdisite/entities/MarvelUserInfo.java b/jdi-eyes-demo/src/main/java/jdisite/entities/MarvelUserInfo.java index 7b5d48affa..d9aba7789f 100644 --- a/jdi-eyes-demo/src/main/java/jdisite/entities/MarvelUserInfo.java +++ b/jdi-eyes-demo/src/main/java/jdisite/entities/MarvelUserInfo.java @@ -1,6 +1,6 @@ package jdisite.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class MarvelUserInfo extends DataClass { public String number, type, user, description; diff --git a/jdi-eyes-demo/src/main/java/jdisite/entities/User.java b/jdi-eyes-demo/src/main/java/jdisite/entities/User.java index 092f9de628..ffec140bc6 100644 --- a/jdi-eyes-demo/src/main/java/jdisite/entities/User.java +++ b/jdi-eyes-demo/src/main/java/jdisite/entities/User.java @@ -5,7 +5,7 @@ * Email: roman.iovlev.jdi@gmail.com; Skype: roman.iovlev */ -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class User extends DataClass { public String name, password; diff --git a/jdi-eyes-demo/src/test/java/com/jdi/testng/RetryListenerClass.java b/jdi-eyes-demo/src/test/java/com/jdi/testng/RetryListenerClass.java index beb91f49b2..4731edae67 100644 --- a/jdi-eyes-demo/src/test/java/com/jdi/testng/RetryListenerClass.java +++ b/jdi-eyes-demo/src/test/java/com/jdi/testng/RetryListenerClass.java @@ -15,10 +15,10 @@ public class RetryListenerClass implements IAnnotationTransformer { @Override - public void transform(ITestAnnotation testannotation, Class testClass, Constructor testConstructor, Method testMethod) { - IRetryAnalyzer retry = testannotation.getRetryAnalyzer(); + public void transform(ITestAnnotation testAnnotation, Class testClass, Constructor testConstructor, Method testMethod) { + Class retry = testAnnotation.getRetryAnalyzerClass(); if (retry == null) { - testannotation.setRetryAnalyzer(RetryFailedTestCases.class); + testAnnotation.setRetryAnalyzer(RetryFailedTestCases.class); } } diff --git a/jdi-eyes-demo/src/test/java/com/jdi/testng/TestNGListener.java b/jdi-eyes-demo/src/test/java/com/jdi/testng/TestNGListener.java index 45d56ad220..87a365b442 100644 --- a/jdi-eyes-demo/src/test/java/com/jdi/testng/TestNGListener.java +++ b/jdi-eyes-demo/src/test/java/com/jdi/testng/TestNGListener.java @@ -5,7 +5,7 @@ * Email: roman.iovlev.jdi@gmail.com; Skype: roman.iovlev */ -import com.epam.jdi.tools.Safe; +import com.jdiai.tools.Safe; import org.testng.IInvokedMethod; import org.testng.IInvokedMethodListener; import org.testng.ITestNGMethod; @@ -18,7 +18,7 @@ import static com.epam.jdi.light.logger.AllureLogger.screenshotStep; import static com.epam.jdi.light.settings.WebSettings.TEST_NAME; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.last; +import static com.jdiai.tools.LinqUtils.last; import static java.lang.System.currentTimeMillis; public class TestNGListener implements IInvokedMethodListener { diff --git a/jdi-light-angular-tests-with-mocks/pom.xml b/jdi-light-angular-tests-with-mocks/pom.xml index ed7f33d2f2..f96a828e97 100644 --- a/jdi-light-angular-tests-with-mocks/pom.xml +++ b/jdi-light-angular-tests-with-mocks/pom.xml @@ -6,14 +6,14 @@ jdi-light-angular-tests-with-mocks Tests: JDI Angular unit tests with mocks - 1.3.14 + 1.3.15 com.epam.jdi chrome 1.9.6 1.8 - 2.13.8 + 2.15.0 2.10.0 9.4.12.RC2 @@ -28,7 +28,7 @@ com.epam.jdi jdi-light-angular - 1.3.14 + 1.3.15 @@ -121,4 +121,4 @@ - \ No newline at end of file + diff --git a/jdi-light-angular-tests-with-mocks/src/test/java/io/github/epam/testng/TestNGListener.java b/jdi-light-angular-tests-with-mocks/src/test/java/io/github/epam/testng/TestNGListener.java index 68b1212903..ee8c39f970 100644 --- a/jdi-light-angular-tests-with-mocks/src/test/java/io/github/epam/testng/TestNGListener.java +++ b/jdi-light-angular-tests-with-mocks/src/test/java/io/github/epam/testng/TestNGListener.java @@ -1,6 +1,6 @@ package io.github.epam.testng; -import com.epam.jdi.tools.Safe; +import com.jdiai.tools.Safe; import org.testng.IInvokedMethod; import org.testng.IInvokedMethodListener; import org.testng.ITestResult; diff --git a/jdi-light-angular-tests/pom.xml b/jdi-light-angular-tests/pom.xml index a65ff44888..63f1531fa6 100644 --- a/jdi-light-angular-tests/pom.xml +++ b/jdi-light-angular-tests/pom.xml @@ -6,14 +6,14 @@ jdi-light-angular-tests Tests: JDI Angular - 1.3.14 + 1.3.15 com.epam.jdi chrome 1.9.6 1.8 - 2.13.8 + 2.15.0 2.10.0 9.4.12.RC2 src/test/resources/general.xml @@ -23,7 +23,7 @@ com.epam.jdi jdi-light-angular - 1.3.14 + 1.3.15 io.qameta.allure diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java b/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java index c0e22b37c3..bb4867303e 100644 --- a/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java +++ b/jdi-light-angular-tests/src/main/java/io/github/com/StaticSite.java @@ -7,7 +7,7 @@ import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI; import com.epam.jdi.light.ui.html.elements.common.Button; import com.epam.jdi.light.ui.html.elements.common.Text; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; import io.github.com.pages.AngularPage; @JSite("https://jdi-testing.github.io/jdi-light/") diff --git a/jdi-light-angular-tests/src/main/java/io/github/com/entities/User.java b/jdi-light-angular-tests/src/main/java/io/github/com/entities/User.java index 9ac0fc7a7c..e2df74796c 100644 --- a/jdi-light-angular-tests/src/main/java/io/github/com/entities/User.java +++ b/jdi-light-angular-tests/src/main/java/io/github/com/entities/User.java @@ -1,6 +1,6 @@ package io.github.com.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class User extends DataClass { public String firstName; diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/BaseValidationsUtils.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/BaseValidationsUtils.java index e2044a6f92..b47bb2cd63 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/BaseValidationsUtils.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/BaseValidationsUtils.java @@ -1,14 +1,14 @@ package io.github.epam.angular.tests; import com.epam.jdi.light.elements.interfaces.base.ICoreElement; -import com.epam.jdi.tools.func.JAction; -import com.epam.jdi.tools.func.JFunc; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.func.JAction; +import com.jdiai.tools.func.JFunc; +import com.jdiai.tools.pairs.Pair; import org.openqa.selenium.Dimension; import org.openqa.selenium.Point; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.pairs.Pair.$; +import static com.jdiai.tools.pairs.Pair.$; import static java.lang.System.currentTimeMillis; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/BaseValidationsUtils.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/BaseValidationsUtils.java index 384755154f..7bc294f633 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/BaseValidationsUtils.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/BaseValidationsUtils.java @@ -1,7 +1,7 @@ package io.github.epam.angular.tests.elements; import com.epam.jdi.light.elements.interfaces.base.ICoreElement; -import com.epam.jdi.tools.func.JAction; +import com.jdiai.tools.func.JAction; import org.openqa.selenium.Dimension; import org.openqa.selenium.Point; diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/common/SpinnerTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/common/SpinnerTests.java index 0d681e0302..b12d75cafd 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/common/SpinnerTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/common/SpinnerTests.java @@ -1,6 +1,6 @@ package io.github.epam.angular.tests.elements.common; -import com.epam.jdi.tools.func.JAction; +import com.jdiai.tools.func.JAction; import io.github.epam.TestsInit; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/common/TooltipTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/common/TooltipTests.java index 2a3578a68f..13a8c9f609 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/common/TooltipTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/common/TooltipTests.java @@ -2,7 +2,7 @@ import com.epam.jdi.light.angular.elements.common.Tooltip; import com.epam.jdi.light.angular.elements.composite.MaterialSelectorContainer; -import com.epam.jdi.tools.func.JAction; +import com.jdiai.tools.func.JAction; import io.github.epam.TestsInit; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/ChipsTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/ChipsTests.java index a0e61e7e81..1ada8bb4a4 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/ChipsTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/ChipsTests.java @@ -7,6 +7,7 @@ import java.util.Arrays; import java.util.List; +import static com.jdiai.tools.StringUtils.format; import static io.github.com.StaticSite.angularPage; import static io.github.com.pages.sections.ChipsSection.*; import static io.github.epam.site.steps.States.shouldBeLoggedIn; @@ -45,7 +46,7 @@ public void basicChipsTest() { basicChipsRow.clickChipsByTextValue(PRIMARYFISH); basicChipsRow.clickChipsByTextValue(ACCENTFISH); - basicSelectedValue.has().text(String.format("You clicked: %s", ACCENTFISH)); + basicSelectedValue.has().text(format("You clicked: %s", ACCENTFISH)); } @Test @@ -58,7 +59,7 @@ public void stackedChipsTest() { stackedChipsList.clickChipsByTextValue(ACCENT); stackedChipsList.clickChipsByTextValue(WARN); - stackedSelectedValue.has().text(String.format("You clicked: %s", WARN)); + stackedSelectedValue.has().text(format("You clicked: %s", WARN)); } @Test diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/RadioButtonTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/RadioButtonTests.java index f3c23ae353..6c6332432a 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/RadioButtonTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/RadioButtonTests.java @@ -7,6 +7,7 @@ import static io.github.com.StaticSite.angularPage; import static io.github.com.pages.sections.RadioButtonSection.*; import static io.github.epam.site.steps.States.shouldBeLoggedIn; +import static com.jdiai.tools.StringUtils.format; public class RadioButtonTests extends TestsInit { private static final String SPRING = "Spring"; @@ -40,7 +41,7 @@ public void seasonsRadioButtonsTest() { seasonRadioGroup.click(SPRING); seasonRadioGroup.is().checked(SPRING); - yourFavoriteSeasonText.has().text(String.format("Your favorite season is: %s", SPRING)); + yourFavoriteSeasonText.has().text(format("Your favorite season is: %s", SPRING)); seasonRadioGroup.is().notChecked(WINTER); seasonRadioGroup.is().notChecked(SUMMER); diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/SideNavTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/SideNavTests.java index c835e6fda2..1285865cb3 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/SideNavTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/SideNavTests.java @@ -6,6 +6,7 @@ import org.testng.annotations.Test; import static com.epam.jdi.light.elements.composite.WebPage.refresh; +import static com.jdiai.tools.StringUtils.format; import static io.github.com.StaticSite.angularPage; import static io.github.com.pages.sections.SideNavSection.*; import static io.github.epam.site.steps.States.shouldBeLoggedIn; @@ -167,7 +168,7 @@ public void toggleResponsiveSideNavTest() { toolbarToggle.click(); for (int value : testValues) { responsiveContent.getSideNavLinks().get(value).click(); - responsiveContent.getResponsiveResults().get(value).has().text(String.format("Selected Nav Item %d", value)); + responsiveContent.getResponsiveResults().get(value).has().text(format("Selected Nav Item %d", value)); } } } diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/SnackbarTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/SnackbarTests.java index 6e57ad8a2a..52dbce0b17 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/SnackbarTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/SnackbarTests.java @@ -1,6 +1,6 @@ package io.github.epam.angular.tests.elements.complex; -import com.epam.jdi.tools.func.JAction; +import com.jdiai.tools.func.JAction; import io.github.epam.TestsInit; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/datepicker/BasicDatepickerTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/datepicker/BasicDatepickerTests.java index 2ee8e3eb4b..c4eb7d5882 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/datepicker/BasicDatepickerTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/datepicker/BasicDatepickerTests.java @@ -10,6 +10,7 @@ import static com.epam.jdi.light.angular.entities.DatepickerNavigation.*; import static com.epam.jdi.light.elements.composite.WebPage.refresh; +import static com.jdiai.tools.StringUtils.format; import static io.github.com.StaticSite.angularPage; import static io.github.com.pages.sections.DatepickerSection.basicDatepicker; @@ -169,8 +170,8 @@ public void checkNavigateToDayInNextMonths() { @Test public void checkEnabledMonthsAndYearsNavigation() { - String firstEnabledYearCell = String.format(CELL.getName(), 2016); - String lastEnabledYearCell = String.format(CELL.getName(), 2039); + String firstEnabledYearCell = format(CELL.getName(), 2016); + String lastEnabledYearCell = format(CELL.getName(), 2039); basicDatepicker.setDate(LocalDate.of(2020, 1, 1)); basicDatepicker.openYearsView(); basicDatepicker.has() diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/datepicker/MinMaxDatepickerTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/datepicker/MinMaxDatepickerTests.java index cc42fd9f8c..073104f23d 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/datepicker/MinMaxDatepickerTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/datepicker/MinMaxDatepickerTests.java @@ -8,6 +8,7 @@ import java.time.Year; import static com.epam.jdi.light.angular.entities.DatepickerNavigation.*; +import static com.jdiai.tools.StringUtils.format; import static io.github.com.StaticSite.angularPage; import static io.github.com.pages.sections.DatepickerSection.minMaxDatepicker; @@ -51,8 +52,8 @@ public void checkDisabledNextMonthNavigation() { @Test public void checkDisabledMonthsAndYearsNavigation() { - String firstDisabledYearCell = String.format(CELL.getName(), MIN_YEAR - 2); - String secondDisabledYearCell = String.format(CELL.getName(), MIN_YEAR - 1); + String firstDisabledYearCell = format(CELL.getName(), MIN_YEAR - 2); + String secondDisabledYearCell = format(CELL.getName(), MIN_YEAR - 1); minMaxDatepicker.openYearsView(); minMaxDatepicker.has().disabledNavigation(PREVIOUS_TWENTY_YEARS.getName(), NEXT_TWENTY_YEARS.getName(), firstDisabledYearCell, secondDisabledYearCell); diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/datepicker/TestsDatepickerBase.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/datepicker/TestsDatepickerBase.java index ba9e7b79e0..a98261a3d2 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/datepicker/TestsDatepickerBase.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/datepicker/TestsDatepickerBase.java @@ -7,9 +7,9 @@ import java.util.ArrayList; import java.util.List; +import static com.jdiai.tools.StringUtils.format; import static io.github.com.StaticSite.angularPage; import static io.github.epam.site.steps.States.shouldBeLoggedIn; -import static java.lang.String.format; public class TestsDatepickerBase extends TestsInit { public static final String CHOOSE_A_DATE = "Choose a date"; diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsBasicTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsBasicTests.java index e91e92ccfe..415a245782 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsBasicTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsBasicTests.java @@ -3,6 +3,7 @@ import org.testng.annotations.Test; import static io.github.com.pages.AngularPage.tabsSection; +import static com.jdiai.tools.StringUtils.format; public class TabsBasicTests extends TestsTabGroupBase { @@ -20,7 +21,7 @@ public void verifyTabsTitles() { @Test public void verifyTabPanelContentByNumber() { int tabNumberForTest = 3; - String stringForTest = String.format(DYNAMIC_CONTENT, tabNumberForTest); + String stringForTest = format(DYNAMIC_CONTENT, tabNumberForTest); tabsSection.basicTab.clickTab(tabNumberForTest); tabsSection.basicTab.is().assertTabPanelContent(stringForTest); } diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWIthAsyncLoadingContentTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWIthAsyncLoadingContentTests.java index 89971bb23a..54d6d53718 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWIthAsyncLoadingContentTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWIthAsyncLoadingContentTests.java @@ -3,6 +3,7 @@ import org.testng.annotations.Test; import static io.github.com.pages.AngularPage.tabsSection; +import static com.jdiai.tools.StringUtils.format; public class TabsWIthAsyncLoadingContentTests extends TestsTabGroupBase { @@ -20,7 +21,7 @@ public void verifyCustomThemeAsyncLoadingContentTabsTitles() { @Test public void verifyAsyncLoadingContentTabPanelContentByNumber() { int tabNumberForTest = 3; - String stringForTest = String.format(DYNAMIC_CONTENT, tabNumberForTest); + String stringForTest = format(DYNAMIC_CONTENT, tabNumberForTest); tabsSection.tabsAsyncLoadingContent.clickTab(tabNumberForTest); tabsSection.tabsAsyncLoadingContent.is().assertTabPanelContent(stringForTest); } diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWihLazilyLoadedContentTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWihLazilyLoadedContentTests.java index fa6793ee7c..7c344db03a 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWihLazilyLoadedContentTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWihLazilyLoadedContentTests.java @@ -8,6 +8,7 @@ import static com.epam.jdi.light.elements.composite.WebPage.refresh; import static io.github.com.pages.AngularPage.tabsSection; +import static com.jdiai.tools.StringUtils.format; public class TabsWihLazilyLoadedContentTests extends TestsTabGroupBase { @@ -30,7 +31,7 @@ public void verifyTabWithLazyLoadedContent() { SimpleDateFormat dateTimeInGMT = new SimpleDateFormat("MMM d, yyyy, h:mm:ss aa"); dateTimeInGMT.setTimeZone(TimeZone.getTimeZone("GMT+3")); String timeForTest = dateTimeInGMT.format(new Date()); - String stringForTest = String.format("Content %s - Loaded: %s", tabNumberForTest, timeForTest); + String stringForTest = format("Content %s - Loaded: %s", tabNumberForTest, timeForTest); tabsSection.tabsWithLazyLoadedContent.is().assertTabPanelContent(stringForTest); } diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithCustomLabelTemplateTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithCustomLabelTemplateTests.java index 3dacfbb5d5..069fbbfc56 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithCustomLabelTemplateTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithCustomLabelTemplateTests.java @@ -6,6 +6,7 @@ import java.util.List; import static io.github.com.pages.AngularPage.tabsSection; +import static com.jdiai.tools.StringUtils.format; public class TabsWithCustomLabelTemplateTests extends TestsTabGroupBase { @@ -24,7 +25,7 @@ public void verifyCustomLabelTemplateTabsTitles() { @Test public void verifyCustomLabelTemplateTabPanelContentByNumber() { int tabNumberForTest = 3; - String stringForTest = String.format(DYNAMIC_CONTENT, tabNumberForTest); + String stringForTest = format(DYNAMIC_CONTENT, tabNumberForTest); tabsSection.tabWithCustomLabel.clickTab(tabNumberForTest); tabsSection.tabWithCustomLabel.is().assertTabPanelContent(stringForTest); } diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithCustomizingThemesTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithCustomizingThemesTests.java index 7f0ccff111..ca7bc535a4 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithCustomizingThemesTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithCustomizingThemesTests.java @@ -3,6 +3,7 @@ import org.testng.annotations.Test; import static io.github.com.pages.AngularPage.tabsSection; +import static com.jdiai.tools.StringUtils.format; public class TabsWithCustomizingThemesTests extends TestsTabGroupBase { @@ -21,7 +22,7 @@ public void verifyCustomThemeTabsTitles() { @Test public void verifyCustomThemeTabPanelContentByNumber() { int tabNumberForTest = 3; - String stringForTest = String.format(DYNAMIC_CONTENT, tabNumberForTest); + String stringForTest = format(DYNAMIC_CONTENT, tabNumberForTest); tabsSection.tabGroupThemeExample.clickTab(tabNumberForTest); tabsSection.tabGroupThemeExample.is().assertTabPanelContent(stringForTest); } diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithDynamicallyChangingTabsTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithDynamicallyChangingTabsTests.java index ccf29510f9..f233b4c2cb 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithDynamicallyChangingTabsTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithDynamicallyChangingTabsTests.java @@ -6,6 +6,7 @@ import java.util.List; import static io.github.com.pages.AngularPage.tabsSection; +import static com.jdiai.tools.StringUtils.format; public class TabsWithDynamicallyChangingTabsTests extends TestsTabGroupBase { @@ -25,7 +26,7 @@ public void verifyActiveDynamicallyChangingTabPanelContentByText() { String tabForTest = "New"; tabsSection.addNewTabButton.click(); tabsSection.dynamicallyChangingTabs.clickTab(tabForTest); - String stringForTest = String.format("Contents for %s tab Delete Tab", tabForTest); + String stringForTest = format("Contents for %s tab Delete Tab", tabForTest); tabsSection.dynamicallyChangingTabs.is().assertTabPanelContent(stringForTest); } diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithHeadersOnTheBottomTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithHeadersOnTheBottomTests.java index 37c788bad1..97b12bc51a 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithHeadersOnTheBottomTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithHeadersOnTheBottomTests.java @@ -3,6 +3,7 @@ import org.testng.annotations.Test; import static io.github.com.pages.AngularPage.tabsSection; +import static com.jdiai.tools.StringUtils.format; public class TabsWithHeadersOnTheBottomTests extends TestsTabGroupBase { @@ -22,7 +23,7 @@ public void verifyTabsWithHeadersOnTheBottomTitles() { @Test public void verifyTabWithHeadersOnTheBottomPanelContentByNumber() { int tabNumberForTest = 3; - String stringForTest = String.format(DYNAMIC_CONTENT, tabNumberForTest); + String stringForTest = format(DYNAMIC_CONTENT, tabNumberForTest); tabsSection.tabWithHeadersOnTheBottom.clickTab(tabNumberForTest); tabsSection.tabWithHeadersOnTheBottom.is().assertTabPanelContent(stringForTest); } diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithNavBarTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithNavBarTests.java index 4e8c6f9388..62be3a4a72 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithNavBarTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/elements/complex/tabgroup/TabsWithNavBarTests.java @@ -7,6 +7,7 @@ import java.util.List; import static io.github.com.pages.AngularPage.tabsSection; +import static com.jdiai.tools.StringUtils.format; public class TabsWithNavBarTests extends TestsTabGroupBase { @@ -35,7 +36,7 @@ public void verifyTabsWithLinkTitlesAfterAdding() { tabsSection.addLinkButton.click(); tabsSection.addLinkButton.click(); int numberForTest = tabsSection.tabsNavBar.getTabLinksCount() - 1; - List listForTest = Collections.singletonList(String.format("Link %s", numberForTest)); + List listForTest = Collections.singletonList(format("Link %s", numberForTest)); tabsSection.tabsNavBar.is().assertTabsLinksTitles(listForTest); } diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/AutocompleteUnitTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/AutocompleteUnitTests.java index b31389c2eb..d4b1a993b4 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/AutocompleteUnitTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/AutocompleteUnitTests.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.angularPage; import static io.github.com.pages.AngularPage.autocompleteSection; import static io.github.epam.site.steps.States.shouldBeLoggedIn; diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/DatepickerContainerUnitTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/DatepickerContainerUnitTests.java index f0fdd0a9e2..042c9217bd 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/DatepickerContainerUnitTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/DatepickerContainerUnitTests.java @@ -21,6 +21,7 @@ import static io.github.epam.site.steps.States.shouldBeLoggedIn; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import static com.jdiai.tools.StringUtils.format; public class DatepickerContainerUnitTests extends TestsInit { private DatepickerContainer container; @@ -270,8 +271,8 @@ public void disabledNextMonthNavigationTest() { @Test public void disabledMonthsAndYearsNavigationTest() { - String firstDisabledYearCell = String.format(CELL.getName(), MIN_YEAR - 2); - String secondDisabledYearCell = String.format(CELL.getName(), MIN_YEAR - 1); + String firstDisabledYearCell = format(CELL.getName(), MIN_YEAR - 2); + String secondDisabledYearCell = format(CELL.getName(), MIN_YEAR - 1); minMaxDatepicker.show(); minMaxDatepicker.expand(); container.openYearsView(); @@ -282,7 +283,7 @@ public void disabledMonthsAndYearsNavigationTest() { @Test public void disabledSaturdayDaysTest() { String[] saturdays = new String[5]; - Arrays.stream(new String[] {" 1 ", " 8 ", " 15 ", " 22 ", " 29 "}).map(d -> String.format(CELL.getName(), d)) + Arrays.stream(new String[] {" 1 ", " 8 ", " 15 ", " 22 ", " 29 "}).map(d -> format(CELL.getName(), d)) .collect(Collectors.toList()).toArray(saturdays); filterDatepicker.show(); filterDatepicker.setDate(LocalDate.of(2020, 8, 1)); @@ -293,7 +294,7 @@ public void disabledSaturdayDaysTest() { @Test public void disabledSundayDaysTest() { String[] sundays = new String[4]; - Arrays.stream(new String[] {" 5 ", " 12 ", " 19 ", " 26 "}).map(d -> String.format(CELL.getName(), d)) + Arrays.stream(new String[] {" 5 ", " 12 ", " 19 ", " 26 "}).map(d -> format(CELL.getName(), d)) .collect(Collectors.toList()).toArray(sundays); filterDatepicker.show(); filterDatepicker.setDate(LocalDate.of(2020, 7, 1)); diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/DatepickerUnitTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/DatepickerUnitTests.java index a0bbc7faf0..498512aabc 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/DatepickerUnitTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/DatepickerUnitTests.java @@ -20,6 +20,7 @@ import static io.github.epam.site.steps.States.shouldBeLoggedIn; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import static com.jdiai.tools.StringUtils.format; public class DatepickerUnitTests extends TestsInit { @BeforeMethod(alwaysRun = true) @@ -334,8 +335,8 @@ public void checkEnabledYearsNavigationTest() { @Test public void checkDisabledYearsNavigationTest() { - String firstDisabledYearCell = String.format(CELL.getName(), MIN_YEAR - 2); - String secondDisabledYearCell = String.format(CELL.getName(), MIN_YEAR - 1); + String firstDisabledYearCell = format(CELL.getName(), MIN_YEAR - 2); + String secondDisabledYearCell = format(CELL.getName(), MIN_YEAR - 1); minMaxDatepicker.show(); minMaxDatepicker.clear(); minMaxDatepicker.openYearsView(); diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/PaginatorUnitTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/PaginatorUnitTests.java index 4e819e1000..2ee79542e1 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/PaginatorUnitTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/PaginatorUnitTests.java @@ -14,6 +14,7 @@ import static io.github.com.pages.sections.PaginatorSection.*; import static io.github.epam.site.steps.States.shouldBeLoggedIn; import static org.testng.Assert.*; +import static com.jdiai.tools.StringUtils.format; public class PaginatorUnitTests extends TestsInit { @@ -82,7 +83,7 @@ public void verifyRangeTest() { paginator.select(100); paginator.select(STEP); - String expected = String.format("1 – %d of %s", STEP, TOTAL); + String expected = format("1 – %d of %s", STEP, TOTAL); assertEquals(paginator.range(), expected); } } diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/TabGroupUnitTests.java b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/TabGroupUnitTests.java index d8fa266a1f..45cf3dac05 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/TabGroupUnitTests.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/angular/tests/unit/TabGroupUnitTests.java @@ -11,6 +11,7 @@ import static io.github.com.pages.AngularPage.tabsSection; import static io.github.epam.site.steps.States.shouldBeLoggedIn; import static org.testng.Assert.assertTrue; +import static com.jdiai.tools.StringUtils.format; public class TabGroupUnitTests extends TestsInit { @@ -56,7 +57,7 @@ public void tabIsHighlightedTest() { @Test public void tabPanelContainsValueTest() { int tabNumberForTest = 2; - String stringForTest = String.format("Content %s", tabNumberForTest); + String stringForTest = format("Content %s", tabNumberForTest); tabsSection.basicTab.clickTab(tabNumberForTest); assertTrue(tabsSection.basicTab.tabPanelContainsValue(stringForTest)); } diff --git a/jdi-light-angular-tests/src/test/java/io/github/epam/testng/TestNGListener.java b/jdi-light-angular-tests/src/test/java/io/github/epam/testng/TestNGListener.java index 2eab8017f3..72fd867a7b 100644 --- a/jdi-light-angular-tests/src/test/java/io/github/epam/testng/TestNGListener.java +++ b/jdi-light-angular-tests/src/test/java/io/github/epam/testng/TestNGListener.java @@ -1,6 +1,6 @@ package io.github.epam.testng; -import com.epam.jdi.tools.Safe; +import com.jdiai.tools.Safe; import org.testng.IInvokedMethod; import org.testng.IInvokedMethodListener; import org.testng.ITestNGMethod; @@ -13,7 +13,7 @@ import static com.epam.jdi.light.logger.AllureLogger.screenshotStep; import static com.epam.jdi.light.settings.WebSettings.TEST_NAME; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.last; +import static com.jdiai.tools.LinqUtils.last; import static java.lang.System.currentTimeMillis; public class TestNGListener implements IInvokedMethodListener { diff --git a/jdi-light-angular/pom.xml b/jdi-light-angular/pom.xml index 9465fd6864..2c70fa94d7 100644 --- a/jdi-light-angular/pom.xml +++ b/jdi-light-angular/pom.xml @@ -7,14 +7,14 @@ jdi-light-angular jar JDI Angular - 1.3.14 + 1.3.15 com.epam.jdi 1.9.6 1.12.6 1.8 - 2.13.1 + 2.15.0 2.10.0 9.4.12.RC2 @@ -23,7 +23,7 @@ com.epam.jdi jdi-light-html - 1.3.14 + 1.3.15 diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/actions/AngularActions.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/actions/AngularActions.java index 70746dcaff..59f81e9519 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/actions/AngularActions.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/actions/AngularActions.java @@ -9,7 +9,7 @@ import static com.epam.jdi.light.actions.ActionHelper.*; import static com.epam.jdi.light.actions.ActionProcessor.isTop; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; /** * Created by Roman Iovlev on 14.02.2018. diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/BottomSheetAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/BottomSheetAssert.java index 7723b04871..9be5df6348 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/BottomSheetAssert.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/BottomSheetAssert.java @@ -9,7 +9,7 @@ import java.util.List; import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; -import static com.epam.jdi.tools.LinqUtils.toStringArray; +import static com.jdiai.tools.LinqUtils.toStringArray; import static org.hamcrest.Matchers.hasItems; public class BottomSheetAssert extends UIAssert { diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/MaterialSelectorAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/MaterialSelectorAssert.java index 9acb909320..5db77a9494 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/MaterialSelectorAssert.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/MaterialSelectorAssert.java @@ -10,8 +10,8 @@ import java.util.Map; import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; -import static com.epam.jdi.tools.LinqUtils.toStringArray; +import static com.jdiai.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.LinqUtils.toStringArray; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasItems; diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/NativeSelectorAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/NativeSelectorAssert.java index 2598caed20..be0ab82353 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/NativeSelectorAssert.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/NativeSelectorAssert.java @@ -11,8 +11,8 @@ import java.util.Map; import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; -import static com.epam.jdi.tools.LinqUtils.toStringArray; +import static com.jdiai.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.LinqUtils.toStringArray; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasItems; diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/PaginatorAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/PaginatorAssert.java index 3b2bccce29..0d716c79e6 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/PaginatorAssert.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/PaginatorAssert.java @@ -8,6 +8,7 @@ import java.util.List; import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; +import static com.jdiai.tools.StringUtils.format; public class PaginatorAssert extends UIAssert { @JDIAction("Assert that '{name}' has '{0}' label") @@ -32,7 +33,7 @@ public void range() { @JDIAction("Assert that range is '{0}' – '{1}' of '{2}' for '{name}'") public void range(final int from, final int to, final int total) { - String expected = String.format("%d – %d of %d", from, to, total); + String expected = format("%d – %d of %d", from, to, total); jdiAssert(element().range(), Matchers.is(expected)); } diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/ProgressBarAssert.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/ProgressBarAssert.java index 90a5b32884..0f92ae3838 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/ProgressBarAssert.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/asserts/ProgressBarAssert.java @@ -5,7 +5,7 @@ import com.epam.jdi.light.angular.elements.enums.ProgressBarModes; import com.epam.jdi.light.asserts.generic.UIAssert; import com.epam.jdi.light.common.JDIAction; -import com.epam.jdi.tools.Timer; +import com.jdiai.tools.Timer; import org.hamcrest.Matcher; import org.hamcrest.Matchers; diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/AutoComplete.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/AutoComplete.java index 9c6851d29a..570a9d676d 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/AutoComplete.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/AutoComplete.java @@ -10,7 +10,7 @@ import com.epam.jdi.light.elements.interfaces.base.SetValue; import com.epam.jdi.light.elements.interfaces.common.IsInput; import com.epam.jdi.light.elements.interfaces.common.IsText; -import com.epam.jdi.tools.map.MapArray; +import com.jdiai.tools.map.MapArray; import org.openqa.selenium.By; import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/ButtonToggle.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/ButtonToggle.java index a0ea5598a6..4e031339ff 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/ButtonToggle.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/ButtonToggle.java @@ -7,6 +7,8 @@ import com.epam.jdi.light.elements.complex.WebList; import org.openqa.selenium.By; +import static com.jdiai.tools.StringUtils.format; + /** * To see an example of ButtonToggle web element please visit https://material.angular.io/components/button-toggle/overview. */ @@ -37,7 +39,7 @@ private WebList getButtonToggleItems() { public boolean isButtonToggleSelected(String value) { UIElement element = getButtonToggleByTagValue(value); if (isButtonToggleDisabled(value)) { - throw new UnsupportedOperationException(String.format("button toggle is disabled %s", value)); + throw new UnsupportedOperationException(format("button toggle is disabled %s", value)); } return element.attr("class").contains("checked"); } diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Datepicker.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Datepicker.java index 96d1e7de88..59d3e13334 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Datepicker.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Datepicker.java @@ -26,6 +26,7 @@ import static com.epam.jdi.light.angular.entities.DatepickerNavigation.DATEPICKER; import static com.epam.jdi.light.angular.entities.DatepickerNavigation.TOGGLE; import static com.epam.jdi.light.logger.LogLevels.DEBUG; +import static com.jdiai.tools.StringUtils.format; /** * To see an example of Datepicker web element please visit https://material.angular.io/components/datepicker/overview. @@ -410,45 +411,45 @@ public DatepickerAssert is() { } protected UIElement datepicker() { - return new UIElement(By.xpath(String.format(DATEPICKER.getName(), + return new UIElement(By.xpath(format(DATEPICKER.getName(), this.core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); } protected UIElement input() { - return new UIElement(By.xpath(String.format(inputLocator, + return new UIElement(By.xpath(format(inputLocator, this.core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); } protected UIElement toggle() { - return new UIElement(By.xpath(String.format(TOGGLE.getName(), + return new UIElement(By.xpath(format(TOGGLE.getName(), this.core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); } protected UIElement toggleButton() { - return new UIElement(By.xpath(String.format(toggleButton, - this.core().locator.printLocator().replace(smartSharp, "") - .replace(cssSharp, "").replace("'", "")))); + return new UIElement(By.xpath(format(toggleButton, + this.core().locator.printLocator().replace(smartSharp, "") + .replace(cssSharp, "").replace("'", "")))); } protected UIElement openButton() { String replaceExpression = this.core().locator.printLocator().replace(smartSharp, "").replace(cssSharp, "") .replace("'", ""); - return new UIElement(By.xpath(String.format(openButton, replaceExpression))); + return new UIElement(By.xpath(format(openButton, replaceExpression))); } protected WebList exampleEvents() { String replaceExpression = this.core().locator.printLocator().replace(smartSharp, "").replace(cssSharp, "") .replace("'", ""); - return new WebList(By.xpath(String.format(exampleEvents, replaceExpression))); + return new WebList(By.xpath(format(exampleEvents, replaceExpression))); } protected UIElement switchLocaleButton() { String replaceExpression = this.core().locator.printLocator().replace(smartSharp, "").replace(cssSharp, "") .replace("'", ""); - return new UIElement(By.xpath(String.format(switchLocaleButton, replaceExpression))); + return new UIElement(By.xpath(format(switchLocaleButton, replaceExpression))); } protected Point getOutsidePoint() { diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/ExpansionPanel.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/ExpansionPanel.java index 062ebdbf9f..20c4dbff6d 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/ExpansionPanel.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/ExpansionPanel.java @@ -14,6 +14,7 @@ import java.util.Locale; import static com.epam.jdi.light.settings.WebSettings.logger; +import static com.jdiai.tools.StringUtils.format; /** * To see an example of ExpansionPanel web element please visit https://material.angular.io/components/expansion/overview. @@ -149,62 +150,62 @@ public ExpansionPanelAssert is() { } protected List getHeadersLocator() { - return new WebList(By.xpath(String.format(headersLocator, core().locator.printLocator() + return new WebList(By.xpath(format(headersLocator, core().locator.printLocator() .replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); } protected List getContentsLocator() { - return new WebList(By.xpath(String.format(contentsLocator, this.core().locator.printLocator() + return new WebList(By.xpath(format(contentsLocator, this.core().locator.printLocator() .replace(smartSharp, "").replace(cssSharp, "").replace("'", "")))); } protected List getContentBodiesLocator() { - return new WebList(By.xpath(String.format(contentBodiesLocator, this.core().locator + return new WebList(By.xpath(format(contentBodiesLocator, this.core().locator .printLocator().replace(smartSharp, "").replace(cssSharp, "").replace("'", "")))); } protected UIElement getInputLocator(final String placeholder) { - return new UIElement(By.xpath(String.format(inputLocator, this.core().locator.printLocator() + return new UIElement(By.xpath(format(inputLocator, this.core().locator.printLocator() .replace(smartSharp, "").replace(cssSharp, "").replace("'", ""), placeholder))); } protected UIElement getNextButtonLocator(final String tittle) { - return new UIElement(By.xpath(String.format(nextButtonLocator, this.core().locator + return new UIElement(By.xpath(format(nextButtonLocator, this.core().locator .printLocator().replace(smartSharp, "").replace(cssSharp, "").replace("'", ""), tittle))); } protected UIElement getPreviousButtonLocator(final String tittle) { - return new UIElement(By.xpath(String.format(previousButtonLocator, + return new UIElement(By.xpath(format(previousButtonLocator, this.core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", ""), tittle))); } protected UIElement getEndButtonLocator(final String tittle) { - return new UIElement(By.xpath(String.format(endButtonLocator, + return new UIElement(By.xpath(format(endButtonLocator, this.core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", ""), tittle))); } protected List getTitlesLocator() { - return new WebList(By.xpath(String.format(titlesLocator, + return new WebList(By.xpath(format(titlesLocator, this.core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); } protected List getIconsLocator() { - return new WebList(By.xpath(String.format(iconsLocator, + return new WebList(By.xpath(format(iconsLocator, this.core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); } protected List getDescriptionsLocator() { - return new WebList(By.xpath(String.format(descriptionsLocator, + return new WebList(By.xpath(format(descriptionsLocator, this.core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); } protected List getExpansionIndicatorLocator() { - return new WebList(By.xpath(String.format(expansionIndicatorLocator, + return new WebList(By.xpath(format(expansionIndicatorLocator, this.core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); } diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/FormField.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/FormField.java index d5a5094679..030feb85a2 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/FormField.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/FormField.java @@ -6,7 +6,7 @@ import com.epam.jdi.light.elements.base.UIBaseElement; import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.complex.WebList; -import com.epam.jdi.tools.map.MapArray; +import com.jdiai.tools.map.MapArray; import org.openqa.selenium.By; import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/MaterialSelector.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/MaterialSelector.java index 8f5b454fed..b84a6a6155 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/MaterialSelector.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/MaterialSelector.java @@ -13,6 +13,7 @@ import java.util.Map; import static com.epam.jdi.light.logger.LogLevels.DEBUG; +import static com.jdiai.tools.StringUtils.format; /** * To see an example of MaterialSelector web element please visit https://material.angular.io/components/select/overview. @@ -210,7 +211,7 @@ public boolean color(final int red, final int green, final int blue, final doubl * @return UIElement with hint text */ public UIElement hint() { - return new UIElement(By.xpath(String.format(hintLocator, + return new UIElement(By.xpath(format(hintLocator, this.core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); } @@ -221,7 +222,7 @@ public UIElement hint() { * @return UIElement with error text */ public UIElement error() { - return new UIElement(By.xpath(String.format(errorLocator, + return new UIElement(By.xpath(format(errorLocator, this.core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); } @@ -232,7 +233,7 @@ public MaterialSelectorAssert is() { } protected UIElement toggle() { - return new UIElement(By.xpath(String.format(toggle, + return new UIElement(By.xpath(format(toggle, this.core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); } diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/NativeSelector.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/NativeSelector.java index 77ae112388..b77dc2fca7 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/NativeSelector.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/NativeSelector.java @@ -17,7 +17,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.epam.jdi.tools.LinqUtils.map; +import static com.jdiai.tools.LinqUtils.map; +import static com.jdiai.tools.StringUtils.format; /** * To see an example of NativeSelector web element please visit https://material.angular.io/components/select/overview. @@ -118,7 +119,7 @@ public List values(final TextTypes type) { @JDIAction("Get '{name}' groups") public List groups() { List groups = new ArrayList<>(); - WebList webList = new WebList(By.cssSelector(String.format(groupsAndOptionsList, + WebList webList = new WebList(By.cssSelector(format(groupsAndOptionsList, core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); int groupSize = webList.values().size(); for (int i = 0; i < groupSize; i++) { @@ -135,7 +136,7 @@ public List groups() { @JDIAction("Get '{name}' groups and options") public Map> groupsAndOptions() { Map> map = new LinkedHashMap<>(); - WebList webList = new WebList(By.cssSelector(String.format(groupsAndOptionsList, + WebList webList = new WebList(By.cssSelector(format(groupsAndOptionsList, core().locator.printLocator() .replace(smartSharp, "").replace(cssSharp, "").replace("'", "")))); int groupSize = webList.values().size(); for (int i = 0; i < groupSize; i++) { @@ -181,7 +182,7 @@ public NativeSelectorAssert is() { * @return UIElement with hint text */ public UIElement hint() { - return new UIElement(By.xpath(String.format(hintLocator, core().locator.printLocator() + return new UIElement(By.xpath(format(hintLocator, core().locator.printLocator() .replace(smartSharp, "").replace(cssSharp, "").replace("'", "")))); } @@ -191,7 +192,7 @@ public UIElement hint() { * @return UIElement with error text */ public UIElement error() { - return new UIElement(By.xpath(String.format(errorLocator, core().locator.printLocator() + return new UIElement(By.xpath(format(errorLocator, core().locator.printLocator() .replace(smartSharp, "").replace(cssSharp, "").replace("'", "")))); } } diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Ripple.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Ripple.java index 9e932f1f41..cc11bb0b57 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Ripple.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/complex/Ripple.java @@ -10,6 +10,7 @@ import org.openqa.selenium.Point; import static com.epam.jdi.light.logger.LogLevels.DEBUG; +import static com.jdiai.tools.StringUtils.format; /** * To see an example of Ripple web element please visit https://material.angular.io/components/ripple/overview. @@ -247,41 +248,41 @@ public RippleAssert is() { } protected UIElement container() { - return new UIElement(By.xpath(String.format(containerLocator, core().locator.printLocator() + return new UIElement(By.xpath(format(containerLocator, core().locator.printLocator() .replace(smartSharp, "").replace(cssSharp, "").replace("'", "")))); } protected UIElement getRipple() { - return new UIElement(By.xpath(String.format(rippleLocator, core().locator.printLocator() + return new UIElement(By.xpath(format(rippleLocator, core().locator.printLocator() .replace(smartSharp, "").replace(cssSharp, "").replace("'", "")))); } protected UIElement centeredCheckbox() { - return new UIElement(By.xpath(String.format(centeredCheckboxLocator, + return new UIElement(By.xpath(format(centeredCheckboxLocator, core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); } protected UIElement disabledCheckbox() { - return new UIElement(By.xpath(String.format(disabledCheckboxLocator, + return new UIElement(By.xpath(format(disabledCheckboxLocator, core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); } protected UIElement unboundedCheckbox() { - return new UIElement(By.xpath(String.format(unboundedCheckboxLocator, + return new UIElement(By.xpath(format(unboundedCheckboxLocator, core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); } protected UIElement getRadiusInput() { - return new UIElement(By.xpath(String.format(radiusLocator, + return new UIElement(By.xpath(format(radiusLocator, core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); } protected UIElement getColorInput() { - return new UIElement(By.xpath(String.format(colorLocator, + return new UIElement(By.xpath(format(colorLocator, core().locator.printLocator().replace(smartSharp, "") .replace(cssSharp, "").replace("'", "")))); } diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/composite/DatepickerContainer.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/composite/DatepickerContainer.java index 5389a5f324..1ca67ac448 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/composite/DatepickerContainer.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/composite/DatepickerContainer.java @@ -18,6 +18,7 @@ import java.util.stream.Collectors; import static com.epam.jdi.light.angular.entities.DatepickerNavigation.*; +import static com.jdiai.tools.StringUtils.format; public class DatepickerContainer extends Section { public static final int YEAR_LENGTH = 4; @@ -249,7 +250,7 @@ public void openYearsView() { public String[] getWeekDayNumbers(final DatepickerNavigation weekName) { WebList webList = getColumn(weekName.ordinal()); String[] list = new String[webList.size()]; - webList.stream().map(e -> String.format(CELL.getName().replace("%s", " %s "), e.getValue())) + webList.stream().map(e -> format(CELL.getName().replace("%s", " %s "), e.getValue())) .collect(Collectors.toList()).toArray(list); return list; } @@ -294,24 +295,24 @@ protected UIElement getActiveDay() { protected UIElement getMonth(final String month, final Locale locale) { String monthShort = Month.valueOf(month).getDisplayName(TextStyle.SHORT, locale).toUpperCase(); - return new UIElement(By.xpath(String.format(CELL.getName(), monthShort))); + return new UIElement(By.xpath(format(CELL.getName(), monthShort))); } protected UIElement getMonth(final int month, final Locale locale) { String monthShort = Month.of(month).getDisplayName(TextStyle.SHORT, locale).toUpperCase(); - return new UIElement(By.xpath(String.format(value, monthShort))); + return new UIElement(By.xpath(format(value, monthShort))); } protected UIElement getDay(final String day) { - return new UIElement(By.xpath(String.format(value.replace("%s", " %s "), day))); + return new UIElement(By.xpath(format(value.replace("%s", " %s "), day))); } protected UIElement getDay(final int day) { - return new UIElement(By.xpath(String.format(value.replace("%s", " %s "), day))); + return new UIElement(By.xpath(format(value.replace("%s", " %s "), day))); } protected UIElement getYear(final int year) { - return new UIElement(By.xpath(String.format(value, year))); + return new UIElement(By.xpath(format(value, year))); } protected UIElement getPreviousMonth() { @@ -331,7 +332,7 @@ protected UIElement getNextTwentyYears() { } protected WebList getColumn(final int columnNumber) { - return new WebList(By.xpath(String.format(columnLocator, columnNumber))); + return new WebList(By.xpath(format(columnLocator, columnNumber))); } protected Point getOutsidePoint() { diff --git a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/composite/MaterialSelectorContainer.java b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/composite/MaterialSelectorContainer.java index 4f76e5257d..accacb3b7e 100644 --- a/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/composite/MaterialSelectorContainer.java +++ b/jdi-light-angular/src/main/java/com/epam/jdi/light/angular/elements/composite/MaterialSelectorContainer.java @@ -14,6 +14,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import static com.jdiai.tools.StringUtils.format; + public class MaterialSelectorContainer extends Section { public String backdropSelectPanel = "div.mat-select-panel.mat-primary"; public String groupsAndOptionsList = "div.mat-select-panel.mat-primary mat-optgroup"; @@ -189,7 +191,7 @@ public List listDisabled() { @JDIAction("Check that rgba({0}, {1}, {2}, {3}) is the specified color") public boolean color(final int red, final int green, final int blue, final double a) { boolean hasColor = getBackdropSelectPanel().css("background-color") - .equalsIgnoreCase(String.format("rgba(%s, %s, %s, %s)", red, green, blue, a)); + .equalsIgnoreCase(format("rgba(%s, %s, %s, %s)", red, green, blue, a)); collapsePanel(); return hasColor; } diff --git a/jdi-light-applitools-tests/pom.xml b/jdi-light-applitools-tests/pom.xml index 0ebe0c0ed0..bce02ebb1d 100644 --- a/jdi-light-applitools-tests/pom.xml +++ b/jdi-light-applitools-tests/pom.xml @@ -7,7 +7,7 @@ jdi-light-applitools-tests Tests: JDI Light Applitools Eyes jar - 1.3.14 + 1.3.15 com.epam.jdi @@ -17,7 +17,7 @@ chrome https://jdi-testing.github.io/jdi-light/ 1.9.6 - 2.13.8 + 2.15.0 2.10.0 9.4.12.RC2 @@ -26,19 +26,19 @@ org.testng testng - 6.14.3 + 7.4.0 test com.epam.jdi jdi-light-html - 1.3.14 + 1.3.15 com.epam.jdi jdi-light-eyes - 1.3.14 + 1.3.15 io.qameta.allure @@ -119,4 +119,4 @@ - \ No newline at end of file + diff --git a/jdi-light-applitools-tests/src/main/java/jdisite/custom/MultiSelect.java b/jdi-light-applitools-tests/src/main/java/jdisite/custom/MultiSelect.java index 77bca2656f..91eb0815c9 100644 --- a/jdi-light-applitools-tests/src/main/java/jdisite/custom/MultiSelect.java +++ b/jdi-light-applitools-tests/src/main/java/jdisite/custom/MultiSelect.java @@ -13,7 +13,7 @@ import java.util.List; import static com.epam.jdi.light.logger.LogLevels.DEBUG; -import static com.epam.jdi.tools.LinqUtils.map; +import static com.jdiai.tools.LinqUtils.map; import static org.apache.commons.lang3.StringUtils.isBlank; public class MultiSelect extends UIListBase> implements HasLabel { diff --git a/jdi-light-applitools-tests/src/main/java/jdisite/entities/ContactInfo.java b/jdi-light-applitools-tests/src/main/java/jdisite/entities/ContactInfo.java index 4697fb2736..45334f5fc2 100644 --- a/jdi-light-applitools-tests/src/main/java/jdisite/entities/ContactInfo.java +++ b/jdi-light-applitools-tests/src/main/java/jdisite/entities/ContactInfo.java @@ -5,7 +5,7 @@ * Email: roman.iovlev.jdi@gmail.com; Skype: roman.iovlev */ -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class ContactInfo extends DataClass { public String firstName, lastName, position, gender, religion, weather, description; diff --git a/jdi-light-applitools-tests/src/main/java/jdisite/entities/MarvelUserInfo.java b/jdi-light-applitools-tests/src/main/java/jdisite/entities/MarvelUserInfo.java index 7b5d48affa..d9aba7789f 100644 --- a/jdi-light-applitools-tests/src/main/java/jdisite/entities/MarvelUserInfo.java +++ b/jdi-light-applitools-tests/src/main/java/jdisite/entities/MarvelUserInfo.java @@ -1,6 +1,6 @@ package jdisite.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class MarvelUserInfo extends DataClass { public String number, type, user, description; diff --git a/jdi-light-applitools-tests/src/main/java/jdisite/entities/User.java b/jdi-light-applitools-tests/src/main/java/jdisite/entities/User.java index 092f9de628..ffec140bc6 100644 --- a/jdi-light-applitools-tests/src/main/java/jdisite/entities/User.java +++ b/jdi-light-applitools-tests/src/main/java/jdisite/entities/User.java @@ -5,7 +5,7 @@ * Email: roman.iovlev.jdi@gmail.com; Skype: roman.iovlev */ -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class User extends DataClass { public String name, password; diff --git a/jdi-light-applitools-tests/src/main/java/org/mytests/uiobjects/example/entities/MarvelUserInfo.java b/jdi-light-applitools-tests/src/main/java/org/mytests/uiobjects/example/entities/MarvelUserInfo.java index ae93b2148f..fa5ef437c4 100644 --- a/jdi-light-applitools-tests/src/main/java/org/mytests/uiobjects/example/entities/MarvelUserInfo.java +++ b/jdi-light-applitools-tests/src/main/java/org/mytests/uiobjects/example/entities/MarvelUserInfo.java @@ -1,6 +1,6 @@ package org.mytests.uiobjects.example.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class MarvelUserInfo extends DataClass { public String number, type, user, description; diff --git a/jdi-light-applitools-tests/src/main/java/org/mytests/uiobjects/example/entities/User.java b/jdi-light-applitools-tests/src/main/java/org/mytests/uiobjects/example/entities/User.java index 718c22dcf1..e63afd1b2d 100644 --- a/jdi-light-applitools-tests/src/main/java/org/mytests/uiobjects/example/entities/User.java +++ b/jdi-light-applitools-tests/src/main/java/org/mytests/uiobjects/example/entities/User.java @@ -1,7 +1,7 @@ package org.mytests.uiobjects.example.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class User extends DataClass { public String name, password; diff --git a/jdi-light-applitools-tests/src/test/java/com/jdi/testng/RetryListenerClass.java b/jdi-light-applitools-tests/src/test/java/com/jdi/testng/RetryListenerClass.java index beb91f49b2..4731edae67 100644 --- a/jdi-light-applitools-tests/src/test/java/com/jdi/testng/RetryListenerClass.java +++ b/jdi-light-applitools-tests/src/test/java/com/jdi/testng/RetryListenerClass.java @@ -15,10 +15,10 @@ public class RetryListenerClass implements IAnnotationTransformer { @Override - public void transform(ITestAnnotation testannotation, Class testClass, Constructor testConstructor, Method testMethod) { - IRetryAnalyzer retry = testannotation.getRetryAnalyzer(); + public void transform(ITestAnnotation testAnnotation, Class testClass, Constructor testConstructor, Method testMethod) { + Class retry = testAnnotation.getRetryAnalyzerClass(); if (retry == null) { - testannotation.setRetryAnalyzer(RetryFailedTestCases.class); + testAnnotation.setRetryAnalyzer(RetryFailedTestCases.class); } } diff --git a/jdi-light-bootstrap-tests/pom.xml b/jdi-light-bootstrap-tests/pom.xml index 7f837baf53..802abcb4a6 100644 --- a/jdi-light-bootstrap-tests/pom.xml +++ b/jdi-light-bootstrap-tests/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 1.3.14 + 1.3.15 jdi-light-bootstrap-tests Tests: JDI Bootstrap com.epam.jdi @@ -13,7 +13,7 @@ chrome 2.10.0 - 2.13.8 + 2.15.0 9.4.12.RC2 1.9.6 @@ -23,7 +23,7 @@ com.epam.jdi jdi-light-bootstrap - 1.3.14 + 1.3.15 @@ -42,7 +42,8 @@ org.testng testng - 6.14.3 + 7.4.0 + test @@ -129,4 +130,4 @@ - \ No newline at end of file + diff --git a/jdi-light-bootstrap-tests/src/main/java/io/github/com/custom/FullName.java b/jdi-light-bootstrap-tests/src/main/java/io/github/com/custom/FullName.java index 234450eafc..e4fd2dcc71 100644 --- a/jdi-light-bootstrap-tests/src/main/java/io/github/com/custom/FullName.java +++ b/jdi-light-bootstrap-tests/src/main/java/io/github/com/custom/FullName.java @@ -6,7 +6,7 @@ import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI; import com.epam.jdi.light.ui.html.elements.common.TextField; -import static java.lang.String.format; +import static com.jdiai.tools.StringUtils.format; import static org.apache.commons.lang3.StringUtils.isNotBlank; public class FullName extends UIBaseElement implements IsText { diff --git a/jdi-light-bootstrap-tests/src/main/java/io/github/com/entities/SlideInfo.java b/jdi-light-bootstrap-tests/src/main/java/io/github/com/entities/SlideInfo.java index b39c3a0dfc..a46de2134f 100644 --- a/jdi-light-bootstrap-tests/src/main/java/io/github/com/entities/SlideInfo.java +++ b/jdi-light-bootstrap-tests/src/main/java/io/github/com/entities/SlideInfo.java @@ -1,8 +1,8 @@ package io.github.com.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; -import static java.lang.String.format; +import static com.jdiai.tools.StringUtils.format; public class SlideInfo extends DataClass { public String title, image, text, src; diff --git a/jdi-light-bootstrap-tests/src/main/java/io/github/com/entities/User.java b/jdi-light-bootstrap-tests/src/main/java/io/github/com/entities/User.java index 9e8f46664b..3028d48da1 100644 --- a/jdi-light-bootstrap-tests/src/main/java/io/github/com/entities/User.java +++ b/jdi-light-bootstrap-tests/src/main/java/io/github/com/entities/User.java @@ -1,7 +1,7 @@ package io.github.com.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class User extends DataClass { public String name = "Roman", password = "Jdi1234"; diff --git a/jdi-light-bootstrap-tests/src/main/java/io/github/com/sections/Slide.java b/jdi-light-bootstrap-tests/src/main/java/io/github/com/sections/Slide.java index 843e7b6996..9af4ea564b 100644 --- a/jdi-light-bootstrap-tests/src/main/java/io/github/com/sections/Slide.java +++ b/jdi-light-bootstrap-tests/src/main/java/io/github/com/sections/Slide.java @@ -8,7 +8,7 @@ import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI; import com.epam.jdi.light.ui.html.elements.common.Text; -import static java.lang.String.format; +import static com.jdiai.tools.StringUtils.format; public class Slide extends Section implements IsText, HasAssert { @UI("h5") public Label title; diff --git a/jdi-light-bootstrap-tests/src/test/java/io/github/epam/bootstrap/tests/BaseValidationsUtils.java b/jdi-light-bootstrap-tests/src/test/java/io/github/epam/bootstrap/tests/BaseValidationsUtils.java index 4579dbb74b..dec74c9680 100644 --- a/jdi-light-bootstrap-tests/src/test/java/io/github/epam/bootstrap/tests/BaseValidationsUtils.java +++ b/jdi-light-bootstrap-tests/src/test/java/io/github/epam/bootstrap/tests/BaseValidationsUtils.java @@ -1,14 +1,14 @@ package io.github.epam.bootstrap.tests; import com.epam.jdi.light.elements.interfaces.base.ICoreElement; -import com.epam.jdi.tools.func.JAction; -import com.epam.jdi.tools.func.JFunc; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.func.JAction; +import com.jdiai.tools.func.JFunc; +import com.jdiai.tools.pairs.Pair; import org.openqa.selenium.Dimension; import org.openqa.selenium.Point; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.pairs.Pair.$; +import static com.jdiai.tools.pairs.Pair.$; import static java.lang.System.currentTimeMillis; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; diff --git a/jdi-light-bootstrap-tests/src/test/java/io/github/epam/bootstrap/tests/common/ButtonTests.java b/jdi-light-bootstrap-tests/src/test/java/io/github/epam/bootstrap/tests/common/ButtonTests.java index ba84fd5a07..75f7cc4344 100644 --- a/jdi-light-bootstrap-tests/src/test/java/io/github/epam/bootstrap/tests/common/ButtonTests.java +++ b/jdi-light-bootstrap-tests/src/test/java/io/github/epam/bootstrap/tests/common/ButtonTests.java @@ -9,7 +9,7 @@ import static com.epam.jdi.light.driver.get.OsTypes.WIN; import static com.epam.jdi.light.elements.common.Alerts.validateAndAcceptAlert; import static com.epam.jdi.light.elements.common.Keyboard.press; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.bsPage; import static io.github.com.pages.BootstrapPage.*; import static io.github.epam.bootstrap.tests.BaseValidationsUtils.baseValidation; diff --git a/jdi-light-bootstrap-tests/src/test/java/io/github/epam/bootstrap/tests/complex/DropdownMenuSplitTests.java b/jdi-light-bootstrap-tests/src/test/java/io/github/epam/bootstrap/tests/complex/DropdownMenuSplitTests.java index fccb1f6ba8..85171acdb8 100644 --- a/jdi-light-bootstrap-tests/src/test/java/io/github/epam/bootstrap/tests/complex/DropdownMenuSplitTests.java +++ b/jdi-light-bootstrap-tests/src/test/java/io/github/epam/bootstrap/tests/complex/DropdownMenuSplitTests.java @@ -8,7 +8,7 @@ import static com.epam.jdi.light.elements.common.Alerts.validateAndAcceptAlert; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.bsPage; import static io.github.com.pages.BootstrapPage.dropdownMenuSplit; import static io.github.epam.bootstrap.tests.BaseValidationsUtils.baseValidation; diff --git a/jdi-light-bootstrap-tests/src/test/java/io/github/epam/bootstrap/tests/complex/DropdownMenuTests.java b/jdi-light-bootstrap-tests/src/test/java/io/github/epam/bootstrap/tests/complex/DropdownMenuTests.java index d66e6ce5a1..46bb13b2b4 100644 --- a/jdi-light-bootstrap-tests/src/test/java/io/github/epam/bootstrap/tests/complex/DropdownMenuTests.java +++ b/jdi-light-bootstrap-tests/src/test/java/io/github/epam/bootstrap/tests/complex/DropdownMenuTests.java @@ -8,7 +8,7 @@ import static com.epam.jdi.light.elements.common.Alerts.validateAndAcceptAlert; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.bsPage; import static io.github.com.pages.BootstrapPage.dropdownMenu; import static io.github.epam.bootstrap.tests.BaseValidationsUtils.baseValidation; diff --git a/jdi-light-bootstrap-tests/src/test/java/io/github/epam/test/data/CardImageData.java b/jdi-light-bootstrap-tests/src/test/java/io/github/epam/test/data/CardImageData.java index f0c07eaa17..58ffc68314 100644 --- a/jdi-light-bootstrap-tests/src/test/java/io/github/epam/test/data/CardImageData.java +++ b/jdi-light-bootstrap-tests/src/test/java/io/github/epam/test/data/CardImageData.java @@ -1,6 +1,6 @@ package io.github.epam.test.data; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class CardImageData extends DataClass { public String srcAttr = "https://jdi-testing.github.io/jdi-light/images/captain-america.jpg"; diff --git a/jdi-light-bootstrap-tests/src/test/java/io/github/epam/testng/RetryListenerClass.java b/jdi-light-bootstrap-tests/src/test/java/io/github/epam/testng/RetryListenerClass.java index 72123ee713..53858deb21 100644 --- a/jdi-light-bootstrap-tests/src/test/java/io/github/epam/testng/RetryListenerClass.java +++ b/jdi-light-bootstrap-tests/src/test/java/io/github/epam/testng/RetryListenerClass.java @@ -10,10 +10,10 @@ public class RetryListenerClass implements IAnnotationTransformer { @Override - public void transform(ITestAnnotation testannotation, Class testClass, Constructor testConstructor, Method testMethod) { - IRetryAnalyzer retry = testannotation.getRetryAnalyzer(); + public void transform(ITestAnnotation testAnnotation, Class testClass, Constructor testConstructor, Method testMethod) { + Class retry = testAnnotation.getRetryAnalyzerClass(); if (retry == null) { - testannotation.setRetryAnalyzer(RetryFailedTestCases.class); + testAnnotation.setRetryAnalyzer(RetryFailedTestCases.class); } } diff --git a/jdi-light-bootstrap-tests/src/test/java/io/github/epam/testng/TestNGListener.java b/jdi-light-bootstrap-tests/src/test/java/io/github/epam/testng/TestNGListener.java index 7c136a3521..22b616fd97 100644 --- a/jdi-light-bootstrap-tests/src/test/java/io/github/epam/testng/TestNGListener.java +++ b/jdi-light-bootstrap-tests/src/test/java/io/github/epam/testng/TestNGListener.java @@ -5,7 +5,7 @@ * Email: roman.iovlev.jdi@gmail.com; Skype: roman.iovlev */ -import com.epam.jdi.tools.Safe; +import com.jdiai.tools.Safe; import org.testng.IInvokedMethod; import org.testng.IInvokedMethodListener; import org.testng.ITestResult; diff --git a/jdi-light-bootstrap/pom.xml b/jdi-light-bootstrap/pom.xml index a2203724d9..775c20e2bf 100644 --- a/jdi-light-bootstrap/pom.xml +++ b/jdi-light-bootstrap/pom.xml @@ -7,7 +7,7 @@ jdi-light-bootstrap JDI Light Bootstrap Elements jar - 1.3.14 + 1.3.15 com.epam.jdi @@ -20,7 +20,7 @@ com.epam.jdi jdi-light-html - 1.3.14 + 1.3.15 diff --git a/jdi-light-bootstrap/src/main/java/com/epam/jdi/light/ui/bootstrap/actions/BSActions.java b/jdi-light-bootstrap/src/main/java/com/epam/jdi/light/ui/bootstrap/actions/BSActions.java index 39b5db5db2..0aace73a8d 100644 --- a/jdi-light-bootstrap/src/main/java/com/epam/jdi/light/ui/bootstrap/actions/BSActions.java +++ b/jdi-light-bootstrap/src/main/java/com/epam/jdi/light/ui/bootstrap/actions/BSActions.java @@ -14,7 +14,7 @@ import static com.epam.jdi.light.actions.ActionHelper.*; import static com.epam.jdi.light.actions.ActionProcessor.isTop; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; @SuppressWarnings("unused") @Aspect diff --git a/jdi-light-bootstrap/src/main/java/com/epam/jdi/light/ui/bootstrap/elements/common/Progress.java b/jdi-light-bootstrap/src/main/java/com/epam/jdi/light/ui/bootstrap/elements/common/Progress.java index 2e9bbc14c2..0a6c967f74 100644 --- a/jdi-light-bootstrap/src/main/java/com/epam/jdi/light/ui/bootstrap/elements/common/Progress.java +++ b/jdi-light-bootstrap/src/main/java/com/epam/jdi/light/ui/bootstrap/elements/common/Progress.java @@ -4,7 +4,7 @@ import com.epam.jdi.light.elements.base.UIBaseElement; import com.epam.jdi.light.elements.interfaces.base.HasValue; import com.epam.jdi.light.ui.bootstrap.asserts.ProgressAssert; -import com.epam.jdi.tools.PrintUtils; +import com.jdiai.tools.PrintUtils; import java.util.List; diff --git a/jdi-light-bootstrap/src/main/java/com/epam/jdi/light/ui/bootstrap/elements/complex/Carousel.java b/jdi-light-bootstrap/src/main/java/com/epam/jdi/light/ui/bootstrap/elements/complex/Carousel.java index ecfb284859..2186972f7e 100644 --- a/jdi-light-bootstrap/src/main/java/com/epam/jdi/light/ui/bootstrap/elements/complex/Carousel.java +++ b/jdi-light-bootstrap/src/main/java/com/epam/jdi/light/ui/bootstrap/elements/complex/Carousel.java @@ -21,8 +21,8 @@ import static com.epam.jdi.light.common.UIUtils.asEntity; import static com.epam.jdi.light.common.UIUtils.initT; import static com.epam.jdi.light.logger.LogLevels.DEBUG; -import static com.epam.jdi.tools.ReflectionUtils.getGenericTypes; -import static com.epam.jdi.tools.ReflectionUtils.isClass; +import static com.jdiai.tools.ReflectionUtils.getGenericTypes; +import static com.jdiai.tools.ReflectionUtils.isClass; /** * To see an example of Carousel web element please visit https://getbootstrap.com/docs/4.3/components/carousel/#example diff --git a/jdi-light-bootstrap/src/main/java/com/epam/jdi/light/ui/bootstrap/elements/complex/RadioButtons.java b/jdi-light-bootstrap/src/main/java/com/epam/jdi/light/ui/bootstrap/elements/complex/RadioButtons.java index a57d221b80..3e760c156e 100644 --- a/jdi-light-bootstrap/src/main/java/com/epam/jdi/light/ui/bootstrap/elements/complex/RadioButtons.java +++ b/jdi-light-bootstrap/src/main/java/com/epam/jdi/light/ui/bootstrap/elements/complex/RadioButtons.java @@ -2,7 +2,7 @@ import com.epam.jdi.light.common.ElementArea; import com.epam.jdi.light.elements.complex.WebList; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc1; import org.openqa.selenium.WebElement; import static com.epam.jdi.light.common.SearchStrategies.ANY_ELEMENT; diff --git a/jdi-light-eyes/pom.xml b/jdi-light-eyes/pom.xml index 0377ef552d..ce778c772e 100644 --- a/jdi-light-eyes/pom.xml +++ b/jdi-light-eyes/pom.xml @@ -7,7 +7,7 @@ jdi-light-eyes JDI Light Applitools Eyes jar - 1.3.14 + 1.3.15 com.epam.jdi @@ -19,7 +19,7 @@ com.epam.jdi jdi-light - 1.3.14 + 1.3.15 diff --git a/jdi-light-eyes/src/main/java/com/epam/jdi/eyes/EyesConfig.java b/jdi-light-eyes/src/main/java/com/epam/jdi/eyes/EyesConfig.java index f588aca860..70dda9a138 100644 --- a/jdi-light-eyes/src/main/java/com/epam/jdi/eyes/EyesConfig.java +++ b/jdi-light-eyes/src/main/java/com/epam/jdi/eyes/EyesConfig.java @@ -9,15 +9,15 @@ import com.epam.jdi.light.common.VisualCheckAction; import com.epam.jdi.light.common.VisualCheckPage; import com.epam.jdi.light.driver.WebDriverFactory; -import com.epam.jdi.tools.DataClass; -import com.epam.jdi.tools.Timer; -import com.epam.jdi.tools.func.JFunc; +import com.jdiai.tools.DataClass; +import com.jdiai.tools.Timer; +import com.jdiai.tools.func.JFunc; import org.openqa.selenium.WebDriver; import static com.epam.jdi.eyes.JDIEyes.EYES_CONFIG; import static com.epam.jdi.light.settings.WebSettings.VISUAL_ACTION_STRATEGY; import static com.epam.jdi.light.settings.WebSettings.VISUAL_PAGE_STRATEGY; -import static com.epam.jdi.tools.StringUtils.format; +import static com.jdiai.tools.StringUtils.format; public class EyesConfig extends DataClass { public String appName; diff --git a/jdi-light-eyes/src/main/java/com/epam/jdi/eyes/JDIEyes.java b/jdi-light-eyes/src/main/java/com/epam/jdi/eyes/JDIEyes.java index 6630f5e3bf..47b936a68e 100644 --- a/jdi-light-eyes/src/main/java/com/epam/jdi/eyes/JDIEyes.java +++ b/jdi-light-eyes/src/main/java/com/epam/jdi/eyes/JDIEyes.java @@ -12,7 +12,7 @@ import com.epam.jdi.light.elements.composite.WebPage; import com.epam.jdi.light.elements.interfaces.base.IBaseElement; import com.epam.jdi.light.elements.interfaces.base.INamed; -import com.epam.jdi.tools.Safe; +import com.jdiai.tools.Safe; import org.aspectj.lang.ProceedingJoinPoint; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebElement; @@ -29,8 +29,8 @@ import static com.epam.jdi.light.common.VisualCheckAction.ON_VISUAL_ACTION; import static com.epam.jdi.light.common.VisualCheckPage.CHECK_NEW_PAGE; import static com.epam.jdi.light.elements.init.PageFactory.initSite; -import static com.epam.jdi.tools.ReflectionUtils.isClass; -import static java.lang.String.format; +import static com.jdiai.tools.ReflectionUtils.isClass; +import static com.jdiai.tools.StringUtils.format; public class JDIEyes { public static EyesConfig EYES_CONFIG = new EyesConfig(); diff --git a/jdi-light-html-tests/pom.xml b/jdi-light-html-tests/pom.xml index 47b6f74cc9..3eb7614cfe 100644 --- a/jdi-light-html-tests/pom.xml +++ b/jdi-light-html-tests/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 1.3.14 + 1.3.15 jdi-light-html-tests Tests: JDI Html com.epam.jdi @@ -13,7 +13,7 @@ chrome false - 2.13.8 + 2.15.0 2.10.0 9.4.12.RC2 1.9.6 @@ -25,7 +25,7 @@ com.epam.jdi jdi-light-html - 1.3.14 + 1.3.15 @@ -43,7 +43,7 @@ org.testng testng - 6.14.3 + 7.4.0 test diff --git a/jdi-light-html-tests/src/main/java/io/github/com/GoogleDuckSite.java b/jdi-light-html-tests/src/main/java/io/github/com/GoogleDuckSite.java index 99f8049d24..eed8691de9 100644 --- a/jdi-light-html-tests/src/main/java/io/github/com/GoogleDuckSite.java +++ b/jdi-light-html-tests/src/main/java/io/github/com/GoogleDuckSite.java @@ -1,10 +1,17 @@ package io.github.com; +import com.epam.jdi.light.elements.common.UIElement; +import com.epam.jdi.light.elements.pageobjects.annotations.JSite; import com.epam.jdi.light.elements.pageobjects.annotations.locators.UI; import com.epam.jdi.light.ui.html.elements.common.TextField; +@JSite("https://duckduckgo.com/") public class GoogleDuckSite { @UI("#search_form_input_homepage") public static TextField searchInput; + @UI("#search_button_homepage") + public static TextField searchButton; + @UI(".results") + public static UIElement results; } diff --git a/jdi-light-html-tests/src/main/java/io/github/com/StaticSite.java b/jdi-light-html-tests/src/main/java/io/github/com/StaticSite.java index aeb76cba6e..0de5b1e114 100644 --- a/jdi-light-html-tests/src/main/java/io/github/com/StaticSite.java +++ b/jdi-light-html-tests/src/main/java/io/github/com/StaticSite.java @@ -20,6 +20,7 @@ import static com.epam.jdi.light.common.CheckTypes.CONTAINS; @JSite("https://jdi-testing.github.io/jdi-light/") +@Name("Main JDI SIte") public class StaticSite { @Url("/index.html") public static HomePage homePage; @Url("/metals-colors.html") @Title("Metal and Colors") diff --git a/jdi-light-html-tests/src/main/java/io/github/com/custom/Result.java b/jdi-light-html-tests/src/main/java/io/github/com/custom/Result.java index 4aed370f8b..fc49a97f14 100644 --- a/jdi-light-html-tests/src/main/java/io/github/com/custom/Result.java +++ b/jdi-light-html-tests/src/main/java/io/github/com/custom/Result.java @@ -1,6 +1,6 @@ package io.github.com.custom; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class Result extends DataClass { public String name, description, link; diff --git a/jdi-light-html-tests/src/main/java/io/github/com/custom/SearchResult.java b/jdi-light-html-tests/src/main/java/io/github/com/custom/SearchResult.java index 0da786bae3..de3ae80b49 100644 --- a/jdi-light-html-tests/src/main/java/io/github/com/custom/SearchResult.java +++ b/jdi-light-html-tests/src/main/java/io/github/com/custom/SearchResult.java @@ -7,7 +7,7 @@ import com.epam.jdi.light.ui.html.elements.common.Text; import static com.epam.jdi.light.settings.WebSettings.logger; -import static java.lang.String.format; +import static com.jdiai.tools.StringUtils.format; public class SearchResult extends Section { @UI("h3") public Label name; diff --git a/jdi-light-html-tests/src/main/java/io/github/com/entities/Contacts.java b/jdi-light-html-tests/src/main/java/io/github/com/entities/Contacts.java index 5291b1a224..0aaa79301e 100644 --- a/jdi-light-html-tests/src/main/java/io/github/com/entities/Contacts.java +++ b/jdi-light-html-tests/src/main/java/io/github/com/entities/Contacts.java @@ -2,7 +2,7 @@ import com.epam.jdi.light.common.Order; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class Contacts extends DataClass { public String firstName, lastName, acceptConditions, position, passportNumber; diff --git a/jdi-light-html-tests/src/main/java/io/github/com/entities/Furniture.java b/jdi-light-html-tests/src/main/java/io/github/com/entities/Furniture.java index 1219791b40..fd2a2dc275 100644 --- a/jdi-light-html-tests/src/main/java/io/github/com/entities/Furniture.java +++ b/jdi-light-html-tests/src/main/java/io/github/com/entities/Furniture.java @@ -1,7 +1,7 @@ package io.github.com.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class Furniture extends DataClass { public String name, type, cost, weight; diff --git a/jdi-light-html-tests/src/main/java/io/github/com/entities/MarvelUserInfo.java b/jdi-light-html-tests/src/main/java/io/github/com/entities/MarvelUserInfo.java index f8cb395df8..56b7327feb 100644 --- a/jdi-light-html-tests/src/main/java/io/github/com/entities/MarvelUserInfo.java +++ b/jdi-light-html-tests/src/main/java/io/github/com/entities/MarvelUserInfo.java @@ -1,6 +1,6 @@ package io.github.com.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class MarvelUserInfo extends DataClass { public String number, type, user, description; diff --git a/jdi-light-html-tests/src/main/java/io/github/com/entities/MarvelUserSimple.java b/jdi-light-html-tests/src/main/java/io/github/com/entities/MarvelUserSimple.java index 0744fed662..bb92a7cd36 100644 --- a/jdi-light-html-tests/src/main/java/io/github/com/entities/MarvelUserSimple.java +++ b/jdi-light-html-tests/src/main/java/io/github/com/entities/MarvelUserSimple.java @@ -1,6 +1,6 @@ package io.github.com.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; import java.util.Objects; diff --git a/jdi-light-html-tests/src/main/java/io/github/com/entities/User.java b/jdi-light-html-tests/src/main/java/io/github/com/entities/User.java index 8b21337e30..531d44c448 100644 --- a/jdi-light-html-tests/src/main/java/io/github/com/entities/User.java +++ b/jdi-light-html-tests/src/main/java/io/github/com/entities/User.java @@ -1,7 +1,7 @@ package io.github.com.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class User extends DataClass { public String name = "Roman"; diff --git a/jdi-light-html-tests/src/main/java/io/github/com/entities/UserInfo.java b/jdi-light-html-tests/src/main/java/io/github/com/entities/UserInfo.java index 1929de9b5d..01eef10cc1 100644 --- a/jdi-light-html-tests/src/main/java/io/github/com/entities/UserInfo.java +++ b/jdi-light-html-tests/src/main/java/io/github/com/entities/UserInfo.java @@ -1,6 +1,6 @@ package io.github.com.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class UserInfo extends DataClass { public String name, phone, email, city; diff --git a/jdi-light-html-tests/src/main/java/pseudo/site/entities/User.java b/jdi-light-html-tests/src/main/java/pseudo/site/entities/User.java index b60433dc2c..2bcc919895 100644 --- a/jdi-light-html-tests/src/main/java/pseudo/site/entities/User.java +++ b/jdi-light-html-tests/src/main/java/pseudo/site/entities/User.java @@ -1,6 +1,6 @@ package pseudo.site.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class User extends DataClass { public String userName; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/BaseValidations.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/BaseValidations.java index 422431db30..ffe56d820e 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/BaseValidations.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/BaseValidations.java @@ -1,14 +1,14 @@ package io.github.epam.html.tests.elements; import com.epam.jdi.light.elements.interfaces.base.ICoreElement; -import com.epam.jdi.tools.func.JAction; -import com.epam.jdi.tools.func.JFunc; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.func.JAction; +import com.jdiai.tools.func.JFunc; +import com.jdiai.tools.pairs.Pair; import org.openqa.selenium.Dimension; import org.openqa.selenium.Point; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.pairs.Pair.$; +import static com.jdiai.tools.pairs.Pair.$; import static java.lang.System.currentTimeMillis; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/common/ButtonTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/common/ButtonTests.java index 917c930e59..0d839aecd7 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/common/ButtonTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/common/ButtonTests.java @@ -10,8 +10,7 @@ import static com.epam.jdi.light.driver.get.OsTypes.WIN; import static com.epam.jdi.light.elements.base.Conditions.*; import static com.epam.jdi.light.elements.common.Alerts.validateAndAcceptAlert; -import static com.epam.jdi.light.elements.common.Keyboard.press; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.html5Page; import static io.github.com.pages.HtmlElementsPage.*; import static io.github.epam.html.tests.elements.BaseValidations.*; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/common/FileUploadTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/common/FileUploadTests.java index eec01f64ea..828428f02b 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/common/FileUploadTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/common/FileUploadTests.java @@ -11,7 +11,7 @@ import static com.epam.jdi.light.asserts.core.FileAssert.cleanupDownloads; import static com.epam.jdi.light.settings.JDISettings.COMMON; import static com.epam.jdi.light.settings.JDISettings.DRIVER; -import static com.epam.jdi.tools.PathUtils.mergePath; +import static com.jdiai.tools.PathUtils.mergePath; import static io.github.com.StaticSite.html5Page; import static io.github.com.pages.HtmlElementsPage.*; import static io.github.epam.html.tests.elements.BaseValidations.baseValidation; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/common/PerformanceTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/common/PerformanceTests.java index d4203c5074..00a00cc6b9 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/common/PerformanceTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/common/PerformanceTests.java @@ -6,7 +6,7 @@ import org.testng.annotations.Test; import static com.epam.jdi.light.elements.common.Alerts.validateAndAcceptAlert; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.html5Page; import static io.github.com.pages.HtmlElementsPage.*; import static io.github.epam.html.tests.elements.BaseValidations.durationImmediately; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/MultiSelectorTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/MultiSelectorTests.java index 94e8bcd963..ec90aa76b2 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/MultiSelectorTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/MultiSelectorTests.java @@ -5,7 +5,7 @@ import org.testng.annotations.Test; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.html5Page; import static io.github.com.pages.HtmlElementsPage.ages; import static io.github.epam.html.tests.elements.BaseValidations.baseValidation; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownCustomTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownCustomTests.java index 9bc6c2db74..88e8a93f29 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownCustomTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownCustomTests.java @@ -6,7 +6,7 @@ import static com.epam.jdi.light.common.TextTypes.INNER; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.metalAndColorsPage; import static io.github.com.pages.LogSidebar.lastLogEntry; import static io.github.com.pages.MetalAndColorsPage.colorsCustom; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownDressTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownDressTests.java index 7d6d8f2176..e4b653e008 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownDressTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownDressTests.java @@ -7,7 +7,7 @@ import java.util.List; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.html5Page; import static io.github.com.pages.HtmlElementsPage.disabledDropdown; import static io.github.com.pages.HtmlElementsPage.dressCode2; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownEx2Tests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownEx2Tests.java index 44a72e56d9..7e5611ae93 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownEx2Tests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownEx2Tests.java @@ -6,7 +6,7 @@ import static com.epam.jdi.light.common.TextTypes.INNER; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.metalAndColorsPage; import static io.github.com.pages.LogSidebar.lastLogEntry; import static io.github.com.pages.MetalAndColorsPage.colors2; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownEx3Tests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownEx3Tests.java index a656b0b1cb..4131627af0 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownEx3Tests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownEx3Tests.java @@ -6,7 +6,7 @@ import static com.epam.jdi.light.common.TextTypes.INNER; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.metalAndColorsPage; import static io.github.com.pages.LogSidebar.lastLogEntry; import static io.github.com.pages.MetalAndColorsPage.colors3; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownEx4Tests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownEx4Tests.java index 34ccee6bf5..23c33a16fb 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownEx4Tests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownEx4Tests.java @@ -6,7 +6,7 @@ import static com.epam.jdi.light.common.TextTypes.INNER; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.metalAndColorsPage; import static io.github.com.pages.LogSidebar.lastLogEntry; import static io.github.com.pages.MetalAndColorsPage.colors4; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownEx5Tests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownEx5Tests.java index 99ef0775d7..f8ba1d8d6e 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownEx5Tests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownEx5Tests.java @@ -6,7 +6,7 @@ import static com.epam.jdi.light.common.TextTypes.INNER; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.metalAndColorsPage; import static io.github.com.pages.LogSidebar.lastLogEntry; import static io.github.com.pages.MetalAndColorsPage.colors5; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownExTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownExTests.java index 513966b3f1..2a6be859d8 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownExTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownExTests.java @@ -6,7 +6,7 @@ import static com.epam.jdi.light.common.TextTypes.INNER; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.metalAndColorsPage; import static io.github.com.pages.LogSidebar.lastLogEntry; import static io.github.com.pages.MetalAndColorsPage.colors; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownITests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownITests.java index 46bc5e1cfc..8b16ef79fe 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownITests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownITests.java @@ -7,7 +7,7 @@ import java.util.List; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.html5Page; import static io.github.com.pages.HtmlElementsPage.disabledDropdown; import static io.github.com.pages.HtmlElementsPage.dressCode3; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownListTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownListTests.java index dee4fc98d8..42b6bd179a 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownListTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownListTests.java @@ -6,7 +6,7 @@ import static com.epam.jdi.light.common.TextTypes.INNER; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.metalAndColorsPage; import static io.github.com.pages.LogSidebar.lastLogEntry; import static io.github.com.pages.MetalAndColorsPage.colorsList; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownRootTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownRootTests.java index 43fbb55e28..5c602aa5fd 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownRootTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownRootTests.java @@ -6,7 +6,7 @@ import static com.epam.jdi.light.common.TextTypes.INNER; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.metalAndColorsPage; import static io.github.com.pages.LogSidebar.lastLogEntry; import static io.github.com.pages.MetalAndColorsPage.colors5; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownSelectTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownSelectTests.java index 85ee52abfa..7e41f6c756 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownSelectTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/dropdown/DropdownSelectTests.java @@ -7,7 +7,7 @@ import java.util.List; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; import static io.github.com.StaticSite.html5Page; import static io.github.com.pages.HtmlElementsPage.disabledDropdown; import static io.github.com.pages.HtmlElementsPage.dressCode; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/list/ElementsGoogleTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/list/ElementsGoogleTests.java index 3343e1b65f..05e76b358a 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/list/ElementsGoogleTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/list/ElementsGoogleTests.java @@ -13,7 +13,7 @@ import java.util.List; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.PrintUtils.print; +import static com.jdiai.tools.PrintUtils.print; import static io.github.com.StaticSite.searchPage; import static io.github.com.pages.Header.epamLogo; import static io.github.com.pages.Header.search; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/list/JListSearchTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/list/JListSearchTests.java index 355dc88147..1a6fed31ce 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/list/JListSearchTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/list/JListSearchTests.java @@ -9,7 +9,7 @@ import java.util.List; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.PrintUtils.print; +import static com.jdiai.tools.PrintUtils.print; import static io.github.com.pages.Header.epamLogo; import static io.github.com.pages.Header.search; import static io.github.com.pages.SearchPage.jsearchS; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/list/SearchTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/list/SearchTests.java index 75359cb528..d8b3739e0b 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/list/SearchTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/list/SearchTests.java @@ -10,7 +10,7 @@ import java.util.List; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.PrintUtils.print; +import static com.jdiai.tools.PrintUtils.print; import static io.github.com.pages.Header.epamLogo; import static io.github.com.pages.Header.search; import static io.github.com.pages.SearchPage.search3; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/BasicTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/BasicTests.java index 8fdd0a7d28..48a8203322 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/BasicTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/BasicTests.java @@ -6,7 +6,7 @@ import org.testng.annotations.Test; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.StringUtils.LINE_BREAK; import static io.github.com.StaticSite.tablePage; import static io.github.com.pages.SimpleTablePage.dataProducts; import static io.github.epam.html.tests.elements.complex.table.TableTests.i; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/DataConversionTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/DataConversionTests.java index b49800c3f4..1304728430 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/DataConversionTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/DataConversionTests.java @@ -4,9 +4,9 @@ import java.lang.reflect.Field; -import static com.epam.jdi.tools.LinqUtils.first; -import static com.epam.jdi.tools.ReflectionUtils.getValueField; -import static com.epam.jdi.tools.StringUtils.setPrimitiveField; +import static com.jdiai.tools.LinqUtils.first; +import static com.jdiai.tools.ReflectionUtils.getValueField; +import static com.jdiai.tools.StringUtils.setPrimitiveField; import static org.testng.Assert.assertEquals; public class DataConversionTests { diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/DataTableTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/DataTableTests.java index 57061f4eed..c3850dcf13 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/DataTableTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/DataTableTests.java @@ -13,7 +13,7 @@ import static com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher.containsValue; import static com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher.hasValue; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.StringUtils.LINE_BREAK; import static io.github.com.StaticSite.usersPage; import static io.github.com.pages.UsersPage.users; import static io.github.com.pages.UsersPage.usersSetup; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/FurnitureTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/FurnitureTests.java index fa69910efb..b4c5158560 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/FurnitureTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/FurnitureTests.java @@ -11,7 +11,7 @@ import static com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher.containsValue; import static com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher.hasValue; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.StringUtils.LINE_BREAK; import static io.github.com.StaticSite.tablePage; import static io.github.com.pages.SimpleTablePage.furnitureJ; import static io.github.com.pages.SimpleTablePage.simpleTable; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridDoubleHiddenTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridDoubleHiddenTests.java index 985f8a7779..d88c935f1e 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridDoubleHiddenTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridDoubleHiddenTests.java @@ -8,8 +8,8 @@ import java.util.List; -import static com.epam.jdi.tools.LinqUtils.any; -import static com.epam.jdi.tools.LinqUtils.*; +import static com.jdiai.tools.LinqUtils.any; +import static com.jdiai.tools.LinqUtils.*; import static io.github.com.StaticSite.tablePage; import static io.github.com.pages.SimpleTablePage.furnitureDoubleHidden; import static io.github.epam.html.tests.elements.complex.table.TableDataProvider.*; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridHiddenTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridHiddenTests.java index d72f96473e..0271428afa 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridHiddenTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridHiddenTests.java @@ -8,8 +8,8 @@ import java.util.List; -import static com.epam.jdi.tools.LinqUtils.any; -import static com.epam.jdi.tools.LinqUtils.*; +import static com.jdiai.tools.LinqUtils.any; +import static com.jdiai.tools.LinqUtils.*; import static io.github.com.StaticSite.tablePage; import static io.github.com.pages.SimpleTablePage.furnitureHidden; import static io.github.epam.html.tests.elements.complex.table.TableDataProvider.*; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridJTableTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridJTableTests.java index a73b68f849..6c39eeb310 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridJTableTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridJTableTests.java @@ -8,8 +8,8 @@ import java.util.List; -import static com.epam.jdi.tools.LinqUtils.any; -import static com.epam.jdi.tools.LinqUtils.*; +import static com.jdiai.tools.LinqUtils.any; +import static com.jdiai.tools.LinqUtils.*; import static io.github.com.StaticSite.tablePage; import static io.github.com.pages.SimpleTablePage.productsJTable; import static io.github.epam.html.tests.elements.complex.table.TableDataProvider.*; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridSharpHeaderTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridSharpHeaderTests.java index f1ad3ae73e..e26e8db906 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridSharpHeaderTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridSharpHeaderTests.java @@ -8,8 +8,8 @@ import java.util.List; -import static com.epam.jdi.tools.LinqUtils.any; -import static com.epam.jdi.tools.LinqUtils.*; +import static com.jdiai.tools.LinqUtils.any; +import static com.jdiai.tools.LinqUtils.*; import static io.github.com.StaticSite.tablePage; import static io.github.com.pages.SimpleTablePage.furnitureSharpHeader; import static io.github.epam.html.tests.elements.complex.table.TableDataProvider.*; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridSharpTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridSharpTests.java index ebf98001b2..d82b8e317c 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridSharpTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridSharpTests.java @@ -8,8 +8,8 @@ import java.util.List; -import static com.epam.jdi.tools.LinqUtils.any; -import static com.epam.jdi.tools.LinqUtils.*; +import static com.jdiai.tools.LinqUtils.any; +import static com.jdiai.tools.LinqUtils.*; import static io.github.com.StaticSite.tablePage; import static io.github.com.pages.SimpleTablePage.furnitureSharp; import static io.github.epam.html.tests.elements.complex.table.TableDataProvider.*; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridTHTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridTHTests.java index ce473bf6f9..fe838188fc 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridTHTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridTHTests.java @@ -8,8 +8,8 @@ import java.util.List; -import static com.epam.jdi.tools.LinqUtils.any; -import static com.epam.jdi.tools.LinqUtils.*; +import static com.jdiai.tools.LinqUtils.any; +import static com.jdiai.tools.LinqUtils.*; import static io.github.com.StaticSite.tablePage; import static io.github.com.pages.SimpleTablePage.furniture; import static io.github.epam.html.tests.elements.complex.table.TableDataProvider.*; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridTests.java index 6f530a1463..3c39062802 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/GridTests.java @@ -8,8 +8,8 @@ import java.util.List; -import static com.epam.jdi.tools.LinqUtils.any; -import static com.epam.jdi.tools.LinqUtils.*; +import static com.jdiai.tools.LinqUtils.any; +import static com.jdiai.tools.LinqUtils.*; import static io.github.com.StaticSite.tablePage; import static io.github.com.pages.SimpleTablePage.products; import static io.github.epam.html.tests.elements.complex.table.TableDataProvider.*; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/PrimitiveData.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/PrimitiveData.java index 140f4db337..48f8ffecae 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/PrimitiveData.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/PrimitiveData.java @@ -1,6 +1,6 @@ package io.github.epam.html.tests.elements.complex.table; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class PrimitiveData extends DataClass { public String strings; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/TableInteractTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/TableInteractTests.java index c37e35c3a7..d382a60468 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/TableInteractTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/elements/complex/table/TableInteractTests.java @@ -17,7 +17,7 @@ import static com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher.containsValue; import static com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher.hasValue; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.StringUtils.LINE_BREAK; import static io.github.com.StaticSite.usersPage; import static io.github.com.pages.UsersPage.users; import static io.github.com.pages.UsersPage.usersRow; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/issues/issue69/Paragraph.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/issues/issue69/Paragraph.java index 99f32f9d7e..398bf8afce 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/issues/issue69/Paragraph.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/issues/issue69/Paragraph.java @@ -4,7 +4,7 @@ import com.epam.jdi.light.elements.pageobjects.annotations.smart.Smart; import com.epam.jdi.light.ui.html.elements.common.Button; -import static com.epam.jdi.tools.PrintUtils.print; +import static com.jdiai.tools.PrintUtils.print; import static java.util.Arrays.asList; public class Paragraph extends Section { diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/issues/issue69/ParagraphData.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/issues/issue69/ParagraphData.java index a7e0299b9c..989a7237ae 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/issues/issue69/ParagraphData.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/issues/issue69/ParagraphData.java @@ -1,6 +1,6 @@ package io.github.epam.html.tests.issues.issue69; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class ParagraphData extends DataClass { public String paragraph, paragraph2, paragraph3; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/BeforeNewPageTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/BeforeNewPageTests.java index cfd3bef1eb..9cf63c58dc 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/BeforeNewPageTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/BeforeNewPageTests.java @@ -1,7 +1,7 @@ package io.github.epam.html.tests.performance; import com.epam.jdi.light.elements.composite.WebPage; -import com.epam.jdi.tools.Timer; +import com.jdiai.tools.Timer; import io.github.epam.TestsInit; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/DataTableTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/DataTableTests.java index 40af5ca434..ff6fde3c90 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/DataTableTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/DataTableTests.java @@ -9,8 +9,8 @@ import java.util.List; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.StringUtils.LINE_BREAK; import static io.github.com.StaticSite.performancePage; import static io.github.com.pages.PerformancePage.usersTableSetup; import static io.github.com.pages.PerformancePage.usersTableUI; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/ListPerformanceTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/ListPerformanceTests.java index 11554f2247..50e52944c7 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/ListPerformanceTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/ListPerformanceTests.java @@ -2,8 +2,8 @@ import com.epam.jdi.light.driver.WebDriverFactory; -import com.epam.jdi.tools.Timer; -import com.epam.jdi.tools.func.JFunc; +import com.jdiai.tools.Timer; +import com.jdiai.tools.func.JFunc; import io.github.epam.TestsInit; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; @@ -15,12 +15,12 @@ import static com.epam.jdi.light.settings.JDISettings.ELEMENT; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.PropertyReader.getProperty; +import static com.jdiai.tools.PropertyReader.getProperty; +import static com.jdiai.tools.StringUtils.format; import static io.github.com.StaticSite.performancePage; import static io.github.com.pages.PerformancePage.*; import static io.github.epam.html.tests.performance.PerfStatistic.*; import static io.github.epam.html.tests.site.steps.States.shouldBeLoggedIn; -import static java.lang.String.format; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.lessThan; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/PerfStatistic.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/PerfStatistic.java index 1b7c8c206d..7a64682444 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/PerfStatistic.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/performance/PerfStatistic.java @@ -1,6 +1,6 @@ package io.github.epam.html.tests.performance; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.pairs.Pair; import org.apache.commons.collections4.MultiValuedMap; import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; @@ -8,10 +8,10 @@ import java.util.Map.Entry; import java.util.stream.LongStream; -import static com.epam.jdi.tools.LinqUtils.select; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.StringUtils.format; -import static com.epam.jdi.tools.pairs.Pair.$; +import static com.jdiai.tools.LinqUtils.select; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.StringUtils.format; +import static com.jdiai.tools.pairs.Pair.$; public class PerfStatistic { private PerfStatistic() { diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/site/FormsTests.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/site/FormsTests.java index 472df18972..766664cd19 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/site/FormsTests.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/site/FormsTests.java @@ -1,6 +1,6 @@ package io.github.epam.html.tests.site; -import com.epam.jdi.tools.map.MapArray; +import com.jdiai.tools.map.MapArray; import io.github.epam.TestsInit; import org.testng.annotations.Test; diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/site/MultiSiteExample.java b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/site/MultiSiteExample.java index 88ba275575..94c27e69a6 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/site/MultiSiteExample.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/html/tests/site/MultiSiteExample.java @@ -4,25 +4,38 @@ import com.epam.jdi.light.elements.composite.WebPage; import io.github.com.GoogleDuckSite; import io.github.com.StaticSite; +import io.github.com.pages.Header; import org.testng.annotations.Test; +import static com.epam.jdi.light.elements.base.Conditions.displayed; +import static com.epam.jdi.light.elements.base.Conditions.hidden; import static com.epam.jdi.light.elements.composite.WebPage.openSite; import static com.epam.jdi.light.elements.init.PageFactory.initSite; import static io.github.com.pages.Header.userIcon; public class MultiSiteExample { - @Test(enabled = false) public void loginTest() { initSite(GoogleDuckSite.class); openSite(StaticSite.class); WindowsManager.setWindowName("StaticSite"); - WindowsManager.openNewTab(); - WindowsManager.switchToNewWindow(); - WindowsManager.setWindowName("GoogleDuckSite"); + WindowsManager.openNewTab("GoogleDuckSite"); WebPage.openUrl("https://duckduckgo.com/"); GoogleDuckSite.searchInput.input("Something"); WindowsManager.switchToWindow("StaticSite"); userIcon.click(); } + + @Test(enabled = false) + public void multiTabsSites() { + openSite(StaticSite.class); + openSite(GoogleDuckSite.class); + GoogleDuckSite.searchInput.input("Something"); + Header.userIcon.click(); + Header.loginForm.shouldBe(displayed); + GoogleDuckSite.results.shouldBe(hidden); + GoogleDuckSite.searchButton.input("Something"); + GoogleDuckSite.results.shouldBe(displayed); + } + } diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/testng/RetryListenerClass.java b/jdi-light-html-tests/src/test/java/io/github/epam/testng/RetryListenerClass.java index 72123ee713..53858deb21 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/testng/RetryListenerClass.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/testng/RetryListenerClass.java @@ -10,10 +10,10 @@ public class RetryListenerClass implements IAnnotationTransformer { @Override - public void transform(ITestAnnotation testannotation, Class testClass, Constructor testConstructor, Method testMethod) { - IRetryAnalyzer retry = testannotation.getRetryAnalyzer(); + public void transform(ITestAnnotation testAnnotation, Class testClass, Constructor testConstructor, Method testMethod) { + Class retry = testAnnotation.getRetryAnalyzerClass(); if (retry == null) { - testannotation.setRetryAnalyzer(RetryFailedTestCases.class); + testAnnotation.setRetryAnalyzer(RetryFailedTestCases.class); } } diff --git a/jdi-light-html-tests/src/test/java/io/github/epam/testng/TestNGListener.java b/jdi-light-html-tests/src/test/java/io/github/epam/testng/TestNGListener.java index cd64805fa4..a83cc87374 100644 --- a/jdi-light-html-tests/src/test/java/io/github/epam/testng/TestNGListener.java +++ b/jdi-light-html-tests/src/test/java/io/github/epam/testng/TestNGListener.java @@ -5,7 +5,7 @@ * Email: roman.iovlev.jdi@gmail.com; Skype: roman.iovlev */ -import com.epam.jdi.tools.Safe; +import com.jdiai.tools.Safe; import org.testng.IInvokedMethod; import org.testng.IInvokedMethodListener; import org.testng.ITestNGMethod; @@ -18,7 +18,7 @@ import static com.epam.jdi.light.logger.AllureLogger.screenshotStep; import static com.epam.jdi.light.settings.WebSettings.TEST_NAME; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.last; +import static com.jdiai.tools.LinqUtils.last; import static java.lang.System.currentTimeMillis; public class TestNGListener implements IInvokedMethodListener { diff --git a/jdi-light-html/pom.xml b/jdi-light-html/pom.xml index c88611c84c..e4e143f580 100644 --- a/jdi-light-html/pom.xml +++ b/jdi-light-html/pom.xml @@ -7,7 +7,7 @@ jdi-light-html JDI Light Html Elements jar - 1.3.14 + 1.3.15 com.epam.jdi @@ -20,7 +20,7 @@ com.epam.jdi jdi-light - 1.3.14 + 1.3.15 diff --git a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/actions/HtmlActions.java b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/actions/HtmlActions.java index e018b51e2d..6d37c2bceb 100644 --- a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/actions/HtmlActions.java +++ b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/actions/HtmlActions.java @@ -9,7 +9,7 @@ import static com.epam.jdi.light.actions.ActionHelper.*; import static com.epam.jdi.light.actions.ActionProcessor.isTop; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; /** * Created by Roman Iovlev on 14.02.2018 diff --git a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/FileInput.java b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/FileInput.java index 4e768d9509..f60a72f787 100644 --- a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/FileInput.java +++ b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/FileInput.java @@ -6,10 +6,14 @@ import com.epam.jdi.light.elements.interfaces.base.HasLabel; import com.epam.jdi.light.elements.interfaces.base.SetValue; import com.epam.jdi.light.elements.interfaces.common.IsText; +import org.openqa.selenium.remote.LocalFileDetector; +import org.openqa.selenium.remote.RemoteWebDriver; import static com.epam.jdi.light.common.ElementArea.JS; import static com.epam.jdi.light.common.Exceptions.exception; import static com.epam.jdi.light.common.TextTypes.VALUE; +import static com.epam.jdi.light.settings.JDISettings.DRIVER; +import static com.jdiai.tools.ReflectionUtils.isClass; /** * Created by Roman Iovlev on 26.09.2019 @@ -19,15 +23,20 @@ public class FileInput extends UIBaseElement implements HasLabel, Is // region Actions @JDIAction("Upload file '{0}' for '{name}'") public void uploadFile(String path) { - if (isDisabled()) + if (isDisabled()) { throw exception("FileInput '%s' is disabled. Can't upload file", getName()); + } + if (DRIVER.remoteRun && isClass(core().driver().getClass(), RemoteWebDriver.class)) { + ((RemoteWebDriver)core().driver()).setFileDetector(new LocalFileDetector()); + } core().sendKeys(path); } @JDIAction("Upload file '{0}' for '{name}'") public void uploadFileWithRobot(String path, long mSec) { - if (isDisabled()) + if (isDisabled()) { throw exception("FileInput '%s' is disabled. Can't upload file", getName()); + } core().click(JS); pasteText(path, mSec); } diff --git a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/FileUpload.java b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/FileUpload.java index add6fc30d5..887a093677 100644 --- a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/FileUpload.java +++ b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/FileUpload.java @@ -1,7 +1,7 @@ package com.epam.jdi.light.ui.html.elements.common; import com.epam.jdi.light.elements.common.Keyboard; -import com.epam.jdi.tools.Timer; +import com.jdiai.tools.Timer; public class FileUpload extends Button { public void uploadFile(String filePath) { diff --git a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/Link.java b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/Link.java index f19dad370d..dd3fdca25e 100644 --- a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/Link.java +++ b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/Link.java @@ -12,7 +12,7 @@ import static com.epam.jdi.light.common.Exceptions.exception; import static com.epam.jdi.light.logger.LogLevels.DEBUG; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/NumberSelector.java b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/NumberSelector.java index 2fe2ce694c..f6a4ba1469 100644 --- a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/NumberSelector.java +++ b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/common/NumberSelector.java @@ -19,13 +19,13 @@ public class NumberSelector extends UIBaseElement // region Actions @JDIAction(value = "Get '{name}' min value", level = DEBUG) - public Double min() { return getDouble("min", core()); } + public double min() { return getDouble("min", core()); } @JDIAction(value = "Get '{name}' max value", level = DEBUG) - public Double max() { return getDouble("max", core()); } + public double max() { return getDouble("max", core()); } @JDIAction(value = "Get '{name}' value", level = DEBUG) public String value() { return core().attr("value"); } @JDIAction(value = "Get '{name}' step size", level = DEBUG) - public Double step() { return getDouble("step", core()); } + public double step() { return getDouble("step", core()); } @JDIAction("Select number '{0}' for '{name}'") public void setNumber(String number) { core().setAttribute("value", number); diff --git a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/DataListOptions.java b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/DataListOptions.java index 70c5a179dd..87c06c5935 100644 --- a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/DataListOptions.java +++ b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/DataListOptions.java @@ -6,8 +6,8 @@ import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.complex.WebList; import com.epam.jdi.light.elements.interfaces.complex.IsCombobox; -import com.epam.jdi.tools.HasStartIndex; -import com.epam.jdi.tools.LinqUtils; +import com.jdiai.tools.HasStartIndex; +import com.jdiai.tools.LinqUtils; import java.util.List; @@ -15,7 +15,7 @@ import static com.epam.jdi.light.common.TextTypes.VALUE; import static com.epam.jdi.light.elements.init.UIFactory.$$; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.LinqUtils.ifSelect; +import static com.jdiai.tools.LinqUtils.ifSelect; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/Menu2D.java b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/Menu2D.java index 0e80fd05ff..a3a65279cb 100644 --- a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/Menu2D.java +++ b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/Menu2D.java @@ -7,7 +7,7 @@ import com.epam.jdi.light.elements.complex.WebList; import com.epam.jdi.light.ui.html.elements.annotations.*; import com.epam.jdi.light.ui.html.elements.enums.MenuBehaviour; -import com.epam.jdi.tools.func.JAction1; +import com.jdiai.tools.func.JAction1; import org.openqa.selenium.By; import java.lang.reflect.Field; @@ -19,9 +19,9 @@ import static com.epam.jdi.light.driver.WebDriverByUtils.NAME_TO_LOCATOR; import static com.epam.jdi.light.elements.init.UIFactory.$$; import static com.epam.jdi.light.elements.pageobjects.annotations.objects.FillFromAnnotationRules.fieldHasAnnotation; -import static com.epam.jdi.tools.LinqUtils.map; -import static com.epam.jdi.tools.PrintUtils.print; -import static java.lang.String.format; +import static com.jdiai.tools.LinqUtils.map; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.StringUtils.format; import static java.util.Arrays.asList; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/Tabs.java b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/Tabs.java index e84cfe308d..a5cd41d08e 100644 --- a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/Tabs.java +++ b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/Tabs.java @@ -5,7 +5,7 @@ import com.epam.jdi.light.common.TextTypes; import com.epam.jdi.light.elements.base.UIListBase; import com.epam.jdi.light.elements.common.UIElement; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc1; import java.util.List; diff --git a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/vue/ChartData.java b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/vue/ChartData.java index 1a53a08f6e..5a4ae39043 100644 --- a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/vue/ChartData.java +++ b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/vue/ChartData.java @@ -2,8 +2,8 @@ import java.util.List; -import static com.epam.jdi.tools.PrintUtils.print; -import static java.lang.String.format; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.StringUtils.format; public class ChartData { public List labels; diff --git a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/vue/DataSet.java b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/vue/DataSet.java index b997687acf..9b52a3610b 100644 --- a/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/vue/DataSet.java +++ b/jdi-light-html/src/main/java/com/epam/jdi/light/ui/html/elements/complex/vue/DataSet.java @@ -1,6 +1,6 @@ package com.epam.jdi.light.ui.html.elements.complex.vue; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; import java.util.List; diff --git a/jdi-light-mobile-bootstrap-web-tests/pom.xml b/jdi-light-mobile-bootstrap-web-tests/pom.xml index 21a6d220b9..b20271869c 100644 --- a/jdi-light-mobile-bootstrap-web-tests/pom.xml +++ b/jdi-light-mobile-bootstrap-web-tests/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 1.3.14 + 1.3.15 jdi-light-mobile-bootstrap-web-tests Tests: JDI Mobile Bootstrap Web tests com.epam.jdi @@ -13,11 +13,11 @@ UTF-8 chrome - 2.13.8 + 2.15.0 2.10.0 9.4.12.RC2 1.9.6 - 1.3.14 + 1.3.15 src/test/resources/demoRun.xml src/test/resources/general.xml @@ -45,7 +45,7 @@ org.testng testng - 6.14.3 + 7.4.0 test @@ -123,4 +123,4 @@ - \ No newline at end of file + diff --git a/jdi-light-mobile-html-web-tests/pom.xml b/jdi-light-mobile-html-web-tests/pom.xml index 09c80bd693..1d2825ec16 100644 --- a/jdi-light-mobile-html-web-tests/pom.xml +++ b/jdi-light-mobile-html-web-tests/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 1.3.14 + 1.3.15 jdi-light-mobile-html-web-tests Tests: JDI Mobile HTML Web com.epam.jdi @@ -13,11 +13,11 @@ UTF-8 chrome - 2.13.8 + 2.15.0 2.10.0 9.4.12.RC2 1.9.6 - 1.3.14 + 1.3.15 src/test/resources/demoRun.xml src/test/resources/general.xml @@ -50,7 +50,7 @@ org.testng testng - 6.14.3 + 7.4.0 test @@ -128,4 +128,4 @@ - \ No newline at end of file + diff --git a/jdi-light-mobile-tests/pom.xml b/jdi-light-mobile-tests/pom.xml index fa1acbe9d1..adff76ddf4 100644 --- a/jdi-light-mobile-tests/pom.xml +++ b/jdi-light-mobile-tests/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 1.3.14 + 1.3.15 jdi-light-mobile-tests Tests: JDI Mobile com.epam.jdi @@ -13,7 +13,7 @@ UTF-8 chrome - 2.13.8 + 2.15.0 2.10.0 9.4.12.RC2 1.9.6 @@ -30,12 +30,12 @@ com.epam.jdi jdi-light-html - 1.3.14 + 1.3.15 com.epam.jdi jdi-light-mobile - 1.3.14 + 1.3.15 @@ -53,7 +53,7 @@ org.testng testng - 6.14.3 + 7.4.0 test @@ -153,4 +153,4 @@ - \ No newline at end of file + diff --git a/jdi-light-mobile/pom.xml b/jdi-light-mobile/pom.xml index 84a213f0ff..d8258ebd11 100644 --- a/jdi-light-mobile/pom.xml +++ b/jdi-light-mobile/pom.xml @@ -7,11 +7,11 @@ jdi-light-mobile JDI Light Mobile jar - 1.3.14 + 1.3.15 com.epam.jdi - 1.9.1 + 1.9.6 1.12.6 1.8 @@ -20,7 +20,7 @@ com.epam.jdi jdi-light - 1.3.14 + 1.3.15 @@ -84,4 +84,4 @@ - \ No newline at end of file + diff --git a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/AllurePropertiesGenerator.java b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/AllurePropertiesGenerator.java index 2d3ec53cbc..a942217173 100644 --- a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/AllurePropertiesGenerator.java +++ b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/AllurePropertiesGenerator.java @@ -14,6 +14,7 @@ import java.util.Properties; import static com.epam.jdi.light.settings.WebSettings.logger; +import static com.jdiai.tools.StringUtils.format; import static java.lang.ClassLoader.getSystemResource; public class AllurePropertiesGenerator { @@ -55,7 +56,7 @@ public void createAllureProperties() { if (!Files.exists(allureResults.getParent())) { Files.createDirectories(allureResults.getParent()); } - logger.info(String.format("allure prop file path: %s", allureResults.toAbsolutePath())); + logger.info(format("allure prop file path: %s", allureResults.toAbsolutePath())); Files.write(allureResults, properties, StandardCharsets.UTF_8); } catch (Exception e) { logger.error("Can not create property file for allure results.", e); @@ -74,7 +75,7 @@ private String formatProperties(String propertyName, String defValue, Properties propertyValue = MobileDriverData.CAPABILITIES_FOR_IOS.get(propertyName); } } - return String.format(PROPERTIES_FORMAT, propertyName, Objects.isNull(propertyValue) ? defValue : propertyValue); + return format(PROPERTIES_FORMAT, propertyName, Objects.isNull(propertyValue) ? defValue : propertyValue); } } \ No newline at end of file diff --git a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/MobileUtils.java b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/MobileUtils.java index 1cad2db1f9..edc39b9b31 100644 --- a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/MobileUtils.java +++ b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/MobileUtils.java @@ -7,7 +7,7 @@ import com.epam.jdi.light.mobile.elements.base.MobileAppUIElement; import com.epam.jdi.light.mobile.elements.common.app.ios.MenuItem; import com.epam.jdi.light.mobile.interfaces.HasTouchActions; -import com.epam.jdi.tools.func.JFunc2; +import com.jdiai.tools.func.JFunc2; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; @@ -20,9 +20,10 @@ import static com.epam.jdi.light.common.Exceptions.exception; import static com.epam.jdi.light.driver.WebDriverFactory.getDriver; import static com.epam.jdi.light.mobile.elements.init.MobileAppFactory.$; -import static com.epam.jdi.tools.LinqUtils.*; -import static com.epam.jdi.tools.ReflectionUtils.*; -import static com.epam.jdi.tools.StringUtils.namesEqual; +import static com.jdiai.tools.LinqUtils.*; +import static com.jdiai.tools.ReflectionUtils.*; +import static com.jdiai.tools.StringUtils.format; +import static com.jdiai.tools.StringUtils.namesEqual; /** * This class introduces the wrappers around the driver methods. @@ -55,7 +56,7 @@ public static R executeDriverMethod(Class clazz, Function functi public static JFunc2 GET_DEFAULT_BUTTON = - (obj, buttonName) -> $(By.xpath(String.format("//XCUIElementTypeButton[@name='%s']", buttonName)), + (obj, buttonName) -> $(By.xpath(format("//XCUIElementTypeButton[@name='%s']", buttonName)), obj).setName(buttonName); public static final JFunc2 GET_BUTTON = (obj, buttonName) -> { @@ -88,7 +89,7 @@ private static String toButton(String buttonName) { } public static JFunc2 GET_DEFAULT_APP_MENU_ITEM = - (obj, menuItemName) -> $(By.xpath(String.format("//XCUIElementTypeMenuItem[@name='%s']", menuItemName)), + (obj, menuItemName) -> $(By.xpath(format("//XCUIElementTypeMenuItem[@name='%s']", menuItemName)), obj).setName(menuItemName); public static JFunc2 GET_APP_MENU_ITEM = (obj, buttonName) -> { diff --git a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/actions/MobileActions.java b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/actions/MobileActions.java index c31296d277..80fc9d84b1 100644 --- a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/actions/MobileActions.java +++ b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/actions/MobileActions.java @@ -9,7 +9,7 @@ import static com.epam.jdi.light.actions.ActionHelper.*; import static com.epam.jdi.light.actions.ActionProcessor.isTop; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; /** * Created by Roman Iovlev on 20.03.2019 diff --git a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/driver/MobileDriverData.java b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/driver/MobileDriverData.java index b1e9e2e7c3..f35349dc2a 100644 --- a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/driver/MobileDriverData.java +++ b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/driver/MobileDriverData.java @@ -1,6 +1,6 @@ package com.epam.jdi.light.mobile.driver; -import com.epam.jdi.tools.func.JAction1; +import com.jdiai.tools.func.JAction1; import org.openqa.selenium.MutableCapabilities; import java.util.HashMap; diff --git a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/base/MobileAppUIElement.java b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/base/MobileAppUIElement.java index a5cd46f20f..5eda2733e7 100644 --- a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/base/MobileAppUIElement.java +++ b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/base/MobileAppUIElement.java @@ -6,8 +6,8 @@ import com.epam.jdi.light.elements.base.JdiSettings; import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.pageobjects.annotations.locators.MarkupLocator; -import com.epam.jdi.tools.func.JAction1; -import com.epam.jdi.tools.func.JFunc; +import com.jdiai.tools.func.JAction1; +import com.jdiai.tools.func.JFunc; import io.appium.java_client.PerformsTouchActions; import io.appium.java_client.TouchAction; import io.appium.java_client.touch.LongPressOptions; @@ -26,7 +26,7 @@ import static com.epam.jdi.light.elements.base.JdiSettings.DEFAULT_CONTEXT; import static com.epam.jdi.light.elements.base.JdiSettings.getAllElementsInContext; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.LinqUtils.map; +import static com.jdiai.tools.LinqUtils.map; import static java.util.Collections.singletonList; public class MobileAppUIElement extends MobileUIElement { diff --git a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/base/MobileTextTypes.java b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/base/MobileTextTypes.java index 92b7d77364..be84e34a73 100644 --- a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/base/MobileTextTypes.java +++ b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/base/MobileTextTypes.java @@ -1,7 +1,7 @@ package com.epam.jdi.light.mobile.elements.base; import com.epam.jdi.light.elements.common.UIElement; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc1; import static com.epam.jdi.light.mobile.elements.base.MobileUIElement.SMART_GET_TEXT; import static com.epam.jdi.light.mobile.elements.base.MobileUIElement.SMART_LIST_TEXT; diff --git a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/base/MobileUIElement.java b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/base/MobileUIElement.java index 9e70a78d87..68adb1ca33 100644 --- a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/base/MobileUIElement.java +++ b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/base/MobileUIElement.java @@ -8,10 +8,10 @@ import com.epam.jdi.light.mobile.elements.complex.MobileWebList; import com.epam.jdi.light.mobile.elements.init.MobileUIFactory; import com.epam.jdi.light.mobile.interfaces.HasTouchActions; -import com.epam.jdi.tools.func.JAction1; -import com.epam.jdi.tools.func.JFunc; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.map.MapArray; +import com.jdiai.tools.func.JAction1; +import com.jdiai.tools.func.JFunc; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.map.MapArray; import io.appium.java_client.PerformsTouchActions; import io.appium.java_client.TouchAction; import io.appium.java_client.touch.LongPressOptions; diff --git a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/complex/MobileWebList.java b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/complex/MobileWebList.java index 23bfc0a058..8ae9af2e27 100644 --- a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/complex/MobileWebList.java +++ b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/complex/MobileWebList.java @@ -17,14 +17,14 @@ import com.epam.jdi.light.mobile.elements.base.MobileUIElement; import com.epam.jdi.light.mobile.elements.init.MobileUIFactory; import com.epam.jdi.light.mobile.settings.MobileElementSettings; -import com.epam.jdi.tools.CacheValue; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.func.JAction1; -import com.epam.jdi.tools.func.JFunc; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.map.MapArray; -import com.epam.jdi.tools.pairs.Pair; import com.google.common.primitives.Ints; +import com.jdiai.tools.CacheValue; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.func.JAction1; +import com.jdiai.tools.func.JFunc; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.map.MapArray; +import com.jdiai.tools.pairs.Pair; import org.apache.commons.lang3.ArrayUtils; import org.hamcrest.Matcher; import org.hamcrest.MatcherAssert; @@ -44,14 +44,14 @@ import static com.epam.jdi.light.mobile.elements.init.MobileUIFactory.$; import static com.epam.jdi.light.mobile.elements.init.MobileUIFactory.$$; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; -import static com.epam.jdi.tools.EnumUtils.getEnumValues; -import static com.epam.jdi.tools.LinqUtils.any; -import static com.epam.jdi.tools.LinqUtils.toList; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.ReflectionUtils.isClass; -import static com.epam.jdi.tools.StringUtils.namesEqual; -import static java.lang.String.format; +import static com.jdiai.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.EnumUtils.getEnumValues; +import static com.jdiai.tools.LinqUtils.any; +import static com.jdiai.tools.LinqUtils.toList; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.ReflectionUtils.isClass; +import static com.jdiai.tools.StringUtils.format; +import static com.jdiai.tools.StringUtils.namesEqual; import static java.util.Arrays.asList; import static java.util.Collections.max; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/init/PageFactory.java b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/init/PageFactory.java index f963807a37..2be24b9267 100644 --- a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/init/PageFactory.java +++ b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/elements/init/PageFactory.java @@ -2,7 +2,7 @@ import com.epam.jdi.light.mobile.elements.pageobjects.annotations.MobileFindBy; import com.epam.jdi.light.mobile.elements.pageobjects.annotations.WebAnnotationsUtil; -import com.epam.jdi.tools.func.JFunc; +import com.jdiai.tools.func.JFunc; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.pagefactory.ElementLocatorFactory; import org.openqa.selenium.support.pagefactory.FieldDecorator; @@ -12,8 +12,8 @@ import static com.epam.jdi.light.mobile.elements.pageobjects.annotations.WebAnnotationsUtil.mobileFindByToBy; import static com.epam.jdi.light.mobile.settings.MobileSettings.init; import static com.epam.jdi.light.settings.WebSettings.TEST_GROUP; -import static com.epam.jdi.tools.LinqUtils.first; -import static com.epam.jdi.tools.pairs.Pair.$; +import static com.jdiai.tools.LinqUtils.first; +import static com.jdiai.tools.pairs.Pair.$; /** * Created by Roman Iovlev on 20.03.2019 diff --git a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/settings/MobileElementSettings.java b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/settings/MobileElementSettings.java index 319bf68c32..6925b78eef 100644 --- a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/settings/MobileElementSettings.java +++ b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/settings/MobileElementSettings.java @@ -7,10 +7,10 @@ import com.epam.jdi.light.logger.HighlightStrategy; import com.epam.jdi.light.mobile.elements.base.MobileTextTypes; import com.epam.jdi.light.mobile.elements.base.MobileUIElement; -import com.epam.jdi.tools.func.JAction1; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.func.JFunc2; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.func.JAction1; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc2; +import com.jdiai.tools.pairs.Pair; import org.openqa.selenium.WebElement; import java.util.ArrayList; diff --git a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/settings/MobileSettings.java b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/settings/MobileSettings.java index 646854cea6..0033e1d032 100644 --- a/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/settings/MobileSettings.java +++ b/jdi-light-mobile/src/main/java/com/epam/jdi/light/mobile/settings/MobileSettings.java @@ -17,7 +17,7 @@ import static com.epam.jdi.light.settings.JDISettings.DRIVER; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; import static com.epam.jdi.light.settings.WebSettings.*; -import static com.epam.jdi.tools.PropertyReader.fillAction; +import static com.jdiai.tools.PropertyReader.fillAction; import static java.util.Arrays.asList; /** diff --git a/jdi-light/pom.xml b/jdi-light/pom.xml index 87b96cd5fa..5c00c0fe2b 100644 --- a/jdi-light/pom.xml +++ b/jdi-light/pom.xml @@ -7,7 +7,7 @@ jdi-light JDI Light jar - 1.3.14 + 1.3.15 com.epam.jdi @@ -30,7 +30,7 @@ com.jdiai.tools jdi-light-saber - 3.0.4 + 3.0.6 @@ -68,7 +68,7 @@ io.github.bonigarcia webdrivermanager - 4.3.1 + 5.0.2 @@ -176,4 +176,4 @@ - \ No newline at end of file + diff --git a/jdi-light/src/main/java/com/epam/jdi/light/actions/ActionHelper.java b/jdi-light/src/main/java/com/epam/jdi/light/actions/ActionHelper.java index 90f6db6fab..097518d85c 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/actions/ActionHelper.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/actions/ActionHelper.java @@ -15,12 +15,12 @@ import com.epam.jdi.light.logger.HighlightStrategy; import com.epam.jdi.light.logger.JDILogger; import com.epam.jdi.light.logger.LogLevels; -import com.epam.jdi.tools.PrintUtils; -import com.epam.jdi.tools.Safe; -import com.epam.jdi.tools.Timer; -import com.epam.jdi.tools.func.*; -import com.epam.jdi.tools.map.MapArray; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.PrintUtils; +import com.jdiai.tools.Safe; +import com.jdiai.tools.Timer; +import com.jdiai.tools.func.*; +import com.jdiai.tools.map.MapArray; +import com.jdiai.tools.pairs.Pair; import io.qameta.allure.Step; import org.apache.commons.lang3.ObjectUtils; import org.aspectj.lang.JoinPoint; @@ -50,17 +50,16 @@ import static com.epam.jdi.light.settings.JDISettings.*; import static com.epam.jdi.light.settings.WebSettings.VISUAL_ACTION_STRATEGY; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; -import static com.epam.jdi.tools.LinqUtils.*; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.ReflectionUtils.*; -import static com.epam.jdi.tools.StringUtils.*; -import static com.epam.jdi.tools.Timer.nowTime; -import static com.epam.jdi.tools.map.MapArray.map; -import static com.epam.jdi.tools.pairs.Pair.$; -import static com.epam.jdi.tools.switcher.SwitchActions.*; +import static com.jdiai.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.LinqUtils.*; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.ReflectionUtils.*; +import static com.jdiai.tools.StringUtils.*; +import static com.jdiai.tools.Timer.nowTime; +import static com.jdiai.tools.map.MapArray.map; +import static com.jdiai.tools.pairs.Pair.$; +import static com.jdiai.tools.switcher.SwitchActions.*; import static io.qameta.allure.aspects.StepsAspects.getLifecycle; -import static java.lang.String.format; import static java.lang.System.currentTimeMillis; import static java.lang.Thread.currentThread; import static java.util.Arrays.asList; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/actions/ActionObject.java b/jdi-light/src/main/java/com/epam/jdi/light/actions/ActionObject.java index 42d719ed8b..881c939fb8 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/actions/ActionObject.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/actions/ActionObject.java @@ -7,10 +7,10 @@ import com.epam.jdi.light.elements.interfaces.base.IBaseElement; import com.epam.jdi.light.elements.interfaces.base.ICoreElement; import com.epam.jdi.light.logger.LogLevels; -import com.epam.jdi.tools.CacheValue; -import com.epam.jdi.tools.PrintUtils; -import com.epam.jdi.tools.Safe; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.CacheValue; +import com.jdiai.tools.PrintUtils; +import com.jdiai.tools.Safe; +import com.jdiai.tools.func.JFunc1; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.reflect.MethodSignature; @@ -22,9 +22,9 @@ import static com.epam.jdi.light.actions.ActionHelper.*; import static com.epam.jdi.light.actions.ActionOverride.getOverrideAction; import static com.epam.jdi.light.settings.JDISettings.TIMEOUTS; -import static com.epam.jdi.tools.LinqUtils.map; -import static com.epam.jdi.tools.ReflectionUtils.isClass; -import static com.epam.jdi.tools.ReflectionUtils.isInterface; +import static com.jdiai.tools.LinqUtils.map; +import static com.jdiai.tools.ReflectionUtils.isClass; +import static com.jdiai.tools.ReflectionUtils.isInterface; public class ActionObject { private JoinPoint jp; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/actions/ActionOverride.java b/jdi-light/src/main/java/com/epam/jdi/light/actions/ActionOverride.java index 5506804b28..da6013292e 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/actions/ActionOverride.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/actions/ActionOverride.java @@ -1,10 +1,10 @@ package com.epam.jdi.light.actions; import com.epam.jdi.light.elements.base.DriverBase; -import com.epam.jdi.tools.func.JAction1; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.map.MapArray; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.func.JAction1; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.map.MapArray; +import com.jdiai.tools.pairs.Pair; import org.aspectj.lang.JoinPoint; import static com.epam.jdi.light.actions.ActionHelper.getJpClass; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/actions/ActionProcessor.java b/jdi-light/src/main/java/com/epam/jdi/light/actions/ActionProcessor.java index 1614612a75..c9b72c7419 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/actions/ActionProcessor.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/actions/ActionProcessor.java @@ -1,6 +1,6 @@ package com.epam.jdi.light.actions; -import com.epam.jdi.tools.Safe; +import com.jdiai.tools.Safe; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -14,7 +14,7 @@ import static com.epam.jdi.light.actions.ActionHelper.*; import static com.epam.jdi.light.common.Exceptions.exception; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/asserts/core/DataListAssert.java b/jdi-light/src/main/java/com/epam/jdi/light/asserts/core/DataListAssert.java index 2913831bc4..d83f820648 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/asserts/core/DataListAssert.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/asserts/core/DataListAssert.java @@ -4,8 +4,8 @@ import com.epam.jdi.light.common.JDIAction; import com.epam.jdi.light.elements.complex.DataList; import com.epam.jdi.light.elements.interfaces.base.ICoreElement; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.func.JFunc1; import org.hamcrest.Matcher; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; @@ -14,7 +14,7 @@ import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; import static com.epam.jdi.light.common.Exceptions.exception; -import static com.epam.jdi.tools.LinqUtils.*; +import static com.jdiai.tools.LinqUtils.*; import static org.hamcrest.Matchers.*; /** diff --git a/jdi-light/src/main/java/com/epam/jdi/light/asserts/core/FileAssert.java b/jdi-light/src/main/java/com/epam/jdi/light/asserts/core/FileAssert.java index fd1f043595..000c5c4fdb 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/asserts/core/FileAssert.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/asserts/core/FileAssert.java @@ -3,7 +3,7 @@ import com.epam.jdi.light.asserts.generic.BaseAssert; import com.epam.jdi.light.common.JDIAction; import com.epam.jdi.light.elements.interfaces.base.IBaseElement; -import com.epam.jdi.tools.Safe; +import com.jdiai.tools.Safe; import org.hamcrest.Matcher; import java.io.File; @@ -11,7 +11,7 @@ import static com.epam.jdi.light.common.Exceptions.exception; import static com.epam.jdi.light.settings.JDISettings.DRIVER; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.PathUtils.mergePath; +import static com.jdiai.tools.PathUtils.mergePath; import static java.util.Objects.requireNonNull; import static org.apache.commons.io.FileUtils.readFileToString; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/asserts/core/SoftAssert.java b/jdi-light/src/main/java/com/epam/jdi/light/asserts/core/SoftAssert.java index c58bc175e5..d6110eb167 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/asserts/core/SoftAssert.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/asserts/core/SoftAssert.java @@ -1,14 +1,14 @@ package com.epam.jdi.light.asserts.core; -import com.epam.jdi.tools.Safe; +import com.jdiai.tools.Safe; import org.hamcrest.Matcher; import java.util.ArrayList; import java.util.List; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.Timer.nowTimeShort; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.Timer.nowTimeShort; import static org.hamcrest.MatcherAssert.assertThat; /** diff --git a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/BaseAssert.java b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/BaseAssert.java index e5cc876241..5ce762d7ea 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/BaseAssert.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/BaseAssert.java @@ -5,10 +5,10 @@ import com.epam.jdi.light.elements.interfaces.base.HasRefresh; import com.epam.jdi.light.elements.interfaces.base.IBaseElement; import com.epam.jdi.light.elements.interfaces.base.JDIElement; -import com.epam.jdi.tools.Safe; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.Safe; +import com.jdiai.tools.func.JFunc1; -import static com.epam.jdi.tools.ReflectionUtils.isInterface; +import static com.jdiai.tools.ReflectionUtils.isInterface; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/CommonAssert.java b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/CommonAssert.java index 323f1156d7..288b457bef 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/CommonAssert.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/CommonAssert.java @@ -1,7 +1,7 @@ package com.epam.jdi.light.asserts.generic; import com.epam.jdi.light.asserts.core.SoftAssert; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc1; import org.hamcrest.Matcher; import java.util.List; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/ListAssert.java b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/ListAssert.java index dcde664bc6..8c6cdd4c7c 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/ListAssert.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/ListAssert.java @@ -2,15 +2,15 @@ import com.epam.jdi.light.common.JDIAction; import com.epam.jdi.light.elements.complex.IListSelector; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.func.JFunc1; import org.hamcrest.Matchers; import java.util.List; import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; -import static com.epam.jdi.tools.LinqUtils.first; -import static com.epam.jdi.tools.LinqUtils.single; +import static com.jdiai.tools.LinqUtils.first; +import static com.jdiai.tools.LinqUtils.single; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/UIAssert.java b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/UIAssert.java index bf0b9ec096..fec4701aac 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/UIAssert.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/UIAssert.java @@ -3,16 +3,16 @@ import com.epam.jdi.light.asserts.core.IsAssert; import com.epam.jdi.light.common.JDIAction; import com.epam.jdi.light.elements.interfaces.base.ICoreElement; -import com.epam.jdi.tools.Safe; -import com.epam.jdi.tools.Timer; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.Safe; +import com.jdiai.tools.Timer; +import com.jdiai.tools.func.JFunc1; import org.hamcrest.Matcher; import org.hamcrest.Matchers; import java.util.List; import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; -import static com.epam.jdi.tools.StringUtils.format; +import static com.jdiai.tools.StringUtils.format; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/UISelectAssert.java b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/UISelectAssert.java index 6e04d83adf..9d7c13c0dd 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/UISelectAssert.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/UISelectAssert.java @@ -5,8 +5,8 @@ import com.epam.jdi.light.elements.base.JDIBase; import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.complex.ISelector; -import com.epam.jdi.tools.Timer; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.Timer; +import com.jdiai.tools.func.JFunc1; import org.hamcrest.Matcher; import org.hamcrest.Matchers; @@ -14,8 +14,8 @@ import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; import static com.epam.jdi.light.settings.JDISettings.TIMEOUTS; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; -import static com.epam.jdi.tools.LinqUtils.toStringArray; +import static com.jdiai.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.LinqUtils.toStringArray; import static org.hamcrest.Matchers.*; /** diff --git a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/table/BaseTableAssert.java b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/table/BaseTableAssert.java index a64f713f9e..09dee20835 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/table/BaseTableAssert.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/table/BaseTableAssert.java @@ -7,7 +7,7 @@ import com.epam.jdi.light.elements.complex.table.Line; import com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher; import com.epam.jdi.light.elements.complex.table.matchers.ValueMatcher; -import com.epam.jdi.tools.LinqUtils; +import com.jdiai.tools.LinqUtils; import org.hamcrest.Matcher; import org.hamcrest.Matchers; @@ -17,8 +17,8 @@ import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; import static com.epam.jdi.light.common.Exceptions.exception; import static com.epam.jdi.light.elements.complex.table.matchers.TableMatcherSettings.TABLE_MATCHER; -import static com.epam.jdi.tools.LinqUtils.isSorted; -import static com.epam.jdi.tools.LinqUtils.map; +import static com.jdiai.tools.LinqUtils.isSorted; +import static com.jdiai.tools.LinqUtils.map; import static org.hamcrest.Matchers.*; /** diff --git a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/table/DataTableAssert.java b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/table/DataTableAssert.java index cab7baddf9..f028eae9c5 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/table/DataTableAssert.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/table/DataTableAssert.java @@ -10,9 +10,9 @@ import com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher; import com.epam.jdi.light.elements.interfaces.base.HasValue; import com.epam.jdi.light.elements.interfaces.composite.PageObject; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.func.JFunc2; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc2; import org.hamcrest.Matcher; import org.hamcrest.Matchers; @@ -21,8 +21,8 @@ import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; import static com.epam.jdi.light.asserts.generic.table.DataTableAssert.CompareType.*; import static com.epam.jdi.light.elements.complex.table.matchers.TableMatcherSettings.TABLE_MATCHER; -import static com.epam.jdi.tools.LinqUtils.isSorted; -import static java.lang.String.format; +import static com.jdiai.tools.LinqUtils.isSorted; +import static com.jdiai.tools.StringUtils.format; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.hasSize; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/table/IDataGridAssert.java b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/table/IDataGridAssert.java index d75065f975..ae5e3fae56 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/table/IDataGridAssert.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/table/IDataGridAssert.java @@ -6,9 +6,9 @@ import com.epam.jdi.light.elements.base.JDIBase; import com.epam.jdi.light.elements.complex.table.IDataGrid; import com.epam.jdi.light.elements.complex.table.Row; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.func.JFunc2; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc2; import org.hamcrest.Matcher; import org.hamcrest.Matchers; @@ -17,8 +17,8 @@ import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; import static com.epam.jdi.light.asserts.generic.table.IDataGridAssert.CompareType.*; -import static com.epam.jdi.tools.LinqUtils.isSorted; -import static java.lang.String.format; +import static com.jdiai.tools.LinqUtils.isSorted; +import static com.jdiai.tools.StringUtils.format; import static org.hamcrest.Matchers.*; /** diff --git a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/table/IGridAssert.java b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/table/IGridAssert.java index f3c86c6a26..a28c0d656b 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/table/IGridAssert.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/asserts/generic/table/IGridAssert.java @@ -6,7 +6,7 @@ import com.epam.jdi.light.elements.base.JDIBase; import com.epam.jdi.light.elements.complex.table.IGrid; import com.epam.jdi.light.elements.complex.table.Line; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc1; import org.hamcrest.Matcher; import org.hamcrest.Matchers; @@ -16,8 +16,8 @@ import static com.epam.jdi.light.asserts.core.SoftAssert.jdiAssert; import static com.epam.jdi.light.asserts.generic.table.IGridAssert.CompareType.*; import static com.epam.jdi.light.common.Exceptions.exception; -import static com.epam.jdi.tools.LinqUtils.*; -import static java.lang.String.format; +import static com.jdiai.tools.LinqUtils.*; +import static com.jdiai.tools.StringUtils.format; import static org.hamcrest.Matchers.*; /** diff --git a/jdi-light/src/main/java/com/epam/jdi/light/common/Exceptions.java b/jdi-light/src/main/java/com/epam/jdi/light/common/Exceptions.java index 0ebbcea3a9..e7112cade9 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/common/Exceptions.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/common/Exceptions.java @@ -2,9 +2,9 @@ import com.epam.jdi.light.settings.WebSettings; -import static com.epam.jdi.tools.ReflectionUtils.isClass; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; -import static java.lang.String.format; +import static com.jdiai.tools.ReflectionUtils.isClass; +import static com.jdiai.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.StringUtils.format; /** * Created by Roman_Iovlev on 3/19/2018. diff --git a/jdi-light/src/main/java/com/epam/jdi/light/common/LinuxProcessUtils.java b/jdi-light/src/main/java/com/epam/jdi/light/common/LinuxProcessUtils.java index 46987f1d40..c184d567d3 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/common/LinuxProcessUtils.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/common/LinuxProcessUtils.java @@ -4,7 +4,7 @@ import java.util.List; import static com.epam.jdi.light.common.Exceptions.exception; -import static com.epam.jdi.tools.StringUtils.inputStreamToList; +import static com.jdiai.tools.StringUtils.inputStreamToList; public class LinuxProcessUtils { diff --git a/jdi-light/src/main/java/com/epam/jdi/light/common/ListElementNameTypes.java b/jdi-light/src/main/java/com/epam/jdi/light/common/ListElementNameTypes.java index 99c4abf127..be8f368708 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/common/ListElementNameTypes.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/common/ListElementNameTypes.java @@ -1,7 +1,7 @@ package com.epam.jdi.light.common; import com.epam.jdi.light.elements.common.UIElement; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc1; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/common/NameToLocator.java b/jdi-light/src/main/java/com/epam/jdi/light/common/NameToLocator.java index efbf7da88c..a56a99ad12 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/common/NameToLocator.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/common/NameToLocator.java @@ -1,11 +1,11 @@ package com.epam.jdi.light.common; -import com.epam.jdi.tools.StringUtils; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.map.MapArray; +import com.jdiai.tools.StringUtils; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.map.MapArray; -import static com.epam.jdi.tools.map.MapArray.map; -import static com.epam.jdi.tools.pairs.Pair.$; +import static com.jdiai.tools.map.MapArray.map; +import static com.jdiai.tools.pairs.Pair.$; public class NameToLocator { public static MapArray> SMART_MAP_NAME_TO_LOCATOR = map( diff --git a/jdi-light/src/main/java/com/epam/jdi/light/common/OutputTemplates.java b/jdi-light/src/main/java/com/epam/jdi/light/common/OutputTemplates.java index 4568b1f09a..b36c98f450 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/common/OutputTemplates.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/common/OutputTemplates.java @@ -1,7 +1,7 @@ package com.epam.jdi.light.common; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc1; /** * Created by Roman Iovlev on 04.08.2018 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/common/SearchStrategies.java b/jdi-light/src/main/java/com/epam/jdi/light/common/SearchStrategies.java index 65cd18a73a..23cd83728c 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/common/SearchStrategies.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/common/SearchStrategies.java @@ -1,8 +1,8 @@ package com.epam.jdi.light.common; import com.epam.jdi.light.elements.common.UIElement; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.pairs.Pair; import org.openqa.selenium.WebElement; import java.util.Objects; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/common/SetTextTypes.java b/jdi-light/src/main/java/com/epam/jdi/light/common/SetTextTypes.java index e12a48b8c6..792c4924ed 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/common/SetTextTypes.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/common/SetTextTypes.java @@ -1,7 +1,7 @@ package com.epam.jdi.light.common; import com.epam.jdi.light.elements.common.UIElement; -import com.epam.jdi.tools.func.JAction2; +import com.jdiai.tools.func.JAction2; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/common/TextTypes.java b/jdi-light/src/main/java/com/epam/jdi/light/common/TextTypes.java index aefa74a7dc..62872e4685 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/common/TextTypes.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/common/TextTypes.java @@ -1,7 +1,7 @@ package com.epam.jdi.light.common; import com.epam.jdi.light.elements.common.UIElement; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc1; import static com.epam.jdi.light.elements.common.UIElement.SMART_GET_TEXT; import static com.epam.jdi.light.elements.common.UIElement.SMART_LIST_TEXT; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/common/Timeout.java b/jdi-light/src/main/java/com/epam/jdi/light/common/Timeout.java index 7ea3108ba8..343ad9b235 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/common/Timeout.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/common/Timeout.java @@ -1,6 +1,6 @@ package com.epam.jdi.light.common; -import com.epam.jdi.tools.Safe; +import com.jdiai.tools.Safe; import static com.epam.jdi.light.common.Exceptions.exception; import static com.epam.jdi.light.settings.WebSettings.logger; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/common/UIUtils.java b/jdi-light/src/main/java/com/epam/jdi/light/common/UIUtils.java index 3233222d34..6ab9d249e6 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/common/UIUtils.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/common/UIUtils.java @@ -8,10 +8,10 @@ import com.epam.jdi.light.elements.interfaces.base.INamed; import com.epam.jdi.light.elements.interfaces.common.IsButton; import com.epam.jdi.light.elements.pageobjects.annotations.Name; -import com.epam.jdi.tools.func.JFunc2; -import com.epam.jdi.tools.map.MapArray; -import com.epam.jdi.tools.map.MultiMap; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.func.JFunc2; +import com.jdiai.tools.map.MapArray; +import com.jdiai.tools.map.MultiMap; +import com.jdiai.tools.pairs.Pair; import org.apache.commons.lang3.ObjectUtils; import org.openqa.selenium.WebElement; @@ -25,10 +25,10 @@ import static com.epam.jdi.light.elements.init.UIFactory.$; import static com.epam.jdi.light.elements.pageobjects.annotations.WebAnnotationsUtil.hasAnnotation; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; -import static com.epam.jdi.tools.LinqUtils.*; -import static com.epam.jdi.tools.ReflectionUtils.*; -import static com.epam.jdi.tools.StringUtils.setPrimitiveField; +import static com.jdiai.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.LinqUtils.*; +import static com.jdiai.tools.ReflectionUtils.*; +import static com.jdiai.tools.StringUtils.setPrimitiveField; import static org.apache.commons.lang3.ObjectUtils.isEmpty; /** diff --git a/jdi-light/src/main/java/com/epam/jdi/light/common/UnixProcessUtils.java b/jdi-light/src/main/java/com/epam/jdi/light/common/UnixProcessUtils.java index 907d989795..ae1ec40907 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/common/UnixProcessUtils.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/common/UnixProcessUtils.java @@ -6,7 +6,7 @@ import java.util.Collections; import java.util.List; -import static com.epam.jdi.tools.StringUtils.inputStreamToList; +import static com.jdiai.tools.StringUtils.inputStreamToList; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/driver/ScreenshotMaker.java b/jdi-light/src/main/java/com/epam/jdi/light/driver/ScreenshotMaker.java index 500c47aa2b..58a46a9b18 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/driver/ScreenshotMaker.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/driver/ScreenshotMaker.java @@ -1,6 +1,6 @@ package com.epam.jdi.light.driver; -import com.epam.jdi.tools.func.JFunc2; +import com.jdiai.tools.func.JFunc2; import org.openqa.selenium.TakesScreenshot; import javax.imageio.ImageIO; @@ -15,8 +15,8 @@ import static com.epam.jdi.light.settings.JDISettings.SCREEN; import static com.epam.jdi.light.settings.WebSettings.TEST_NAME; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.PathUtils.mergePath; -import static com.epam.jdi.tools.Timer.nowTime; +import static com.jdiai.tools.PathUtils.mergePath; +import static com.jdiai.tools.Timer.nowTime; import static java.awt.Toolkit.getDefaultToolkit; import static org.apache.commons.io.FileUtils.copyFile; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/driver/WebDriverByUtils.java b/jdi-light/src/main/java/com/epam/jdi/light/driver/WebDriverByUtils.java index b848ffbcd3..54f9d880bd 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/driver/WebDriverByUtils.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/driver/WebDriverByUtils.java @@ -1,9 +1,9 @@ package com.epam.jdi.light.driver; import com.epam.jdi.light.elements.interfaces.base.IBaseElement; -import com.epam.jdi.tools.func.JFunc; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.map.MapArray; +import com.jdiai.tools.func.JFunc; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.map.MapArray; import org.apache.commons.lang3.StringUtils; import org.openqa.selenium.By; import org.openqa.selenium.SearchContext; @@ -21,10 +21,10 @@ import static com.epam.jdi.light.common.Exceptions.exception; import static com.epam.jdi.light.driver.WebDriverFactory.getDriver; import static com.epam.jdi.light.settings.WebSettings.printSmartLocators; -import static com.epam.jdi.tools.LinqUtils.*; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.ReflectionUtils.isClass; -import static java.lang.String.format; +import static com.jdiai.tools.LinqUtils.*; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.ReflectionUtils.isClass; +import static com.jdiai.tools.StringUtils.format; import static java.util.Collections.singletonList; import static org.apache.logging.log4j.util.Strings.isBlank; import static org.apache.logging.log4j.util.Strings.isNotEmpty; @@ -128,7 +128,7 @@ public static By getByFromString(String stringLocator) { case "tag": return By.tagName(split[1]); case "link": return By.partialLinkText(split[1]); default: throw new RuntimeException( - String.format("Can't get By locator from string: %s. Bad suffix: %s. (available: css, xpath, class, id, name, link, tag)", + format("Can't get By locator from string: %s. Bad suffix: %s. (available: css, xpath, class, id, name, link, tag)", stringLocator, split[0])); } } @@ -185,10 +185,12 @@ public static List searchBy(By by) { return valueOrDefault(replaceChildren(result), one(by)); } catch (Exception ex) { throw new RuntimeException("Search By failed"); } } + public static JFunc1 NAME_TO_LOCATOR = WebDriverByUtils::defineLocator; + public static By defineLocator(String locator) { String by = locator.contains("*root*") - ? locator.replace("\\*root\\*", "") + ? locator.replace("*root*", "") : locator; if (isBlank(by)) { return By.cssSelector(""); diff --git a/jdi-light/src/main/java/com/epam/jdi/light/driver/WebDriverFactory.java b/jdi-light/src/main/java/com/epam/jdi/light/driver/WebDriverFactory.java index 7e1b8ba89a..0fba410843 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/driver/WebDriverFactory.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/driver/WebDriverFactory.java @@ -1,11 +1,11 @@ package com.epam.jdi.light.driver; import com.epam.jdi.light.driver.get.DriverTypes; -import com.epam.jdi.tools.Safe; -import com.epam.jdi.tools.Timer; -import com.epam.jdi.tools.func.JFunc; -import com.epam.jdi.tools.map.MapArray; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.Safe; +import com.jdiai.tools.Timer; +import com.jdiai.tools.func.JFunc; +import com.jdiai.tools.map.MapArray; +import com.jdiai.tools.pairs.Pair; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; @@ -18,8 +18,8 @@ import static com.epam.jdi.light.settings.JDISettings.DRIVER; import static com.epam.jdi.light.settings.JDISettings.TIMEOUTS; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.safeException; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.LinqUtils.safeException; +import static com.jdiai.tools.StringUtils.LINE_BREAK; import static java.lang.Thread.currentThread; import static org.apache.commons.lang3.ObjectUtils.isNotEmpty; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/driver/WebDriverUtils.java b/jdi-light/src/main/java/com/epam/jdi/light/driver/WebDriverUtils.java index 9cf50b0630..488edfeb27 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/driver/WebDriverUtils.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/driver/WebDriverUtils.java @@ -2,13 +2,13 @@ import com.epam.jdi.light.common.LinuxProcessUtils; import com.epam.jdi.light.common.UnixProcessUtils; -import com.epam.jdi.tools.func.JAction1; +import com.jdiai.tools.func.JAction1; import java.io.IOException; import static com.epam.jdi.light.settings.WebSettings.logger; +import static com.jdiai.tools.StringUtils.format; import static java.lang.Runtime.getRuntime; -import static java.lang.String.format; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/driver/get/DownloadDriverManager.java b/jdi-light/src/main/java/com/epam/jdi/light/driver/get/DownloadDriverManager.java index b75219e798..b0cd1e0a50 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/driver/get/DownloadDriverManager.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/driver/get/DownloadDriverManager.java @@ -1,6 +1,6 @@ package com.epam.jdi.light.driver.get; -import com.epam.jdi.tools.func.JFunc3; +import com.jdiai.tools.func.JFunc3; import io.github.bonigarcia.wdm.WebDriverManager; import static com.epam.jdi.light.common.Exceptions.exception; @@ -8,8 +8,8 @@ import static com.epam.jdi.light.driver.get.DriverVersion.PENULT; import static com.epam.jdi.light.settings.JDISettings.DRIVER; import static com.epam.jdi.light.settings.WebSettings.logger; +import static com.jdiai.tools.StringUtils.format; import static io.github.bonigarcia.wdm.WebDriverManager.*; -import static java.lang.String.format; import static org.apache.commons.lang3.StringUtils.isNotBlank; /** @@ -61,9 +61,8 @@ public static String downloadDriver(DriverTypes driverType, Platform platform, S wdm.setup(); wdm.browserVersion(getBelowVersion()); } - if (isNotBlank(DRIVER.gitHubTokenName) && isNotBlank(DRIVER.gitHubTokenSecret)) { - wdm.gitHubTokenName(DRIVER.gitHubTokenName); - wdm.gitHubTokenSecret(DRIVER.gitHubTokenSecret); + if (isNotBlank(DRIVER.gitHubToken)) { + wdm.gitHubToken(DRIVER.gitHubToken); } wdm.setup(); logger.info("Download driver: '" + driverName + "' successfully"); diff --git a/jdi-light/src/main/java/com/epam/jdi/light/driver/get/DriverData.java b/jdi-light/src/main/java/com/epam/jdi/light/driver/get/DriverData.java index 3c4809ea03..c36222deca 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/driver/get/DriverData.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/driver/get/DriverData.java @@ -1,7 +1,7 @@ package com.epam.jdi.light.driver.get; -import com.epam.jdi.tools.func.JAction; -import com.epam.jdi.tools.func.JAction1; +import com.jdiai.tools.func.JAction; +import com.jdiai.tools.func.JAction1; import org.openqa.selenium.Dimension; import org.openqa.selenium.MutableCapabilities; import org.openqa.selenium.Point; @@ -26,15 +26,15 @@ import static com.epam.jdi.light.settings.JDISettings.COMMON; import static com.epam.jdi.light.settings.JDISettings.DRIVER; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.safeException; -import static com.epam.jdi.tools.PathUtils.mergePath; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.ReflectionUtils.isClass; -import static com.epam.jdi.tools.ReflectionUtils.stringToPrimitive; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; -import static com.epam.jdi.tools.switcher.SwitchActions.*; +import static com.jdiai.tools.LinqUtils.safeException; +import static com.jdiai.tools.PathUtils.mergePath; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.ReflectionUtils.isClass; +import static com.jdiai.tools.ReflectionUtils.stringToPrimitive; +import static com.jdiai.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.StringUtils.format; +import static com.jdiai.tools.switcher.SwitchActions.*; import static java.awt.Toolkit.getDefaultToolkit; -import static java.lang.String.format; import static org.apache.commons.lang3.ObjectUtils.isNotEmpty; import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.openqa.selenium.UnexpectedAlertBehaviour.ACCEPT; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/driver/get/DriverInfo.java b/jdi-light/src/main/java/com/epam/jdi/light/driver/get/DriverInfo.java index 0e662bdf32..ce51925cce 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/driver/get/DriverInfo.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/driver/get/DriverInfo.java @@ -1,8 +1,8 @@ package com.epam.jdi.light.driver.get; -import com.epam.jdi.tools.DataClass; -import com.epam.jdi.tools.func.JFunc; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.DataClass; +import com.jdiai.tools.func.JFunc; +import com.jdiai.tools.func.JFunc1; import org.openqa.selenium.Capabilities; import org.openqa.selenium.MutableCapabilities; import org.openqa.selenium.WebDriver; @@ -24,9 +24,9 @@ import static com.epam.jdi.light.driver.get.RemoteDriverInfo.getRemoteURL; import static com.epam.jdi.light.settings.JDISettings.DRIVER; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.safeException; +import static com.jdiai.tools.LinqUtils.safeException; +import static com.jdiai.tools.StringUtils.format; import static java.lang.Integer.parseInt; -import static java.lang.String.format; import static java.lang.System.getProperty; import static java.lang.System.setProperty; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/driver/get/RemoteDriverInfo.java b/jdi-light/src/main/java/com/epam/jdi/light/driver/get/RemoteDriverInfo.java index 6aac7ba7ba..2718b5c58d 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/driver/get/RemoteDriverInfo.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/driver/get/RemoteDriverInfo.java @@ -2,7 +2,7 @@ import static com.epam.jdi.light.common.Exceptions.exception; import static com.epam.jdi.light.settings.JDISettings.DRIVER; -import static java.lang.String.format; +import static com.jdiai.tools.StringUtils.format; import static java.lang.System.getenv; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/driver/sauce/SauceSettings.java b/jdi-light/src/main/java/com/epam/jdi/light/driver/sauce/SauceSettings.java index 8d89bbd3c3..e444f54169 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/driver/sauce/SauceSettings.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/driver/sauce/SauceSettings.java @@ -1,6 +1,6 @@ package com.epam.jdi.light.driver.sauce; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; import java.util.HashMap; import java.util.Map; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/base/Condition.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/base/Condition.java index 0b9f4fbd95..84de0ae377 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/base/Condition.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/base/Condition.java @@ -3,7 +3,7 @@ import com.epam.jdi.light.common.JDIAction; import com.epam.jdi.light.elements.interfaces.base.ICoreElement; import com.epam.jdi.light.elements.interfaces.base.INamed; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc1; import static com.epam.jdi.light.elements.base.JDIBase.NAMES; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/base/Conditions.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/base/Conditions.java index 447cd51e28..ec9787d7d5 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/base/Conditions.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/base/Conditions.java @@ -1,7 +1,9 @@ package com.epam.jdi.light.elements.base; +import com.epam.jdi.light.elements.interfaces.base.ICoreElement; import org.openqa.selenium.WebElement; +import static com.epam.jdi.light.elements.common.Directions.*; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -145,6 +147,57 @@ public static Condition cssValue(String name, String value) { public static Condition checked = selected; + + public static Condition above(ICoreElement element) { + return condition("%element% is %not% on the Top of '" + element.core().getFullName() + "'", + el -> el.core().isAbove(element)); + } + + public static Condition below(ICoreElement element) { + return condition("%element% is %not% Below '" + element.core().getFullName() + "'", + el -> el.core().isBelow(element)); + } + + public static Condition onLeftOf(ICoreElement element) { + return condition("%element% is %not% on the Left of '" + element.core().getFullName() + "'", + el -> el.core().isOnLeftOf(element)); + } + + public static Condition onRightOf(ICoreElement element) { + return condition("%element% is %not% on the Right of '" + element.core().getFullName() + "'", + el -> el.core().isOnRightOf(element)); + } + + public static Condition onTopLeftOf(ICoreElement element) { + return condition("%element% is %not% on the Top-Left of '" + element.core().getFullName() + "'", + el -> TOP_LEFT.apply(element.core().getDirectionTo(el))); + } + + public static Condition onTopRightOf(ICoreElement element) { + return condition("%element% is %not% on the Top-Right of '" + element.core().getFullName() + "'", + el -> TOP_RIGHT.apply(element.core().getDirectionTo(el))); + } + + public static Condition onBottomLeftOf(ICoreElement element) { + return condition("%element% is %not% on the Bottom-Left of '" + element.core().getFullName() + "'", + el -> BOTTOM_LEFT.apply(element.core().getDirectionTo(el))); + } + + public static Condition onBottomRightOf(ICoreElement element) { + return condition("%element% is %not% on the Bottom-Right of '" + element.core().getFullName() + "'", + el -> BOTTOM_RIGHT.apply(element.core().getDirectionTo(el))); + } + + public static Condition onSameLine(ICoreElement element) { + return condition("%element% is %not% on the same line '" + element.core().getFullName() + "'", + el -> SAME_HORIZONTAL.apply(element.core().getDirectionTo(el))); + } + + public static Condition onSameVerticalLine(ICoreElement element) { + return condition("%element% is %not% on the same vertical line '" + element.core().getFullName() + "'", + el -> SAME_VERTICAL.apply(element.core().getDirectionTo(el))); + } + public static Condition not(Condition condition) { return condition(getNotName(condition), el -> !condition.execute(el)); } diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/base/DriverBase.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/base/DriverBase.java index 075a9d5596..07e7a24ca9 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/base/DriverBase.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/base/DriverBase.java @@ -15,8 +15,8 @@ import static com.epam.jdi.light.elements.init.entities.collection.EntitiesCollection.PAGES; import static com.epam.jdi.light.settings.JDISettings.DRIVER; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.ReflectionUtils.isClass; -import static com.epam.jdi.tools.StringUtils.splitCamelCase; +import static com.jdiai.tools.ReflectionUtils.isClass; +import static com.jdiai.tools.StringUtils.splitCamelCase; import static org.apache.commons.lang3.StringUtils.isBlank; /** @@ -30,6 +30,7 @@ public abstract class DriverBase implements JDIElement { public String typeName = ""; public String failElement = ""; public Object parent; + public Object siteName; protected String context; private String pageName; @@ -79,18 +80,25 @@ public void setTypeName(String typeName) { public String getName() { return isBlank(name) ? getClass().getSimpleName() : name; } + public String getFullName() { + return isBlank(varName) ? getName() : varName; + } public void setPage(String page) { pageName = page; } public WebPage getPage() { - if (pageName != null) + if (pageName != null) { return PAGES.get().keys().contains(pageName) ? PAGES.get().get(pageName) : null; - if (parent == null) return null; - if (isClass(parent.getClass(), WebPage.class)) + } + if (parent == null) { + return null; + } + if (isClass(parent.getClass(), WebPage.class)) { return (WebPage) parent; + } if (!isClass(parent.getClass(), DriverBase.class)) { String pageName = splitCamelCase(parent.getClass().getSimpleName()); return PAGES.get().keys().contains(pageName) diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/base/JDIBase.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/base/JDIBase.java index 83d5b8f8f5..b1be3c105a 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/base/JDIBase.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/base/JDIBase.java @@ -9,14 +9,14 @@ import com.epam.jdi.light.elements.interfaces.base.IBaseElement; import com.epam.jdi.light.elements.interfaces.base.ICoreElement; import com.epam.jdi.light.elements.pageobjects.annotations.locators.MarkupLocator; -import com.epam.jdi.tools.CacheValue; -import com.epam.jdi.tools.Safe; -import com.epam.jdi.tools.Timer; -import com.epam.jdi.tools.func.JAction1; -import com.epam.jdi.tools.func.JFunc; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.map.MapArray; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.CacheValue; +import com.jdiai.tools.Safe; +import com.jdiai.tools.Timer; +import com.jdiai.tools.func.JAction1; +import com.jdiai.tools.func.JFunc; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.map.MapArray; +import com.jdiai.tools.pairs.Pair; import org.openqa.selenium.By; import org.openqa.selenium.SearchContext; import org.openqa.selenium.WebElement; @@ -37,10 +37,10 @@ import static com.epam.jdi.light.logger.LogLevels.*; import static com.epam.jdi.light.settings.JDISettings.*; import static com.epam.jdi.light.settings.WebSettings.SMART_SEARCH; -import static com.epam.jdi.tools.LinqUtils.map; -import static com.epam.jdi.tools.ReflectionUtils.isClass; -import static com.epam.jdi.tools.StringUtils.msgFormat; -import static com.epam.jdi.tools.switcher.SwitchActions.*; +import static com.jdiai.tools.LinqUtils.map; +import static com.jdiai.tools.ReflectionUtils.isClass; +import static com.jdiai.tools.StringUtils.msgFormat; +import static com.jdiai.tools.switcher.SwitchActions.*; import static org.apache.commons.lang3.ObjectUtils.isNotEmpty; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -100,28 +100,34 @@ public JDIBase setCore(JDIBase base) { public DriverBase setParent(Object parent) { return super.setParent(parent); } + protected MapArray> searchRules() { return searchRules; } + WebElement beforeSearch(WebElement el) { (beforeSearch == null ? ELEMENT.beforeSearch : beforeSearch).execute(new UIElement(el)); return el; } + public void setup(SiteInfo info) { defaultSetup(info, this); + siteName = DRIVER.siteName; if (parent != null && isClass(parent.getClass(), IBaseElement.class)) { JDIBase parentBase = ((IBaseElement)parent).base(); searchRules = parentBase.searchRules.copy(); } - if (info.field != null) { - for (Pair aRule : JDI_ANNOTATIONS) { - try { - Class annotation = aRule.value.annotation; - if (hasAnnotation(info.field, annotation)) - aRule.value.action.execute(this, info.field.getAnnotation(annotation), info.field); - } catch (Exception ex) { - throw exception(ex, "Setup element '%s' with Annotation '%s' failed", info.name(), aRule.key); + if (info.field == null) { + return; + } + for (Pair aRule : JDI_ANNOTATIONS) { + try { + Class annotation = aRule.value.annotation; + if (hasAnnotation(info.field, annotation)) { + aRule.value.action.execute(this, info.field.getAnnotation(annotation), info.field); } + } catch (Exception ex) { + throw exception(ex, "Setup element '%s' with Annotation '%s' failed", info.name(), aRule.key); } } } diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/base/JDILocator.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/base/JDILocator.java index 5b7c0d83b7..1589687253 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/base/JDILocator.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/base/JDILocator.java @@ -1,7 +1,7 @@ package com.epam.jdi.light.elements.base; import com.epam.jdi.light.driver.WebDriverByUtils; -import com.epam.jdi.tools.Safe; +import com.jdiai.tools.Safe; import org.openqa.selenium.By; import java.util.List; @@ -11,9 +11,9 @@ import static com.epam.jdi.light.settings.JDISettings.ELEMENT; import static com.epam.jdi.light.settings.WebSettings.logger; import static com.epam.jdi.light.settings.WebSettings.printSmartLocators; -import static com.epam.jdi.tools.LinqUtils.map; -import static com.epam.jdi.tools.PrintUtils.print; -import static java.lang.String.format; +import static com.jdiai.tools.LinqUtils.map; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.StringUtils.format; import static org.apache.commons.lang3.StringUtils.*; /** diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/base/JdiSettings.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/base/JdiSettings.java index 2b79977c35..bd80a8df20 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/base/JdiSettings.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/base/JdiSettings.java @@ -5,9 +5,9 @@ import com.epam.jdi.light.elements.composite.WebPage; import com.epam.jdi.light.elements.interfaces.base.IBaseElement; import com.epam.jdi.light.elements.interfaces.base.JDIElement; -import com.epam.jdi.tools.func.JAction2; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.func.JFunc2; +import com.jdiai.tools.func.JAction2; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc2; import org.openqa.selenium.By; import org.openqa.selenium.SearchContext; import org.openqa.selenium.WebDriver; @@ -22,12 +22,12 @@ import static com.epam.jdi.light.settings.JDISettings.ELEMENT; import static com.epam.jdi.light.settings.WebSettings.SMART_SEARCH; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; -import static com.epam.jdi.tools.LinqUtils.filter; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.ReflectionUtils.isClass; -import static com.epam.jdi.tools.ReflectionUtils.isInterface; -import static java.lang.String.format; +import static com.jdiai.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.LinqUtils.filter; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.ReflectionUtils.isClass; +import static com.jdiai.tools.ReflectionUtils.isInterface; +import static com.jdiai.tools.StringUtils.format; import static org.apache.commons.lang3.ObjectUtils.isEmpty; import static org.apache.commons.lang3.ObjectUtils.isNotEmpty; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/base/SeleniumSettings.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/base/SeleniumSettings.java index d3dbe79216..3283ea0b6c 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/base/SeleniumSettings.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/base/SeleniumSettings.java @@ -1,6 +1,6 @@ package com.epam.jdi.light.elements.base; -import com.epam.jdi.tools.func.JFunc2; +import com.jdiai.tools.func.JFunc2; import org.openqa.selenium.WebElement; public class SeleniumSettings { diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/base/UIBaseElement.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/base/UIBaseElement.java index 3cbf70cee6..732e44bb50 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/base/UIBaseElement.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/base/UIBaseElement.java @@ -7,7 +7,7 @@ import com.epam.jdi.light.elements.interfaces.base.HasInit; import com.epam.jdi.light.elements.interfaces.base.ICoreElement; import com.epam.jdi.light.elements.pageobjects.annotations.locators.MarkupLocator; -import com.epam.jdi.tools.Safe; +import com.jdiai.tools.Safe; /** * Created by Roman Iovlev on 26.09.2019 @@ -15,26 +15,32 @@ */ public abstract class UIBaseElement> implements ICoreElement, HasAssert, HasInit { private Safe uiElement = new Safe<>(UIElement::new); + public JDIBase base() { return core().base(); } + public UIElement core() { return uiElement.get(); } + public void init() { UIElement element = new UIElement(uiElement.get().base()); uiElement = new Safe<>(() -> element); } protected boolean thisParent = false; + protected UIElement linked(@MarkupLocator String locator, String name) { UIElement el = new UIElement(base(), locator, getName() + " " + name, this); - if (thisParent) + if (thisParent) { el.setParent(base().parent); + } return el; } protected WebList linkedList(@MarkupLocator String locator, String name) { WebList list = new WebList(base(), locator, getName() + " " + name, this); list.searchVisible(); - if (thisParent) + if (thisParent) { list.setParent(base().parent); + } return list; } diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/common/Direction.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/common/Direction.java new file mode 100644 index 0000000000..378965e3ff --- /dev/null +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/common/Direction.java @@ -0,0 +1,44 @@ +package com.epam.jdi.light.elements.common; + +import org.openqa.selenium.Point; + +import java.util.function.BiFunction; + +import static com.jdiai.tools.StringUtils.format; +import static java.lang.Math.pow; +import static java.lang.Math.sqrt; + +public class Direction { + public static BiFunction VECTOR_SIMILARITY = + (v1, v2) -> v1.angle == v2.angle && v1.length == v2.length; + + private int angle; + private int length; + + public Direction(int angle, int length) { + this.angle = angle; + this.length = length; + } + public Direction(Point point1, Point point2) { + double difX = point2.x - point1.x; + double difY = point2.y - point1.y; + angle = calculateAngle(difX, difY); + length = (int) sqrt(pow(difY, 2) + pow(difX, 2)); + } + private int calculateAngle(double difX, double difY) { + float angle = (float) Math.toDegrees(Math.atan2(-difY, difX)); + if(angle < 0){ + angle += 360; + } + return (int) angle; + } + public int angle() { return angle; } + public double length() { return length; } + public boolean isSimilarTo(Direction vector) { + return VECTOR_SIMILARITY.apply(this, vector); + } + @Override + public String toString() { + return format("(angle:%s, length:%s)", angle, length); + } +} diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/common/Directions.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/common/Directions.java new file mode 100644 index 0000000000..29da1b40e0 --- /dev/null +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/common/Directions.java @@ -0,0 +1,53 @@ +package com.epam.jdi.light.elements.common; + +import java.util.function.Function; + +import static com.epam.jdi.light.common.Exceptions.exception; +import static com.google.common.collect.Range.closed; + +public class Directions { + public static int MAIN_ACCURACY = 90; + public static int SECOND_ACCURACY = 45; + public static int LINE_ACCURACY = 5; + public static int ANGLE_ACCURACY = 5; + + public static Function LOWER = DIRECTION(90, MAIN_ACCURACY); + public static Function HIGHER = DIRECTION(270, MAIN_ACCURACY); + public static Function RIGHT = DIRECTION(180, MAIN_ACCURACY); + public static Function LEFT = DIRECTION(0, MAIN_ACCURACY); + + public static Function TOP_RIGHT = DIRECTION(45, SECOND_ACCURACY); + public static Function TOP_LEFT = DIRECTION(135, SECOND_ACCURACY); + public static Function BOTTOM_LEFT = DIRECTION(225, SECOND_ACCURACY); + public static Function BOTTOM_RIGHT = DIRECTION(315, SECOND_ACCURACY); + + public static Function SAME_HORIZONTAL = + d -> closed(180 - LINE_ACCURACY, 180 + LINE_ACCURACY).contains(d.angle()) + || closed(0, LINE_ACCURACY).contains(d.angle()) + || closed(360 - LINE_ACCURACY, 360).contains(d.angle()); + + public static Function SAME_VERTICAL = + d -> closed(90 - LINE_ACCURACY, 90 + LINE_ACCURACY).contains(d.angle()) + || closed(270 - LINE_ACCURACY, 270 + LINE_ACCURACY).contains(d.angle()); + + public static Function DIRECTION(int angle, int accuracy) { + if (angle < 0 || angle > 360 || accuracy < 0 || accuracy > 180) { + throw exception("Angle should be in range [0, 360]; Accuracy in [0, 180], but Angle=%s; Accuracy=%s", + angle, accuracy); + } + int lower = angle - accuracy; + int upper = angle + accuracy; + if (lower >= 0 && upper <= 360) { + return d -> d.angle() >= lower && d.angle() <= upper; + } + int min = lower < 0 ? 360 + lower : lower; + int max = upper > 360 ? upper - 360 : upper; + return d -> (d.angle() <= max && d.angle() >= 0) || (d.angle() <= 360 && d.angle() >= min); + } + public static Function ANGLE(int angle, int accuracy) { + return DIRECTION(angle, accuracy); + } + public static Function ANGLE(int angle) { + return ANGLE(angle, ANGLE_ACCURACY); + } +} diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/common/Keyboard.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/common/Keyboard.java index adf1b3ad86..517d41a914 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/common/Keyboard.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/common/Keyboard.java @@ -1,8 +1,8 @@ package com.epam.jdi.light.elements.common; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.ReflectionUtils; -import com.epam.jdi.tools.Timer; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.ReflectionUtils; +import com.jdiai.tools.Timer; import org.apache.commons.lang3.ArrayUtils; import org.openqa.selenium.Keys; @@ -15,7 +15,7 @@ import static com.epam.jdi.light.common.Exceptions.exception; import static com.epam.jdi.light.driver.get.DriverData.getOs; -import static com.epam.jdi.tools.LinqUtils.first; +import static com.jdiai.tools.LinqUtils.first; import static java.lang.reflect.Modifier.isStatic; public class Keyboard { diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/common/Mouse.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/common/Mouse.java index 50c137274e..a3d39c557f 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/common/Mouse.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/common/Mouse.java @@ -6,7 +6,7 @@ import static com.epam.jdi.light.elements.common.Keyboard.getRobot; import static com.epam.jdi.light.elements.composite.WebPage.zoomLevel; -import static com.epam.jdi.tools.Timer.sleep; +import static com.jdiai.tools.Timer.sleep; import static java.awt.event.InputEvent.BUTTON1_DOWN_MASK; import static java.awt.event.InputEvent.BUTTON2_DOWN_MASK; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/common/UIElement.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/common/UIElement.java index b75b8dab79..8aff35902b 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/common/UIElement.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/common/UIElement.java @@ -13,12 +13,12 @@ import com.epam.jdi.light.elements.interfaces.common.IsInput; import com.epam.jdi.light.elements.interfaces.common.IsText; import com.epam.jdi.light.elements.pageobjects.annotations.locators.MarkupLocator; -import com.epam.jdi.tools.Timer; -import com.epam.jdi.tools.func.JAction1; -import com.epam.jdi.tools.func.JFunc; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.func.JFunc2; -import com.epam.jdi.tools.map.MapArray; +import com.jdiai.tools.Timer; +import com.jdiai.tools.func.JAction1; +import com.jdiai.tools.func.JFunc; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc2; +import com.jdiai.tools.map.MapArray; import org.hamcrest.Matchers; import org.openqa.selenium.*; import org.openqa.selenium.interactions.Actions; @@ -43,16 +43,17 @@ import static com.epam.jdi.light.logger.LogLevels.DEBUG; import static com.epam.jdi.light.settings.JDISettings.SCREEN; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; -import static com.epam.jdi.tools.JsonUtils.getInt; -import static com.epam.jdi.tools.LinqUtils.map; -import static com.epam.jdi.tools.LinqUtils.valueOrDefault; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.ReflectionUtils.create; -import static com.epam.jdi.tools.switcher.SwitchActions.Case; -import static com.epam.jdi.tools.switcher.SwitchActions.Switch; +import static com.jdiai.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.JsonUtils.getInt; +import static com.jdiai.tools.LinqUtils.map; +import static com.jdiai.tools.LinqUtils.valueOrDefault; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.ReflectionUtils.create; +import static com.jdiai.tools.ReflectionUtils.isInterface; +import static com.jdiai.tools.StringUtils.format; +import static com.jdiai.tools.switcher.SwitchActions.Case; +import static com.jdiai.tools.switcher.SwitchActions.Switch; import static java.lang.Math.abs; -import static java.lang.String.format; import static java.lang.String.valueOf; import static java.util.Arrays.asList; import static org.apache.commons.lang3.StringUtils.isBlank; @@ -884,6 +885,37 @@ public UIElement inFrame(String... bys) { return setup(base -> base.setFrames(map(bys, WebDriverByUtils::defineLocator))); } + public MapArray relations; + + public UIElement clearRelations() { + relations = null; + return this; + } + + protected Point getCenter(Rectangle rect) { + int x = rect.x + rect.width / 2; + int y = rect.y + rect.height / 2; + return new Point(x, y); + } + + public Direction getDirectionTo(ICoreElement element) { + return getDirectionTo(element.core().getWebElement()); + } + public Direction getDirectionTo(WebElement element) { + Rectangle elementCoordinates = getRect(); + Rectangle destinationCoordinates = element.getRect(); + Direction direction = new Direction(getCenter(elementCoordinates), getCenter(destinationCoordinates)); + if (isInterface(element.getClass(), ICoreElement.class)) { + ICoreElement core = ((ICoreElement)element).core(); + if (relations == null) { + relations = new MapArray<>(core.getFullName(), direction); + } else { + relations.update(core.getFullName(), direction); + } + } + return direction; + } + public IsAssert is() { return new IsAssert().set(this); } diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/common/WindowsManager.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/common/WindowsManager.java index ca00f610e1..6ae67dfff5 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/common/WindowsManager.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/common/WindowsManager.java @@ -1,16 +1,19 @@ package com.epam.jdi.light.elements.common; import com.epam.jdi.light.common.JDIAction; -import com.epam.jdi.tools.Safe; -import com.epam.jdi.tools.map.MapArray; +import com.epam.jdi.light.elements.pageobjects.annotations.Name; +import com.jdiai.tools.Safe; +import com.jdiai.tools.map.MapArray; import org.openqa.selenium.Dimension; +import java.util.List; import java.util.Set; import static com.epam.jdi.light.common.Exceptions.exception; import static com.epam.jdi.light.driver.WebDriverFactory.getDriver; import static com.epam.jdi.light.driver.WebDriverFactory.jsExecute; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; +import static org.apache.commons.lang3.ObjectUtils.isEmpty; import static org.apache.commons.lang3.StringUtils.isBlank; /** @@ -24,12 +27,28 @@ public class WindowsManager { public static Set getWindows() { Set wHandles = getDriver().getWindowHandles(); - if (windowHandles.get() != null && windowHandles.get().size() < wHandles.size()) + if (windowHandles.get() != null && windowHandles.get().size() < wHandles.size()) { newWindow.set(true); + } windowHandles.set(wHandles); return wHandles; } + public static void openSiteTab(Class site) { + String name = site.isAnnotationPresent(Name.class) + ? site.getAnnotation(Name.class).value() + : site.getSimpleName(); + if (isEmpty(windowHandlesMap.get())) { + setWindowName(name); + return; + } + if (windowHandlesMap.get().has(name)) { + switchToWindow(name); + } else { + openNewTab(name); + } + } + /** * Check the new window is opened * @return boolean @@ -54,6 +73,9 @@ public static void setWindowName(String value) { windowHandlesMap.get().update(value, getDriver().getWindowHandle()); } + public static List registeredWindows() { + return windowHandlesMap.get().keys(); + } /** * Get windows count * @return int count @@ -69,10 +91,12 @@ public static int windowsCount() { @JDIAction("Switch to new window") public static void switchToNewWindow() { String last = ""; - for (String window : getWindows()) + for (String window : getWindows()) { last = window; - if (!isBlank(last)) + } + if (!isBlank(last)) { getDriver().switchTo().window(last); + } else throw exception("No windows found"); } @@ -82,6 +106,17 @@ public static void switchToNewWindow() { @JDIAction("Open new tab") public static void openNewTab() { jsExecute("window.open()"); + switchToNewWindow(); + } + + /** + * Open new tab + */ + @JDIAction("Open new tab '{0}'") + public static void openNewTab(String name) { + jsExecute("window.open()"); + switchToNewWindow(); + setWindowName(name); } /** diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/Checklist.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/Checklist.java index d3b3bf62f4..ec8b87f648 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/Checklist.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/Checklist.java @@ -10,10 +10,10 @@ import static com.epam.jdi.light.common.TextTypes.LABEL; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; -import static com.epam.jdi.tools.EnumUtils.getEnumValues; -import static com.epam.jdi.tools.LinqUtils.ifSelect; -import static com.epam.jdi.tools.PrintUtils.print; +import static com.jdiai.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.EnumUtils.getEnumValues; +import static com.jdiai.tools.LinqUtils.ifSelect; +import static com.jdiai.tools.PrintUtils.print; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/DataList.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/DataList.java index 78961d9a36..6551a6f717 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/DataList.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/DataList.java @@ -4,8 +4,8 @@ import com.epam.jdi.light.common.JDIAction; import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.interfaces.base.ICoreElement; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.pairs.Pair; import org.hamcrest.Matcher; import org.hamcrest.MatcherAssert; @@ -17,9 +17,9 @@ import static com.epam.jdi.light.common.Exceptions.exception; import static com.epam.jdi.light.common.UIUtils.asEntity; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.ReflectionUtils.getGenericTypes; +import static com.jdiai.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.ReflectionUtils.getGenericTypes; /** * Created by Roman Iovlev on 14.02.2018 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/IList.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/IList.java index fb747d0cbb..7d457a8a37 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/IList.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/IList.java @@ -3,10 +3,10 @@ import com.epam.jdi.light.elements.interfaces.base.HasRefresh; import com.epam.jdi.light.elements.interfaces.base.HasValue; import com.epam.jdi.light.elements.interfaces.base.IBaseElement; -import com.epam.jdi.tools.HasStartIndex; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.func.JAction1; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.HasStartIndex; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.func.JAction1; +import com.jdiai.tools.func.JFunc1; import java.util.Collection; import java.util.Iterator; @@ -14,8 +14,8 @@ import java.util.ListIterator; import static com.epam.jdi.light.common.Exceptions.exception; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; -import static com.epam.jdi.tools.LinqUtils.*; +import static com.jdiai.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.LinqUtils.*; /** * Created by Roman Iovlev on 14.02.2018 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/ISelector.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/ISelector.java index f5e1c631d7..77cf24c314 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/ISelector.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/ISelector.java @@ -8,13 +8,13 @@ import com.epam.jdi.light.elements.interfaces.base.INamed; import com.epam.jdi.light.elements.interfaces.base.SetValue; import com.epam.jdi.light.elements.interfaces.common.IsText; -import com.epam.jdi.tools.HasStartIndex; +import com.jdiai.tools.HasStartIndex; import java.util.List; import static com.epam.jdi.light.logger.LogLevels.DEBUG; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; -import static com.epam.jdi.tools.LinqUtils.map; +import static com.jdiai.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.LinqUtils.map; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/JList.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/JList.java index f1841afcc8..3556c33b1e 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/JList.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/JList.java @@ -4,7 +4,7 @@ import com.epam.jdi.light.common.JDIAction; import com.epam.jdi.light.elements.interfaces.base.ICoreElement; import com.epam.jdi.light.elements.pageobjects.annotations.locators.MarkupLocator; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc1; import org.hamcrest.Matcher; import org.hamcrest.MatcherAssert; import org.openqa.selenium.By; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/ListBase.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/ListBase.java index 2a4553dfcb..ea4362c5f9 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/ListBase.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/ListBase.java @@ -10,9 +10,9 @@ import com.epam.jdi.light.elements.interfaces.base.ICoreElement; import com.epam.jdi.light.elements.interfaces.common.IsText; import com.epam.jdi.light.elements.pageobjects.annotations.Title; -import com.epam.jdi.tools.CacheValue; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.CacheValue; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.func.JFunc1; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; @@ -27,7 +27,7 @@ import static com.epam.jdi.light.logger.LogLevels.DEBUG; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.ReflectionUtils.*; +import static com.jdiai.tools.ReflectionUtils.*; /** * Created by Roman Iovlev on 14.02.2018 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/Selector.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/Selector.java index 3a177cce77..a474595e72 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/Selector.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/Selector.java @@ -20,10 +20,10 @@ import static com.epam.jdi.light.elements.init.UIFactory.$$; import static com.epam.jdi.light.logger.LogLevels.DEBUG; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.EnumUtils.getEnumValues; -import static com.epam.jdi.tools.LinqUtils.ifSelect; -import static com.epam.jdi.tools.LinqUtils.map; -import static com.epam.jdi.tools.PrintUtils.print; +import static com.jdiai.tools.EnumUtils.getEnumValues; +import static com.jdiai.tools.LinqUtils.ifSelect; +import static com.jdiai.tools.LinqUtils.map; +import static com.jdiai.tools.PrintUtils.print; import static java.util.Arrays.asList; /** diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/WebList.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/WebList.java index a9b4ebb3b1..dcb13f2d6e 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/WebList.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/WebList.java @@ -11,14 +11,14 @@ import com.epam.jdi.light.elements.interfaces.base.HasUIList; import com.epam.jdi.light.elements.interfaces.base.SetValue; import com.epam.jdi.light.elements.pageobjects.annotations.locators.MarkupLocator; -import com.epam.jdi.tools.CacheValue; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.func.JAction1; -import com.epam.jdi.tools.func.JFunc; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.map.MapArray; -import com.epam.jdi.tools.pairs.Pair; import com.google.common.primitives.Ints; +import com.jdiai.tools.CacheValue; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.func.JAction1; +import com.jdiai.tools.func.JFunc; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.map.MapArray; +import com.jdiai.tools.pairs.Pair; import org.apache.commons.lang3.ArrayUtils; import org.hamcrest.Matcher; import org.hamcrest.MatcherAssert; @@ -42,13 +42,13 @@ import static com.epam.jdi.light.logger.LogLevels.DEBUG; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; -import static com.epam.jdi.tools.EnumUtils.getEnumValues; -import static com.epam.jdi.tools.LinqUtils.any; -import static com.epam.jdi.tools.LinqUtils.toList; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.ReflectionUtils.isClass; -import static java.lang.String.format; +import static com.jdiai.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.EnumUtils.getEnumValues; +import static com.jdiai.tools.LinqUtils.any; +import static com.jdiai.tools.LinqUtils.toList; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.ReflectionUtils.isClass; +import static com.jdiai.tools.StringUtils.format; import static java.util.Arrays.asList; import static java.util.Collections.max; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -688,4 +688,4 @@ public WebList finds(By locator) { List els = elements(1).selectMany(el -> el.finds(locator).webElements()); return $$(els, getName() + ">" + locator); } -} \ No newline at end of file +} diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/dropdown/Dropdown.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/dropdown/Dropdown.java index fae60b2882..11afaa1d37 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/dropdown/Dropdown.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/dropdown/Dropdown.java @@ -14,6 +14,7 @@ public class Dropdown extends DropdownExpand { protected DropdownSelect ds() { return new DropdownSelect().setCore(DropdownSelect.class, base()); } + @Override public UIElement iCore() { return setupDone ? value() : ds().core(); @@ -70,6 +71,7 @@ public String getText() { public String getValue() { return getText(); } + @Override public void setValue(String value) { if (setupDone) diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/dropdown/DropdownExpand.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/dropdown/DropdownExpand.java index cdecf03899..b4cc96d689 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/dropdown/DropdownExpand.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/dropdown/DropdownExpand.java @@ -138,38 +138,41 @@ else if (isNotBlank(value)) { } if (isNotBlank(value)) { valueLocator = value; - expandLocator = isNotBlank(expand) - ? expand - : value; - } else if (isNotBlank(expand)) + expandLocator = isNotBlank(expand) ? expand : value; + } else if (isNotBlank(expand)) { expandLocator = expand; - if (isNotBlank(list)) + } + if (isNotBlank(list)) { listLocator = list; + } setupDone = true; return this; } - public void setup(Field field) { - if (!fieldHasAnnotation(field, JDropdown.class, IsDropdown.class)) { - return; - } - JDropdown j = field.getAnnotation(JDropdown.class); - setup(j.root(), j.value(), j.list(), j.expand()); - autoClose = j.autoClose(); - } - @JDIAction("Check that '{name}' is displayed") public boolean isDisplayed() { return value().isDisplayed(); } + @Override public DropdownAssert is() { return new DropdownAssert().set(this); } + public int getStartIndex() { return startIndex; } + public void setStartIndex(int index) { startIndex = index; } + + public void setup(Field field) { + if (!fieldHasAnnotation(field, JDropdown.class, IsDropdown.class)) { + return; + } + JDropdown j = field.getAnnotation(JDropdown.class); + setup(j.root(), j.value(), j.list(), j.expand()); + autoClose = j.autoClose(); + } } \ No newline at end of file diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/dropdown/DropdownSelect.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/dropdown/DropdownSelect.java index f491f983c2..6971f2b978 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/dropdown/DropdownSelect.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/dropdown/DropdownSelect.java @@ -7,7 +7,7 @@ import com.epam.jdi.light.elements.complex.Selector; import com.epam.jdi.light.elements.complex.WebList; import com.epam.jdi.light.elements.interfaces.complex.IsDropdown; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc1; import java.util.List; @@ -24,6 +24,7 @@ public class DropdownSelect extends UIBaseElement implements IsD protected Selector selector() { return new Selector().setCore(Selector.class, base()); } + public WebList list() { WebList list = selector().list(); list.setStartIndex(getStartIndex()); @@ -52,15 +53,19 @@ public void select(int index) { public String selected() { return selector().selected(); } + public boolean wait(JFunc1 condition) { return base().timer().wait(() -> condition.execute(this)); } + @Override public boolean selected(String option) { return selector().selected(option); } + @Override public List values() { return selector().values(); } + @Override public List values(TextTypes type) { return selector().values(); } @@ -70,9 +75,11 @@ public DropdownAssert is() { } public boolean isExpanded() { throw exception("isExpanded can not be used with this element"); } + public int getStartIndex() { return startIndex; } + public void setStartIndex(int index) { startIndex = index; } diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/BaseTable.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/BaseTable.java index e845834e2e..eed0b124a2 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/BaseTable.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/BaseTable.java @@ -15,12 +15,12 @@ import com.epam.jdi.light.elements.interfaces.common.IsText; import com.epam.jdi.light.elements.pageobjects.annotations.NoCache; import com.epam.jdi.light.elements.pageobjects.annotations.locators.JTable; -import com.epam.jdi.tools.CacheValue; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.Safe; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.map.MapArray; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.CacheValue; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.Safe; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.map.MapArray; +import com.jdiai.tools.pairs.Pair; import org.apache.commons.lang3.ObjectUtils; import org.hamcrest.Matcher; import org.openqa.selenium.By; @@ -39,11 +39,11 @@ import static com.epam.jdi.light.elements.pageobjects.annotations.WebAnnotationsUtil.hasAnnotation; import static com.epam.jdi.light.elements.pageobjects.annotations.objects.FillFromAnnotationRules.fieldHasAnnotation; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; -import static com.epam.jdi.tools.LinqUtils.*; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; -import static java.lang.String.format; +import static com.jdiai.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.LinqUtils.*; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.StringUtils.format; import static java.util.Arrays.asList; import static java.util.Arrays.stream; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/CacheAll.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/CacheAll.java index 888e815ed9..ec8ec0aeed 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/CacheAll.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/CacheAll.java @@ -1,8 +1,8 @@ package com.epam.jdi.light.elements.complex.table; -import com.epam.jdi.tools.CacheValue; -import com.epam.jdi.tools.Safe; -import com.epam.jdi.tools.func.JFunc; +import com.jdiai.tools.CacheValue; +import com.jdiai.tools.Safe; +import com.jdiai.tools.func.JFunc; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Column.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Column.java index 7cfbf5cde3..71bac2dfcf 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Column.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Column.java @@ -1,6 +1,6 @@ package com.epam.jdi.light.elements.complex.table; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.EnumUtils.getEnumValue; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/DataGrid.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/DataGrid.java index 0ff27ce3fc..baac101bba 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/DataGrid.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/DataGrid.java @@ -8,9 +8,9 @@ import com.epam.jdi.light.elements.interfaces.base.HasInit; import com.epam.jdi.light.elements.interfaces.base.HasValue; import com.epam.jdi.light.elements.interfaces.composite.PageObject; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.Safe; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.Safe; +import com.jdiai.tools.func.JFunc1; import org.openqa.selenium.WebElement; import java.lang.reflect.Field; @@ -22,8 +22,8 @@ import static com.epam.jdi.light.common.Exceptions.exception; import static com.epam.jdi.light.elements.pageobjects.annotations.WebAnnotationsUtil.getElementName; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.ReflectionUtils.*; -import static com.epam.jdi.tools.StringUtils.setPrimitiveField; +import static com.jdiai.tools.ReflectionUtils.*; +import static com.jdiai.tools.StringUtils.setPrimitiveField; import static java.util.Arrays.asList; /** diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/DataTable.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/DataTable.java index e3287a5e21..d9f3c3b93e 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/DataTable.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/DataTable.java @@ -9,10 +9,10 @@ import com.epam.jdi.light.elements.interfaces.base.HasValue; import com.epam.jdi.light.elements.interfaces.composite.PageObject; import com.epam.jdi.light.elements.pageobjects.annotations.NoCache; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.map.MapArray; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.map.MapArray; +import com.jdiai.tools.pairs.Pair; import org.apache.commons.lang3.ObjectUtils; import org.hamcrest.Matcher; import org.hamcrest.MatcherAssert; @@ -29,11 +29,11 @@ import static com.epam.jdi.light.elements.pageobjects.annotations.WebAnnotationsUtil.hasAnnotation; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.ReflectionUtils.*; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; -import static com.epam.jdi.tools.StringUtils.setPrimitiveField; +import static com.jdiai.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.ReflectionUtils.*; +import static com.jdiai.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.StringUtils.setPrimitiveField; import static java.util.Arrays.asList; /** diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Grid.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Grid.java index d3f8280cfd..54b2109030 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Grid.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Grid.java @@ -20,9 +20,9 @@ import static com.epam.jdi.light.elements.pageobjects.annotations.objects.FillFromAnnotationRules.fieldHasAnnotation; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.toList; -import static com.epam.jdi.tools.Timer.getByCondition; -import static java.lang.String.format; +import static com.jdiai.tools.LinqUtils.toList; +import static com.jdiai.tools.StringUtils.format; +import static com.jdiai.tools.Timer.getByCondition; import static java.util.Arrays.asList; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/IDataGrid.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/IDataGrid.java index 5f8fab8d9a..da75a3c226 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/IDataGrid.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/IDataGrid.java @@ -5,8 +5,8 @@ import com.epam.jdi.light.elements.complex.WebList; import com.epam.jdi.light.elements.interfaces.base.ICoreElement; import com.epam.jdi.light.elements.interfaces.composite.PageObject; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.func.JFunc1; import org.hamcrest.Matcher; import java.util.List; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/IGrid.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/IGrid.java index d0fb291271..07f49690f4 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/IGrid.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/IGrid.java @@ -5,8 +5,8 @@ import com.epam.jdi.light.elements.complex.WebList; import com.epam.jdi.light.elements.interfaces.base.HasValue; import com.epam.jdi.light.elements.interfaces.common.IsText; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.PrintUtils; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.PrintUtils; import org.openqa.selenium.WebElement; import java.util.ArrayList; @@ -16,10 +16,10 @@ import static com.epam.jdi.light.elements.init.UIFactory.$; import static com.epam.jdi.light.elements.init.UIFactory.$$; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; -import static com.epam.jdi.tools.LinqUtils.firstIndex; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; -import static java.lang.String.format; +import static com.jdiai.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.LinqUtils.firstIndex; +import static com.jdiai.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.StringUtils.format; /** * Created by Roman Iovlev on 24.09.2020 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Line.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Line.java index 537dd6b222..484758145d 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Line.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Line.java @@ -6,14 +6,14 @@ import com.epam.jdi.light.elements.complex.IList; import com.epam.jdi.light.elements.complex.WebList; import com.epam.jdi.light.elements.interfaces.base.IBaseElement; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.PrintUtils; -import com.epam.jdi.tools.Timer; -import com.epam.jdi.tools.func.JFunc; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.map.MapArray; -import com.epam.jdi.tools.map.MultiMap; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.PrintUtils; +import com.jdiai.tools.Timer; +import com.jdiai.tools.func.JFunc; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.map.MapArray; +import com.jdiai.tools.map.MultiMap; +import com.jdiai.tools.pairs.Pair; import org.apache.commons.lang3.ObjectUtils; import org.openqa.selenium.WebElement; @@ -25,9 +25,9 @@ import static com.epam.jdi.light.elements.pageobjects.annotations.WebAnnotationsUtil.getElementName; import static com.epam.jdi.light.logger.LogLevels.DEBUG; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.ReflectionUtils.create; -import static com.epam.jdi.tools.ReflectionUtils.getValueField; -import static com.epam.jdi.tools.StringUtils.setPrimitiveField; +import static com.jdiai.tools.ReflectionUtils.create; +import static com.jdiai.tools.ReflectionUtils.getValueField; +import static com.jdiai.tools.StringUtils.setPrimitiveField; import static java.util.Arrays.asList; /** diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/NameNum.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/NameNum.java index 2dfed8c0a8..7912682fa8 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/NameNum.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/NameNum.java @@ -1,13 +1,13 @@ package com.epam.jdi.light.elements.complex.table; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; import java.util.List; import static com.epam.jdi.light.common.Exceptions.exception; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.firstIndex; -import static com.epam.jdi.tools.StringUtils.format; +import static com.jdiai.tools.LinqUtils.firstIndex; +import static com.jdiai.tools.StringUtils.format; import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Row.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Row.java index 9d2e1db462..ff955cf81c 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Row.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Row.java @@ -1,6 +1,6 @@ package com.epam.jdi.light.elements.complex.table; -import static com.epam.jdi.tools.EnumUtils.getEnumValue; +import static com.jdiai.tools.EnumUtils.getEnumValue; /** * Created by Roman Iovlev on 14.02.2018 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Table.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Table.java index bf1ef49a23..d990ad6c2d 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Table.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/Table.java @@ -4,7 +4,7 @@ import com.epam.jdi.light.elements.complex.IList; import com.epam.jdi.light.elements.complex.ISetup; import com.epam.jdi.light.elements.interfaces.base.HasValue; -import com.epam.jdi.tools.LinqUtils; +import com.jdiai.tools.LinqUtils; import java.util.List; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/TableMatcher.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/TableMatcher.java index 519d3b2a35..b6d7a57d0f 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/TableMatcher.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/TableMatcher.java @@ -3,7 +3,7 @@ import com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher; import org.openqa.selenium.support.ui.Quotes; -import static java.lang.String.format; +import static com.jdiai.tools.StringUtils.format; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/matchers/ColumnMatcher.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/matchers/ColumnMatcher.java index 494327749b..65ec356ee5 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/matchers/ColumnMatcher.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/matchers/ColumnMatcher.java @@ -7,7 +7,7 @@ import java.text.MessageFormat; import static com.epam.jdi.light.elements.complex.table.matchers.TableMatcherSettings.*; -import static java.lang.String.format; +import static com.jdiai.tools.StringUtils.format; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/matchers/TableMatcherSettings.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/matchers/TableMatcherSettings.java index 8d600c1c44..3ff98ce5c7 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/matchers/TableMatcherSettings.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/complex/table/matchers/TableMatcherSettings.java @@ -2,13 +2,13 @@ import com.epam.jdi.light.elements.complex.WebList; import com.epam.jdi.light.elements.complex.table.BaseTable; -import com.epam.jdi.tools.func.JFunc2; +import com.jdiai.tools.func.JFunc2; import org.openqa.selenium.support.ui.Quotes; import static com.epam.jdi.light.elements.init.UIFactory.$$; -import static com.epam.jdi.tools.LinqUtils.map; -import static com.epam.jdi.tools.PrintUtils.print; -import static java.lang.String.format; +import static com.jdiai.tools.LinqUtils.map; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.StringUtils.format; import static java.util.Arrays.asList; public class TableMatcherSettings { diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/composite/Form.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/composite/Form.java index 3a66523c38..3e7074233f 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/composite/Form.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/composite/Form.java @@ -9,11 +9,11 @@ import com.epam.jdi.light.elements.interfaces.base.ICoreElement; import com.epam.jdi.light.elements.interfaces.base.SetValue; import com.epam.jdi.light.elements.pageobjects.annotations.MapToField; -import com.epam.jdi.tools.func.JAction4; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.func.JFunc3; -import com.epam.jdi.tools.map.MapArray; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.func.JAction4; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc3; +import com.jdiai.tools.map.MapArray; +import com.jdiai.tools.pairs.Pair; import org.apache.commons.lang3.ObjectUtils; import java.lang.reflect.Field; @@ -28,11 +28,11 @@ import static com.epam.jdi.light.elements.pageobjects.annotations.WebAnnotationsUtil.hasAnnotation; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.first; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.ReflectionUtils.*; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; -import static java.lang.String.format; +import static com.jdiai.tools.LinqUtils.first; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.ReflectionUtils.*; +import static com.jdiai.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.StringUtils.format; /** * Created by Roman Iovlev on 29.03.2018 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/composite/WebPage.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/composite/WebPage.java index 8d0007ff22..d90579307f 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/composite/WebPage.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/composite/WebPage.java @@ -7,9 +7,9 @@ import com.epam.jdi.light.elements.interfaces.composite.PageObject; import com.epam.jdi.light.elements.pageobjects.annotations.Title; import com.epam.jdi.light.elements.pageobjects.annotations.Url; -import com.epam.jdi.tools.CacheValue; -import com.epam.jdi.tools.Safe; -import com.epam.jdi.tools.Timer; +import com.jdiai.tools.CacheValue; +import com.jdiai.tools.Safe; +import com.jdiai.tools.Timer; import org.openqa.selenium.OutputType; import org.openqa.selenium.TakesScreenshot; import org.openqa.selenium.logging.LogEntry; @@ -29,8 +29,7 @@ import static com.epam.jdi.light.common.VisualCheckPage.CHECK_PAGE; import static com.epam.jdi.light.driver.ScreenshotMaker.getPath; import static com.epam.jdi.light.driver.WebDriverFactory.*; -import static com.epam.jdi.light.elements.common.WindowsManager.checkNewWindowIsOpened; -import static com.epam.jdi.light.elements.common.WindowsManager.getWindows; +import static com.epam.jdi.light.elements.common.WindowsManager.*; import static com.epam.jdi.light.elements.init.PageFactory.initElements; import static com.epam.jdi.light.elements.init.PageFactory.initSite; import static com.epam.jdi.light.elements.pageobjects.annotations.WebAnnotationsUtil.getUrlFromUri; @@ -40,13 +39,13 @@ import static com.epam.jdi.light.logger.Strategy.NEW_PAGE; import static com.epam.jdi.light.settings.JDISettings.*; import static com.epam.jdi.light.settings.WebSettings.*; -import static com.epam.jdi.tools.JsonUtils.getDouble; -import static com.epam.jdi.tools.LinqUtils.map; -import static com.epam.jdi.tools.PathUtils.mergePath; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.StringUtils.msgFormat; -import static com.epam.jdi.tools.switcher.SwitchActions.*; -import static java.lang.String.format; +import static com.jdiai.tools.JsonUtils.getDouble; +import static com.jdiai.tools.LinqUtils.map; +import static com.jdiai.tools.PathUtils.mergePath; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.StringUtils.format; +import static com.jdiai.tools.StringUtils.msgFormat; +import static com.jdiai.tools.switcher.SwitchActions.*; import static org.apache.commons.io.FileUtils.copyFile; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -56,7 +55,6 @@ * Email: roman.iovlev.jdi@gmail.com; Skype: roman.iovlev */ public class WebPage extends DriverBase implements PageObject { - public String url = ""; public String title = ""; @@ -64,6 +62,14 @@ public class WebPage extends DriverBase implements PageObject { public CheckTypes checkUrlType = CONTAINS; public CheckTypes checkTitleType = NONE; + public WebPage() { + initElements(this); + } + public WebPage(String url) { + setUrl(url, url, CONTAINS); + } + public WebPage(String url, String title) { this(url); this.title = title; } + public Form asForm() { return new Form<>().setPageObject(this) .setup(Form.class, e -> e.setName(getName() + " Form").setParent(this)); @@ -84,22 +90,17 @@ public static void setCurrentPage(WebPage page) { } } - public WebPage() { - initElements(this); - } - public WebPage(String url) { - setUrl(url, url, CONTAINS); - } - public WebPage(String url, String title) { this(url); this.title = title; } public static void openUrl(String url, String pageName) { WebPage page = new WebPage(url); page.setName(isNotBlank(pageName) ? pageName : ""); page.open(); } + public static void openUrl(String url) { init(); - if (!hasDomain() && url.contains("://")) + if (!hasDomain() && url.contains("://")) { DRIVER.domain = url; + } new WebPage(url).open(); } public static void checkUrl(String url) { @@ -144,6 +145,9 @@ public static void openSite(Class site) { } WebPage page = new WebPage(domain); page.setName(site.getSimpleName()); + if (PAGE.useMultiTabsSite) { + openSiteTab(site); + } page.open(); } /** @@ -215,14 +219,17 @@ private void open(String url) { isTop.set(true); setCurrentPage(this); } + public void open(Object... params) { open(getUrlWithParams(params)); } + private String getUrlWithParams(Object... params) { - if (params == null || params.length == 0) + if (params == null || params.length == 0) { return url; + } if (url.contains("%s")) { - return String.format(url, params); + return format(url, params); } return url.contains("{0}") ? MessageFormat.format(url, params) diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/init/InitActions.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/init/InitActions.java index 936275c397..a3486247ca 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/init/InitActions.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/init/InitActions.java @@ -20,8 +20,8 @@ import com.epam.jdi.light.elements.pageobjects.annotations.*; import com.epam.jdi.light.elements.pageobjects.annotations.locators.*; import com.epam.jdi.light.elements.pageobjects.annotations.smart.*; -import com.epam.jdi.tools.HasStartIndex; -import com.epam.jdi.tools.map.MapArray; +import com.jdiai.tools.HasStartIndex; +import com.jdiai.tools.map.MapArray; import org.openqa.selenium.WebElement; import java.lang.reflect.Field; @@ -38,12 +38,12 @@ import static com.epam.jdi.light.settings.JDISettings.DRIVER; import static com.epam.jdi.light.settings.WebSettings.TEST_GROUP; import static com.epam.jdi.light.settings.WebSettings.VISUAL_ACTION_STRATEGY; -import static com.epam.jdi.tools.LinqUtils.*; -import static com.epam.jdi.tools.ReflectionUtils.*; -import static com.epam.jdi.tools.StringUtils.format; -import static com.epam.jdi.tools.StringUtils.toKebabCase; -import static com.epam.jdi.tools.map.MapArray.map; -import static com.epam.jdi.tools.pairs.Pair.$; +import static com.jdiai.tools.LinqUtils.*; +import static com.jdiai.tools.ReflectionUtils.*; +import static com.jdiai.tools.StringUtils.format; +import static com.jdiai.tools.StringUtils.toKebabCase; +import static com.jdiai.tools.map.MapArray.map; +import static com.jdiai.tools.pairs.Pair.$; import static org.apache.commons.lang3.StringUtils.isBlank; /** @@ -105,10 +105,12 @@ private static boolean isSetupValue(SiteInfo info) { } public static DriverBase defaultSetup(SiteInfo info, DriverBase jdi) { - if (jdi.parent == null) + if (jdi.parent == null) { jdi.setParent(info.parent); - if (!jdi.name.matches("[A-Z].*")) + } + if (!jdi.name.matches("[A-Z].*")) { jdi.setName(info); + } jdi.driverName = isBlank(info.driverName) ? DRIVER.name : info.driverName; return jdi; } diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/init/JDITalk.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/init/JDITalk.java index b21af79085..6f13368295 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/init/JDITalk.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/init/JDITalk.java @@ -10,7 +10,7 @@ import com.epam.jdi.light.elements.composite.WebPage; import com.epam.jdi.light.elements.interfaces.complex.IsDropdown; import com.epam.jdi.light.elements.pageobjects.annotations.locators.MarkupLocator; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc1; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/init/PageFactory.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/init/PageFactory.java index b91dc3f3f2..cb19c9d634 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/init/PageFactory.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/init/PageFactory.java @@ -11,11 +11,12 @@ import com.epam.jdi.light.elements.init.rules.SetupRule; import com.epam.jdi.light.elements.interfaces.base.HasInit; import com.epam.jdi.light.elements.interfaces.composite.PageObject; +import com.epam.jdi.light.elements.pageobjects.annotations.Name; import com.epam.jdi.light.elements.pageobjects.annotations.Title; import com.epam.jdi.light.elements.pageobjects.annotations.Url; -import com.epam.jdi.tools.func.JFunc; -import com.epam.jdi.tools.map.MapArray; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.func.JFunc; +import com.jdiai.tools.map.MapArray; +import com.jdiai.tools.pairs.Pair; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.pagefactory.ElementLocatorFactory; import org.openqa.selenium.support.pagefactory.FieldDecorator; @@ -32,11 +33,9 @@ import static com.epam.jdi.light.settings.JDISettings.DRIVER; import static com.epam.jdi.light.settings.WebSettings.init; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.*; -import static com.epam.jdi.tools.ReflectionUtils.*; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; -import static com.epam.jdi.tools.StringUtils.splitCamelCase; -import static java.lang.String.format; +import static com.jdiai.tools.LinqUtils.*; +import static com.jdiai.tools.ReflectionUtils.*; +import static com.jdiai.tools.StringUtils.*; import static java.lang.reflect.Modifier.isStatic; import static java.util.Arrays.asList; @@ -53,10 +52,19 @@ public static void initSite(Class site) { public static void initSite(Class site, String driverName) { init(); SiteInfo info = new SiteInfo(driverName) - .set(s->s.parentClass = site); - DRIVER.siteName = site.getSimpleName(); + .set(s -> s.siteName = site.getSimpleName()); + DRIVER.siteName = getSiteName(site); initialize(site, info); } + protected static String getSiteName(Class site) { + if (site == null) { + return ""; + } + return site.isAnnotationPresent(Name.class) + ? site.getAnnotation(Name.class).value() + : site.getSimpleName(); + } + private static void initialize(Class site, SiteInfo info) { setDomain(site); for (Field pageField : getSiteFields(site)) { @@ -78,19 +86,22 @@ private static void setFieldWithInstance(SiteInfo info, Object obj) throws Illeg } private static Object getElementInstance(SiteInfo info) { info.instance = getValueField(info.field, info.parent); - if (info.instance == null) + if (info.instance == null) { initJdiField(info); - if (info.instance != null) + } + if (info.instance != null) { setupFieldUsingRules(info); + } return info.instance; } public static void initJdiField(SiteInfo info) { logger.trace("initJdiField"); - if (info.type().isInterface()) + if (info.type().isInterface()) { initUsingRules(info); - else + } else { initWithConstructor(info); + } } public static void setupFieldUsingRules(SiteInfo info) { logger.trace("setupFieldUsingRules"); @@ -211,14 +222,16 @@ public static void initElements(SiteInfo info) { List fields = filter(poFields, f -> isJDIField(f) || isPageObject(f.getType())); SiteInfo pageInfo = new SiteInfo(info); pageInfo.parent = info.instance; - for (Field field : fields) + for (Field field : fields) { setField(field, pageInfo, info); + } } private static void initPage(Object page) { SiteInfo info = new SiteInfo(DRIVER.name, page); - if (isClass(page.getClass(), WebPage.class)) + if (isClass(page.getClass(), WebPage.class)) { initWebPage((WebPage) page); + } initElements(info); } @@ -267,4 +280,4 @@ public static void initElements(FieldDecorator decorator, Object page) { initElements(page); } // endregion -} \ No newline at end of file +} diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/init/SiteInfo.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/init/SiteInfo.java index f7361ae38f..a68ab58692 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/init/SiteInfo.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/init/SiteInfo.java @@ -3,63 +3,73 @@ import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.interfaces.base.IBaseElement; import com.epam.jdi.light.elements.interfaces.base.ICoreElement; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; import java.lang.reflect.Field; -import static java.lang.String.format; +import static com.jdiai.tools.StringUtils.format; /** * Created by Roman Iovlev on 26.09.2019 * Email: roman.iovlev.jdi@gmail.com; Skype: roman.iovlev */ public class SiteInfo extends DataClass { + public String siteName; public Field field; public Class cl; public String name; + public Object parent; + public Class type() { - if (cl != null) + if (cl != null) { return cl; - if (field != null) + } + if (field != null) { return field.getType(); + } return instance != null ? cl = instance.getClass() : null; } + public String name() { - return name != null - ? name : ( field != null - ? field.getName() - : "Undefined element"); + if (name != null) { + return name; + } + return field != null ? field.getName() : "Undefined element"; } - public Class parentClass; - public Object parent; + public String parentName() { - if (parent != null) + if (parent != null) { return parent.getClass().getSimpleName(); - return parentClass != null - ? parentClass.getSimpleName() - : ""; + } + return siteName; } + public Object instance; + public UIElement core() { return ((ICoreElement) instance).core(); } + public IBaseElement base() { return (IBaseElement) instance; } + public String driverName; public SiteInfo(String driver) { this.driverName = driver; } + public SiteInfo(String driver, Object instance) { this.driverName = driver; this.instance = instance; } + public SiteInfo(SiteInfo info) { this.field = info.field; - this.parentClass = info.parentClass; + this.siteName = info.siteName; this.parent = info.parent; this.instance = info.instance; this.driverName = info.driverName; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/init/entities/collection/EntitiesCollection.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/init/entities/collection/EntitiesCollection.java index 20534a21a0..fda8937ba5 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/init/entities/collection/EntitiesCollection.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/init/entities/collection/EntitiesCollection.java @@ -6,11 +6,11 @@ import com.epam.jdi.light.elements.composite.WebPage; import com.epam.jdi.light.elements.interfaces.base.IBaseElement; import com.epam.jdi.light.elements.interfaces.base.ICoreElement; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.Safe; -import com.epam.jdi.tools.map.MapArray; -import com.epam.jdi.tools.pairs.Pair; import com.fasterxml.jackson.databind.ObjectMapper; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.Safe; +import com.jdiai.tools.map.MapArray; +import com.jdiai.tools.pairs.Pair; import java.io.File; import java.io.IOException; @@ -22,13 +22,13 @@ import static com.epam.jdi.light.elements.composite.WebPage.getCurrentPage; import static com.epam.jdi.light.elements.init.UIFactory.$; import static com.epam.jdi.light.settings.WebSettings.init; -import static com.epam.jdi.tools.JsonUtils.getMapFromJson; -import static com.epam.jdi.tools.JsonUtils.scanFolder; -import static com.epam.jdi.tools.LinqUtils.first; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.PropertyReader.getProperty; -import static com.epam.jdi.tools.ReflectionUtils.isClass; -import static com.epam.jdi.tools.ReflectionUtils.isInterface; +import static com.jdiai.tools.JsonUtils.getMapFromJson; +import static com.jdiai.tools.JsonUtils.scanFolder; +import static com.jdiai.tools.LinqUtils.first; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.PropertyReader.getProperty; +import static com.jdiai.tools.ReflectionUtils.isClass; +import static com.jdiai.tools.ReflectionUtils.isInterface; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/init/rules/AnnotationRule.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/init/rules/AnnotationRule.java index 9ae2d8baa5..c68b87ced0 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/init/rules/AnnotationRule.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/init/rules/AnnotationRule.java @@ -1,8 +1,8 @@ package com.epam.jdi.light.elements.init.rules; import com.epam.jdi.light.elements.interfaces.base.IBaseElement; -import com.epam.jdi.tools.func.JAction2; -import com.epam.jdi.tools.func.JAction3; +import com.jdiai.tools.func.JAction2; +import com.jdiai.tools.func.JAction3; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/init/rules/InitRule.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/init/rules/InitRule.java index 49ea1c9da3..dbd9b30264 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/init/rules/InitRule.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/init/rules/InitRule.java @@ -1,12 +1,12 @@ package com.epam.jdi.light.elements.init.rules; import com.epam.jdi.light.elements.init.SiteInfo; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc1; import java.lang.reflect.Field; import java.util.List; -import static com.epam.jdi.tools.LinqUtils.any; +import static com.jdiai.tools.LinqUtils.any; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/init/rules/SetupRule.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/init/rules/SetupRule.java index 833e9d97e2..7b380d7d0c 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/init/rules/SetupRule.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/init/rules/SetupRule.java @@ -1,8 +1,8 @@ package com.epam.jdi.light.elements.init.rules; import com.epam.jdi.light.elements.init.SiteInfo; -import com.epam.jdi.tools.func.JAction1; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.func.JAction1; +import com.jdiai.tools.func.JFunc1; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/interfaces/base/IBaseElement.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/interfaces/base/IBaseElement.java index 9100bf5ac8..77dea1d515 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/interfaces/base/IBaseElement.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/interfaces/base/IBaseElement.java @@ -2,7 +2,7 @@ import com.epam.jdi.light.elements.base.DriverBase; import com.epam.jdi.light.elements.base.JDIBase; -import com.epam.jdi.tools.func.JAction1; +import com.jdiai.tools.func.JAction1; /** * Created by Roman Iovlev on 26.09.2019 @@ -29,6 +29,9 @@ default DriverBase setName(String name) { default String getName() { return base().getName(); } + default String getFullName() { + return base().getFullName(); + } default void offCache() { base().offCache(); } diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/interfaces/base/ICoreElement.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/interfaces/base/ICoreElement.java index 036a2f3528..8fba2213f4 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/interfaces/base/ICoreElement.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/interfaces/base/ICoreElement.java @@ -2,16 +2,18 @@ import com.epam.jdi.light.common.JDIAction; import com.epam.jdi.light.elements.base.Condition; +import com.epam.jdi.light.elements.common.Direction; import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.complex.WebList; import com.epam.jdi.light.elements.pageobjects.annotations.locators.MarkupLocator; -import com.epam.jdi.tools.map.MapArray; +import com.jdiai.tools.map.MapArray; import org.openqa.selenium.*; import java.util.List; import static com.epam.jdi.light.elements.base.JDIBase.executeShouldBe; -import static java.lang.String.format; +import static com.epam.jdi.light.elements.common.Directions.*; +import static com.jdiai.tools.StringUtils.format; /** * Created by Roman Iovlev on 26.09.2019 @@ -112,6 +114,37 @@ default void pasteText(String text) { default void pasteText(String text, long timeToWaitMSec) { iCore().pasteText(text, timeToWaitMSec); } + default Direction getDirectionTo(WebElement element) { + return core().getDirectionTo(element); + } + default boolean isAbove(WebElement element) { + return HIGHER.apply(core().getDirectionTo(element)); + } + default boolean isBelow(WebElement element) { + return LOWER.apply(core().getDirectionTo(element)); + } + default boolean isOnLeftOf(WebElement element) { + return LEFT.apply(core().getDirectionTo(element)); + } + default boolean isOnRightOf(WebElement element) { + return RIGHT.apply(core().getDirectionTo(element)); + } + default boolean isAbove(ICoreElement element) { + return HIGHER.apply(core().getDirectionTo(element)); + } + default boolean isBelow(ICoreElement element) { + return LOWER.apply(core().getDirectionTo(element)); + } + default boolean isOnLeftOf(ICoreElement element) { + return LEFT.apply(core().getDirectionTo(element)); + } + default boolean isOnRightOf(ICoreElement element) { + return RIGHT.apply(core().getDirectionTo(element)); + } + default Direction getDirectionTo(ICoreElement element) { + return core().getDirectionTo(element); + } + default ICoreElement shouldBe(Condition... conditions) { for (Condition condition : conditions) { executeShouldBe(condition.getName(this), condition, this); diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/interfaces/complex/IsChecklist.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/interfaces/complex/IsChecklist.java index 8a6e732df3..169f520906 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/interfaces/complex/IsChecklist.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/interfaces/complex/IsChecklist.java @@ -3,7 +3,7 @@ import com.epam.jdi.light.asserts.complex.ChecklistAssert; import com.epam.jdi.light.asserts.generic.HasAssert; import com.epam.jdi.light.elements.complex.ISelector; -import com.epam.jdi.tools.HasStartIndex; +import com.jdiai.tools.HasStartIndex; import java.util.List; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/interfaces/complex/IsDropdown.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/interfaces/complex/IsDropdown.java index 5fecf12a9e..ecc47c4b48 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/interfaces/complex/IsDropdown.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/interfaces/complex/IsDropdown.java @@ -5,7 +5,7 @@ import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.complex.ISelector; import com.epam.jdi.light.elements.interfaces.base.HasLabel; -import com.epam.jdi.tools.HasStartIndex; +import com.jdiai.tools.HasStartIndex; /** * Created by Roman Iovlev on 26.09.2019 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/pageobjects/annotations/WebAnnotationsUtil.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/pageobjects/annotations/WebAnnotationsUtil.java index d58b5f5e51..a9bea9fd0e 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/pageobjects/annotations/WebAnnotationsUtil.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/pageobjects/annotations/WebAnnotationsUtil.java @@ -45,8 +45,9 @@ public static void setDomain(Class siteClass) { COMMON.applicationName = siteClass.getSimpleName(); if (siteClass.isAnnotationPresent(JSite.class)) { String siteDomain = siteClass.getAnnotation(JSite.class).value(); - if (!isBlank(siteDomain)) + if (!isBlank(siteDomain)) { WebSettings.setDomain(siteDomain); + } } } } diff --git a/jdi-light/src/main/java/com/epam/jdi/light/elements/pageobjects/annotations/objects/FillFromAnnotationRules.java b/jdi-light/src/main/java/com/epam/jdi/light/elements/pageobjects/annotations/objects/FillFromAnnotationRules.java index 43be41de63..0473707dd3 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/elements/pageobjects/annotations/objects/FillFromAnnotationRules.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/elements/pageobjects/annotations/objects/FillFromAnnotationRules.java @@ -4,7 +4,7 @@ import java.lang.reflect.Field; import static com.epam.jdi.light.elements.pageobjects.annotations.WebAnnotationsUtil.hasAnnotation; -import static com.epam.jdi.tools.ReflectionUtils.isInterface; +import static com.jdiai.tools.ReflectionUtils.isInterface; /** * Created by Roman Iovlev on 14.02.2018 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/logger/AllureLogger.java b/jdi-light/src/main/java/com/epam/jdi/light/logger/AllureLogger.java index c03360d2d9..15e54c9c15 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/logger/AllureLogger.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/logger/AllureLogger.java @@ -4,8 +4,8 @@ import com.epam.jdi.light.elements.common.Alerts; import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.elements.interfaces.base.ICoreElement; -import com.epam.jdi.tools.Timer; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.Timer; +import com.jdiai.tools.func.JFunc1; import io.qameta.allure.model.StepResult; import org.openqa.selenium.WebElement; import org.openqa.selenium.logging.LogEntry; @@ -23,12 +23,12 @@ import static com.epam.jdi.light.logger.AttachmentStrategy.OFF; import static com.epam.jdi.light.logger.AttachmentStrategy.ON_FAIL; import static com.epam.jdi.light.settings.JDISettings.*; -import static com.epam.jdi.tools.JsonUtils.beautifyJson; -import static com.epam.jdi.tools.LinqUtils.filter; -import static com.epam.jdi.tools.LinqUtils.map; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.ReflectionUtils.isClass; -import static com.epam.jdi.tools.ReflectionUtils.isInterface; +import static com.jdiai.tools.JsonUtils.beautifyJson; +import static com.jdiai.tools.LinqUtils.filter; +import static com.jdiai.tools.LinqUtils.map; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.ReflectionUtils.isClass; +import static com.jdiai.tools.ReflectionUtils.isInterface; import static io.qameta.allure.Allure.addAttachment; import static io.qameta.allure.aspects.StepsAspects.getLifecycle; import static io.qameta.allure.model.Status.PASSED; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/logger/ILogger.java b/jdi-light/src/main/java/com/epam/jdi/light/logger/ILogger.java index d520d56799..e728390f54 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/logger/ILogger.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/logger/ILogger.java @@ -1,6 +1,6 @@ package com.epam.jdi.light.logger; -import com.epam.jdi.tools.func.JFunc; +import com.jdiai.tools.func.JFunc; /** * Created by Roman Iovlev on 14.02.2018 diff --git a/jdi-light/src/main/java/com/epam/jdi/light/logger/JDILogger.java b/jdi-light/src/main/java/com/epam/jdi/light/logger/JDILogger.java index 6272cef66a..93c7517709 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/logger/JDILogger.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/logger/JDILogger.java @@ -1,11 +1,11 @@ package com.epam.jdi.light.logger; -import com.epam.jdi.tools.FixedQueue; -import com.epam.jdi.tools.Safe; -import com.epam.jdi.tools.func.JAction; -import com.epam.jdi.tools.func.JFunc; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.map.MapArray; +import com.jdiai.tools.FixedQueue; +import com.jdiai.tools.Safe; +import com.jdiai.tools.func.JAction; +import com.jdiai.tools.func.JFunc; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.map.MapArray; import org.apache.logging.log4j.*; import java.util.Properties; @@ -15,9 +15,9 @@ import static com.epam.jdi.light.logger.LogLevels.*; import static com.epam.jdi.light.settings.JDISettings.COMMON; import static com.epam.jdi.light.settings.WebSettings.getProperties; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; -import static com.epam.jdi.tools.StringUtils.format; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.StringUtils.format; import static java.lang.Thread.currentThread; import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.apache.logging.log4j.core.config.Configurator.setLevel; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/logger/LogLevels.java b/jdi-light/src/main/java/com/epam/jdi/light/logger/LogLevels.java index b5cc0bb8d7..ebfbd826bb 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/logger/LogLevels.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/logger/LogLevels.java @@ -5,7 +5,7 @@ import java.util.List; import static com.epam.jdi.light.settings.JDISettings.LOGS; -import static com.epam.jdi.tools.LinqUtils.first; +import static com.jdiai.tools.LinqUtils.first; import static java.lang.Integer.MAX_VALUE; import static java.util.Arrays.asList; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/settings/CommonSettings.java b/jdi-light/src/main/java/com/epam/jdi/light/settings/CommonSettings.java index 45c4234027..cd63662faa 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/settings/CommonSettings.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/settings/CommonSettings.java @@ -1,8 +1,8 @@ package com.epam.jdi.light.settings; import static com.epam.jdi.light.settings.Strategies.JDI; -import static com.epam.jdi.tools.PathUtils.mergePath; -import static com.epam.jdi.tools.PathUtils.path; +import static com.jdiai.tools.PathUtils.mergePath; +import static com.jdiai.tools.PathUtils.path; public class CommonSettings { public Strategies strategy = JDI; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/settings/DriverSettings.java b/jdi-light/src/main/java/com/epam/jdi/light/settings/DriverSettings.java index 0a0f917a8e..b90572e31c 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/settings/DriverSettings.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/settings/DriverSettings.java @@ -2,8 +2,8 @@ import com.epam.jdi.light.driver.WebDriverFactory; import com.epam.jdi.light.driver.get.*; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.map.MapArray; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.map.MapArray; import org.openqa.selenium.PageLoadStrategy; import org.openqa.selenium.WebDriver; @@ -12,9 +12,9 @@ import static com.epam.jdi.light.driver.get.DriverVersion.LATEST; import static com.epam.jdi.light.driver.get.GetDriverTypes.DOWNLOAD; import static com.epam.jdi.light.settings.JDISettings.COMMON; -import static com.epam.jdi.tools.PathUtils.mergePath; -import static com.epam.jdi.tools.map.MapArray.map; -import static com.epam.jdi.tools.pairs.Pair.$; +import static com.jdiai.tools.PathUtils.mergePath; +import static com.jdiai.tools.map.MapArray.map; +import static com.jdiai.tools.pairs.Pair.$; import static org.openqa.selenium.PageLoadStrategy.NORMAL; public class DriverSettings { @@ -32,8 +32,7 @@ public class DriverSettings { public Boolean remoteRun = null; public String downloadsFolder = mergePath(COMMON.testPath, "resources", "downloads"); public String videoUrl; - public String gitHubTokenName; - public String gitHubTokenSecret; + public String gitHubToken; public JFunc1 setup = DriverData::driverSettings; public MapArray types = map( diff --git a/jdi-light/src/main/java/com/epam/jdi/light/settings/ElementSettings.java b/jdi-light/src/main/java/com/epam/jdi/light/settings/ElementSettings.java index c7b06271db..8ebbd47125 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/settings/ElementSettings.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/settings/ElementSettings.java @@ -8,11 +8,11 @@ import com.epam.jdi.light.elements.interfaces.base.SetValue; import com.epam.jdi.light.elements.pageobjects.annotations.Mandatory; import com.epam.jdi.light.logger.HighlightStrategy; -import com.epam.jdi.tools.LinqUtils; -import com.epam.jdi.tools.func.JAction1; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.func.JFunc2; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.LinqUtils; +import com.jdiai.tools.func.JAction1; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc2; +import com.jdiai.tools.pairs.Pair; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; @@ -25,9 +25,9 @@ import static com.epam.jdi.light.common.UseSmartSearch.UI_AND_ELEMENTS; import static com.epam.jdi.light.driver.WebDriverByUtils.defineLocator; import static com.epam.jdi.light.elements.pageobjects.annotations.WebAnnotationsUtil.hasAnnotation; -import static com.epam.jdi.tools.ReflectionUtils.getFields; -import static com.epam.jdi.tools.StringUtils.splitCamelCase; -import static java.lang.String.format; +import static com.jdiai.tools.ReflectionUtils.getFields; +import static com.jdiai.tools.StringUtils.format; +import static com.jdiai.tools.StringUtils.splitCamelCase; public class ElementSettings { public JAction1 beforeSearch; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/settings/LogSettings.java b/jdi-light/src/main/java/com/epam/jdi/light/settings/LogSettings.java index bda60222bb..fa6004894c 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/settings/LogSettings.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/settings/LogSettings.java @@ -2,7 +2,7 @@ import com.epam.jdi.light.logger.LogLevels; import com.epam.jdi.light.logger.Strategy; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc1; import org.openqa.selenium.logging.LogEntry; import java.util.ArrayList; @@ -10,7 +10,7 @@ import static com.epam.jdi.light.logger.LogLevels.INFO; import static com.epam.jdi.light.logger.Strategy.FAIL; -import static com.epam.jdi.tools.LinqUtils.newList; +import static com.jdiai.tools.LinqUtils.newList; public class LogSettings { public LogLevels logLevel = INFO; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/settings/PageSettings.java b/jdi-light/src/main/java/com/epam/jdi/light/settings/PageSettings.java index 49891c56c5..99cc7729db 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/settings/PageSettings.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/settings/PageSettings.java @@ -2,9 +2,10 @@ import com.epam.jdi.light.common.PageChecks; import com.epam.jdi.light.elements.composite.WebPage; -import com.epam.jdi.tools.func.JAction1; +import com.jdiai.tools.func.JAction1; public class PageSettings { + public boolean useMultiTabsSite = true; public PageChecks checkPageOpen = PageChecks.NONE; public JAction1 beforeNewPage = WebPage::beforeNewPage; public JAction1 beforeEachStep = WebPage::beforeEachPage; diff --git a/jdi-light/src/main/java/com/epam/jdi/light/settings/ScreenSettings.java b/jdi-light/src/main/java/com/epam/jdi/light/settings/ScreenSettings.java index caf5f304a3..73de4825c5 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/settings/ScreenSettings.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/settings/ScreenSettings.java @@ -1,14 +1,14 @@ package com.epam.jdi.light.settings; -import com.epam.jdi.tools.func.JFunc1; +import com.jdiai.tools.func.JFunc1; import java.io.File; import static com.epam.jdi.light.settings.JDISettings.COMMON; -import static com.epam.jdi.tools.PathUtils.mergePath; -import static com.epam.jdi.tools.PathUtils.path; -import static com.epam.jdi.tools.Timer.nowTime; -import static java.lang.String.format; +import static com.jdiai.tools.PathUtils.mergePath; +import static com.jdiai.tools.PathUtils.path; +import static com.jdiai.tools.StringUtils.format; +import static com.jdiai.tools.Timer.nowTime; import static org.apache.commons.lang3.StringUtils.isBlank; public class ScreenSettings { diff --git a/jdi-light/src/main/java/com/epam/jdi/light/settings/ScreenSize.java b/jdi-light/src/main/java/com/epam/jdi/light/settings/ScreenSize.java index 61e83d0ff3..f3efc42cd3 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/settings/ScreenSize.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/settings/ScreenSize.java @@ -5,7 +5,7 @@ import java.util.List; import static com.epam.jdi.light.common.Exceptions.exception; -import static com.epam.jdi.tools.RegExUtils.matches; +import static com.jdiai.tools.RegExUtils.matches; import static java.lang.Integer.parseInt; public class ScreenSize { diff --git a/jdi-light/src/main/java/com/epam/jdi/light/settings/Strategies.java b/jdi-light/src/main/java/com/epam/jdi/light/settings/Strategies.java index aa0a42fe0c..714d62e23d 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/settings/Strategies.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/settings/Strategies.java @@ -7,14 +7,14 @@ import com.epam.jdi.light.elements.base.SeleniumSettings; import com.epam.jdi.light.elements.common.UIElement; import com.epam.jdi.light.logger.LogLevels; -import com.epam.jdi.tools.func.JAction; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.func.JAction; +import com.jdiai.tools.pairs.Pair; import static com.epam.jdi.light.common.SearchStrategies.ANY_ELEMENT; import static com.epam.jdi.light.common.SearchStrategies.VISIBLE_ELEMENT; import static com.epam.jdi.light.logger.Strategy.*; import static com.epam.jdi.light.settings.JDISettings.*; -import static com.epam.jdi.tools.LinqUtils.list; +import static com.jdiai.tools.LinqUtils.list; public enum Strategies { JDI_SMART(() -> { diff --git a/jdi-light/src/main/java/com/epam/jdi/light/settings/WebSettings.java b/jdi-light/src/main/java/com/epam/jdi/light/settings/WebSettings.java index 14e8070024..7ee1fd4bd2 100644 --- a/jdi-light/src/main/java/com/epam/jdi/light/settings/WebSettings.java +++ b/jdi-light/src/main/java/com/epam/jdi/light/settings/WebSettings.java @@ -8,14 +8,14 @@ import com.epam.jdi.light.elements.interfaces.composite.PageObject; import com.epam.jdi.light.logger.HighlightStrategy; import com.epam.jdi.light.logger.ILogger; -import com.epam.jdi.tools.PropReader; -import com.epam.jdi.tools.PropertyReader; -import com.epam.jdi.tools.Safe; -import com.epam.jdi.tools.func.JAction; -import com.epam.jdi.tools.func.JAction1; -import com.epam.jdi.tools.func.JFunc; -import com.epam.jdi.tools.func.JFunc1; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.PropReader; +import com.jdiai.tools.PropertyReader; +import com.jdiai.tools.Safe; +import com.jdiai.tools.func.JAction; +import com.jdiai.tools.func.JAction1; +import com.jdiai.tools.func.JFunc; +import com.jdiai.tools.func.JFunc1; +import com.jdiai.tools.pairs.Pair; import org.openqa.selenium.*; import java.io.File; @@ -50,17 +50,17 @@ import static com.epam.jdi.light.logger.Strategy.*; import static com.epam.jdi.light.settings.JDISettings.*; import static com.epam.jdi.light.settings.Strategies.*; -import static com.epam.jdi.tools.EnumUtils.getEnumValueByName; -import static com.epam.jdi.tools.LinqUtils.list; -import static com.epam.jdi.tools.LinqUtils.map; -import static com.epam.jdi.tools.PathUtils.mergePath; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.PropertyReader.getProperty; -import static com.epam.jdi.tools.PropertyReader.hasProperty; -import static com.epam.jdi.tools.ReflectionUtils.isInterface; +import static com.jdiai.tools.EnumUtils.getEnumValueByName; +import static com.jdiai.tools.LinqUtils.list; +import static com.jdiai.tools.LinqUtils.map; +import static com.jdiai.tools.PathUtils.mergePath; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.PropertyReader.getProperty; +import static com.jdiai.tools.PropertyReader.hasProperty; +import static com.jdiai.tools.ReflectionUtils.isInterface; +import static com.jdiai.tools.StringUtils.format; import static java.lang.Boolean.parseBoolean; import static java.lang.Integer.parseInt; -import static java.lang.String.format; import static java.util.Arrays.asList; import static org.apache.commons.lang3.StringUtils.*; import static org.openqa.selenium.PageLoadStrategy.EAGER; @@ -186,8 +186,7 @@ public static void jdiSetup() { fillAction(WebSettings::setSearchStrategy, "element.search.strategy"); fillAction(p -> DRIVER.screenSize.read(p), "browser.size"); fillAction(p -> DRIVER.pageLoadStrategy = getPageLoadStrategy(p), "page.load.strategy"); - fillAction(p -> DRIVER.gitHubTokenName = p, "gitHubTokenName"); - fillAction(p -> DRIVER.gitHubTokenSecret = p, "gitHubTokenSecret"); + fillAction(p -> DRIVER.gitHubToken = p, "gitHubToken"); fillAction(p -> PAGE.checkPageOpen = parse(p), "page.check.after.open"); fillAction(SoftAssert::setAssertType, "assert.type"); fillAction(p -> ELEMENT.clickType = getEnumValueByName(ElementArea.class, p, CENTER), "click.type"); diff --git a/pom.xml b/pom.xml index c842ac95bf..f217283058 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.epam.jdi - 1.3.14 + 1.3.15 jdi-2 JDI UI 2.0 pom diff --git a/test-examples/jdi-bdd-no-po-tests/pom.xml b/test-examples/jdi-bdd-no-po-tests/pom.xml index 0019d71675..3485b822f8 100644 --- a/test-examples/jdi-bdd-no-po-tests/pom.xml +++ b/test-examples/jdi-bdd-no-po-tests/pom.xml @@ -6,7 +6,7 @@ com.epam.jdi jdi-bdd-no-po-tests - 1.3.14 + 1.3.15 Examples: JDI BDD no Page Objects @@ -22,7 +22,7 @@ com.epam.jdi jdi-bdd - 1.3.14 + 1.3.15 info.cukes diff --git a/test-examples/jdi-bdd-no-po-tests/src/test/java/cucumberTests/test/data/User.java b/test-examples/jdi-bdd-no-po-tests/src/test/java/cucumberTests/test/data/User.java index 086dc69e6e..03842b638b 100644 --- a/test-examples/jdi-bdd-no-po-tests/src/test/java/cucumberTests/test/data/User.java +++ b/test-examples/jdi-bdd-no-po-tests/src/test/java/cucumberTests/test/data/User.java @@ -1,6 +1,6 @@ package cucumberTests.test.data; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class User extends DataClass { public String name = "Roman", password = "Jdi1234"; diff --git a/test-examples/jdi-light-examples/pom.xml b/test-examples/jdi-light-examples/pom.xml index bfcc439b9d..081c354f1a 100644 --- a/test-examples/jdi-light-examples/pom.xml +++ b/test-examples/jdi-light-examples/pom.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 1.3.14 + 1.3.15 jdi-light-examples Examples: JDI Web Tests com.epam.jdi chrome - 2.13.8 + 2.15.0 2.10.0 9.4.12.RC2 1.9.6 @@ -22,7 +22,7 @@ com.epam.jdi jdi-light - 1.3.14 + 1.3.15 @@ -35,7 +35,7 @@ org.testng testng - 6.14.3 + 7.4.0 test @@ -112,4 +112,4 @@ - \ No newline at end of file + diff --git a/test-examples/jdi-light-examples/src/main/java/io/github/com/custom/Result.java b/test-examples/jdi-light-examples/src/main/java/io/github/com/custom/Result.java index 4aed370f8b..fc49a97f14 100644 --- a/test-examples/jdi-light-examples/src/main/java/io/github/com/custom/Result.java +++ b/test-examples/jdi-light-examples/src/main/java/io/github/com/custom/Result.java @@ -1,6 +1,6 @@ package io.github.com.custom; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class Result extends DataClass { public String name, description, link; diff --git a/test-examples/jdi-light-examples/src/main/java/io/github/com/custom/SearchResult.java b/test-examples/jdi-light-examples/src/main/java/io/github/com/custom/SearchResult.java index eefee51b5b..a6c1c3eef8 100644 --- a/test-examples/jdi-light-examples/src/main/java/io/github/com/custom/SearchResult.java +++ b/test-examples/jdi-light-examples/src/main/java/io/github/com/custom/SearchResult.java @@ -6,7 +6,7 @@ import com.epam.jdi.light.elements.pageobjects.annotations.locators.Css; import static com.epam.jdi.light.settings.WebSettings.logger; -import static java.lang.String.format; +import static com.jdiai.tools.StringUtils.format; public class SearchResult extends Section { @Title @Css("h3") public UIElement name; diff --git a/test-examples/jdi-light-examples/src/main/java/io/github/epam/entities/User.java b/test-examples/jdi-light-examples/src/main/java/io/github/epam/entities/User.java index e1f8f300e8..8199a3384f 100644 --- a/test-examples/jdi-light-examples/src/main/java/io/github/epam/entities/User.java +++ b/test-examples/jdi-light-examples/src/main/java/io/github/epam/entities/User.java @@ -1,6 +1,6 @@ package io.github.epam.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class User extends DataClass { public String name = "Roman", firstName = "Roman", password = "Jdi1234", lastName, diff --git a/test-examples/jdi-light-examples/src/main/java/io/github/epam/entities/UserInfo.java b/test-examples/jdi-light-examples/src/main/java/io/github/epam/entities/UserInfo.java index cfbfdbb216..ae59dc0237 100644 --- a/test-examples/jdi-light-examples/src/main/java/io/github/epam/entities/UserInfo.java +++ b/test-examples/jdi-light-examples/src/main/java/io/github/epam/entities/UserInfo.java @@ -1,6 +1,6 @@ package io.github.epam.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class UserInfo extends DataClass { public String name; diff --git a/test-examples/jdi-light-examples/src/main/java/selenium/entities/User.java b/test-examples/jdi-light-examples/src/main/java/selenium/entities/User.java index 2c9be4e008..6a92e4042f 100644 --- a/test-examples/jdi-light-examples/src/main/java/selenium/entities/User.java +++ b/test-examples/jdi-light-examples/src/main/java/selenium/entities/User.java @@ -1,7 +1,7 @@ package selenium.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class User extends DataClass { public String userName = "Roman"; diff --git a/test-examples/jdi-light-examples/src/main/java/selenium/site/data/ContactInfo.java b/test-examples/jdi-light-examples/src/main/java/selenium/site/data/ContactInfo.java index f579cdd8c0..463ad01e17 100644 --- a/test-examples/jdi-light-examples/src/main/java/selenium/site/data/ContactInfo.java +++ b/test-examples/jdi-light-examples/src/main/java/selenium/site/data/ContactInfo.java @@ -1,6 +1,6 @@ package selenium.site.data; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class ContactInfo extends DataClass { public String firstName, lastName, position, diff --git a/test-examples/jdi-light-examples/src/test/java/io/github/epam/testng/TestNGListener.java b/test-examples/jdi-light-examples/src/test/java/io/github/epam/testng/TestNGListener.java index 487895574e..fe0e63cb61 100644 --- a/test-examples/jdi-light-examples/src/test/java/io/github/epam/testng/TestNGListener.java +++ b/test-examples/jdi-light-examples/src/test/java/io/github/epam/testng/TestNGListener.java @@ -5,7 +5,7 @@ * Email: roman.iovlev.jdi@gmail.com; Skype: roman.iovlev */ -import com.epam.jdi.tools.Safe; +import com.jdiai.tools.Safe; import org.testng.IInvokedMethod; import org.testng.IInvokedMethodListener; import org.testng.ITestNGMethod; @@ -18,7 +18,7 @@ import static com.epam.jdi.light.logger.AllureLogger.screenshotStep; import static com.epam.jdi.light.settings.WebSettings.TEST_NAME; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.last; +import static com.jdiai.tools.LinqUtils.last; import static java.lang.System.currentTimeMillis; public class TestNGListener implements IInvokedMethodListener { private Safe start = new Safe<>(0L); diff --git a/test-examples/jdi-light-examples/src/test/java/io/github/epam/tests/google/SearchTests.java b/test-examples/jdi-light-examples/src/test/java/io/github/epam/tests/google/SearchTests.java index 8e66d490dc..426182ecc4 100644 --- a/test-examples/jdi-light-examples/src/test/java/io/github/epam/tests/google/SearchTests.java +++ b/test-examples/jdi-light-examples/src/test/java/io/github/epam/tests/google/SearchTests.java @@ -10,7 +10,7 @@ import java.util.List; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.PrintUtils.print; +import static com.jdiai.tools.PrintUtils.print; import static io.github.com.pages.Header.epamLogo; import static io.github.com.pages.Header.search; import static io.github.com.pages.SearchPage.search3; diff --git a/test-examples/jdi-light-examples/src/test/java/io/github/epam/tests/recommended/TableTests.java b/test-examples/jdi-light-examples/src/test/java/io/github/epam/tests/recommended/TableTests.java index 5d038a4151..3912aaa68b 100644 --- a/test-examples/jdi-light-examples/src/test/java/io/github/epam/tests/recommended/TableTests.java +++ b/test-examples/jdi-light-examples/src/test/java/io/github/epam/tests/recommended/TableTests.java @@ -9,7 +9,7 @@ import org.testng.annotations.Test; import static com.epam.jdi.light.settings.JDISettings.ELEMENT; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.StringUtils.LINE_BREAK; import static io.github.com.StaticSite.tablePage; import static io.github.com.pages.PerformancePage.users; import static io.github.com.pages.PerformancePage.usersSetup; diff --git a/test-examples/jdi-light-examples/src/test/java/io/github/epam/tests/smart/path/PathTests.java b/test-examples/jdi-light-examples/src/test/java/io/github/epam/tests/smart/path/PathTests.java index 0cffb5a29a..100e2cb7a5 100644 --- a/test-examples/jdi-light-examples/src/test/java/io/github/epam/tests/smart/path/PathTests.java +++ b/test-examples/jdi-light-examples/src/test/java/io/github/epam/tests/smart/path/PathTests.java @@ -12,7 +12,7 @@ import static com.epam.jdi.light.common.Exceptions.exception; import static com.epam.jdi.light.driver.WebDriverByUtils.searchBy; import static com.epam.jdi.light.driver.WebDriverFactory.getDriver; -import static com.epam.jdi.tools.ReflectionUtils.isClass; +import static com.jdiai.tools.ReflectionUtils.isClass; import static io.github.com.StaticSite.contactFormPage; import static io.github.com.StaticSite.navigationL; import static io.github.epam.enums.Navigation.Service; diff --git a/test-examples/jdi-performance/pom.xml b/test-examples/jdi-performance/pom.xml index acd75f776a..e53d225db2 100644 --- a/test-examples/jdi-performance/pom.xml +++ b/test-examples/jdi-performance/pom.xml @@ -6,7 +6,7 @@ com.epam.jdi jdi-performance - 1.3.14 + 1.3.15 Examples: JDI Performance @@ -15,7 +15,7 @@ https://jdi-testing.github.io/jdi-light/ 1.9.6 - 2.13.8 + 2.15.0 2.10.0 9.4.12.RC2 @@ -25,7 +25,7 @@ com.epam.jdi jdi-light-html - 1.3.14 + 1.3.15 @@ -43,7 +43,7 @@ org.testng testng - 6.14.3 + 7.4.0 test @@ -120,4 +120,4 @@ - \ No newline at end of file + diff --git a/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/entities/Contacts.java b/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/entities/Contacts.java index 7ba08b05ad..2d599cbfd0 100644 --- a/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/entities/Contacts.java +++ b/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/entities/Contacts.java @@ -1,6 +1,6 @@ package org.mytests.uiobjects.example.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class Contacts extends DataClass { public String firstName; diff --git a/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/entities/MarvelUserInfo.java b/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/entities/MarvelUserInfo.java index ae93b2148f..fa5ef437c4 100644 --- a/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/entities/MarvelUserInfo.java +++ b/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/entities/MarvelUserInfo.java @@ -1,6 +1,6 @@ package org.mytests.uiobjects.example.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class MarvelUserInfo extends DataClass { public String number, type, user, description; diff --git a/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/entities/User.java b/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/entities/User.java index 157ee744db..901f99147e 100644 --- a/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/entities/User.java +++ b/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/entities/User.java @@ -1,7 +1,7 @@ package org.mytests.uiobjects.example.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class User extends DataClass { public String name = "Roman"; diff --git a/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/knection/Workspace.java b/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/knection/Workspace.java index 3848ce6d9c..9317ef2d85 100644 --- a/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/knection/Workspace.java +++ b/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/knection/Workspace.java @@ -1,13 +1,13 @@ package org.mytests.uiobjects.example.knection; -import com.epam.jdi.tools.DataClass; -import com.epam.jdi.tools.func.JAction1; +import com.jdiai.tools.DataClass; +import com.jdiai.tools.func.JAction1; import java.lang.reflect.Field; import static com.epam.jdi.light.common.Exceptions.exception; -import static com.epam.jdi.tools.LinqUtils.first; -import static com.epam.jdi.tools.ReflectionUtils.getValueField; +import static com.jdiai.tools.LinqUtils.first; +import static com.jdiai.tools.ReflectionUtils.getValueField; public class Workspace extends DataClass { public String category, name, projectCode, apiId, therapeuticArea, processes, diff --git a/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/site/custom/MultiDropdown.java b/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/site/custom/MultiDropdown.java index 0faa62d27d..3587fc6781 100644 --- a/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/site/custom/MultiDropdown.java +++ b/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/site/custom/MultiDropdown.java @@ -16,8 +16,8 @@ import static com.epam.jdi.light.elements.init.UIFactory.$; import static com.epam.jdi.light.elements.init.UIFactory.$$; import static com.epam.jdi.light.logger.LogLevels.DEBUG; -import static com.epam.jdi.tools.EnumUtils.getEnumValues; -import static com.epam.jdi.tools.LinqUtils.*; +import static com.jdiai.tools.EnumUtils.getEnumValues; +import static com.jdiai.tools.LinqUtils.*; import static java.util.Arrays.asList; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/site/sections/ContactForm.java b/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/site/sections/ContactForm.java index aae22a32c6..16c77cba36 100644 --- a/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/site/sections/ContactForm.java +++ b/test-examples/jdi-performance/src/main/java/org/mytests/uiobjects/example/site/sections/ContactForm.java @@ -11,7 +11,7 @@ import java.lang.reflect.Field; -import static com.epam.jdi.tools.ReflectionUtils.isInterface; +import static com.jdiai.tools.ReflectionUtils.isInterface; public class ContactForm extends Form { TextField firstName, lastName, position, passportNumber, passportSeria; diff --git a/test-examples/jdi-performance/src/test/java/org/mytests/tests/PerfStatistic.java b/test-examples/jdi-performance/src/test/java/org/mytests/tests/PerfStatistic.java index d868040e81..eaa870aff7 100644 --- a/test-examples/jdi-performance/src/test/java/org/mytests/tests/PerfStatistic.java +++ b/test-examples/jdi-performance/src/test/java/org/mytests/tests/PerfStatistic.java @@ -1,6 +1,6 @@ package org.mytests.tests; -import com.epam.jdi.tools.pairs.Pair; +import com.jdiai.tools.pairs.Pair; import org.apache.commons.collections4.MultiValuedMap; import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; @@ -8,10 +8,10 @@ import java.util.Map.Entry; import java.util.stream.LongStream; -import static com.epam.jdi.tools.LinqUtils.select; -import static com.epam.jdi.tools.PrintUtils.print; -import static com.epam.jdi.tools.StringUtils.format; -import static com.epam.jdi.tools.pairs.Pair.$; +import static com.jdiai.tools.LinqUtils.select; +import static com.jdiai.tools.PrintUtils.print; +import static com.jdiai.tools.StringUtils.format; +import static com.jdiai.tools.pairs.Pair.$; public class PerfStatistic { private PerfStatistic() { diff --git a/test-examples/jdi-performance/src/test/java/org/mytests/tests/TestsInit.java b/test-examples/jdi-performance/src/test/java/org/mytests/tests/TestsInit.java index 0fc3054f71..44f4f6468b 100644 --- a/test-examples/jdi-performance/src/test/java/org/mytests/tests/TestsInit.java +++ b/test-examples/jdi-performance/src/test/java/org/mytests/tests/TestsInit.java @@ -3,8 +3,8 @@ import com.epam.jdi.light.actions.ActionHelper; import com.epam.jdi.light.elements.interfaces.complex.IsCombobox; import com.epam.jdi.light.ui.html.elements.complex.DataListOptions; -import com.epam.jdi.tools.Safe; -import com.epam.jdi.tools.Timer; +import com.jdiai.tools.Safe; +import com.jdiai.tools.Timer; import org.mytests.tests.testng.TestNGListener; import org.mytests.uiobjects.example.site.SiteJdi; import org.testng.annotations.AfterSuite; diff --git a/test-examples/jdi-performance/src/test/java/org/mytests/tests/example/DataTableTests.java b/test-examples/jdi-performance/src/test/java/org/mytests/tests/example/DataTableTests.java index 7a5b894f5d..b0374f22b1 100644 --- a/test-examples/jdi-performance/src/test/java/org/mytests/tests/example/DataTableTests.java +++ b/test-examples/jdi-performance/src/test/java/org/mytests/tests/example/DataTableTests.java @@ -11,7 +11,7 @@ import static com.epam.jdi.light.elements.complex.table.Column.inColumn; import static com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher.containsValue; import static com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher.hasValue; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.StringUtils.LINE_BREAK; import static java.util.Arrays.asList; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.hamcrest.Matchers.greaterThan; diff --git a/test-examples/jdi-performance/src/test/java/org/mytests/tests/testng/RetryListenerClass.java b/test-examples/jdi-performance/src/test/java/org/mytests/tests/testng/RetryListenerClass.java index 6f6e3efd1d..10d1ce6f95 100644 --- a/test-examples/jdi-performance/src/test/java/org/mytests/tests/testng/RetryListenerClass.java +++ b/test-examples/jdi-performance/src/test/java/org/mytests/tests/testng/RetryListenerClass.java @@ -10,10 +10,10 @@ public class RetryListenerClass implements IAnnotationTransformer { @Override - public void transform(ITestAnnotation testannotation, Class testClass, Constructor testConstructor, Method testMethod) { - IRetryAnalyzer retry = testannotation.getRetryAnalyzer(); + public void transform(ITestAnnotation testAnnotation, Class testClass, Constructor testConstructor, Method testMethod) { + Class retry = testAnnotation.getRetryAnalyzerClass(); if (retry == null) { - testannotation.setRetryAnalyzer(RetryFailedTestCases.class); + testAnnotation.setRetryAnalyzer(RetryFailedTestCases.class); } } diff --git a/test-examples/jdi-performance/src/test/java/org/mytests/tests/testng/TestNGListener.java b/test-examples/jdi-performance/src/test/java/org/mytests/tests/testng/TestNGListener.java index 90d6c285be..8ac4fe684d 100644 --- a/test-examples/jdi-performance/src/test/java/org/mytests/tests/testng/TestNGListener.java +++ b/test-examples/jdi-performance/src/test/java/org/mytests/tests/testng/TestNGListener.java @@ -5,7 +5,7 @@ * Email: roman.iovlev.jdi@gmail.com; Skype: roman.iovlev */ -import com.epam.jdi.tools.Safe; +import com.jdiai.tools.Safe; import org.testng.IInvokedMethod; import org.testng.IInvokedMethodListener; import org.testng.ITestNGMethod; @@ -18,7 +18,7 @@ import static com.epam.jdi.light.logger.AllureLogger.screenshotStep; import static com.epam.jdi.light.settings.WebSettings.TEST_NAME; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.last; +import static com.jdiai.tools.LinqUtils.last; import static java.lang.System.currentTimeMillis; public class TestNGListener implements IInvokedMethodListener { private Safe start = new Safe<>(0L); diff --git a/test-templates/jdi-light-junit-template/pom.xml b/test-templates/jdi-light-junit-template/pom.xml index 899d5e2dcf..df5f7971fc 100644 --- a/test-templates/jdi-light-junit-template/pom.xml +++ b/test-templates/jdi-light-junit-template/pom.xml @@ -24,7 +24,7 @@ com.epam.jdi jdi-light-html - 1.3.14 + 1.3.15 diff --git a/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/entities/Contacts.java b/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/entities/Contacts.java index 259cb2f705..d5da1eba92 100644 --- a/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/entities/Contacts.java +++ b/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/entities/Contacts.java @@ -1,6 +1,6 @@ package org.mytests.uiobjects.example.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class Contacts extends DataClass { public String firstName, lastName, acceptConditions, position, passportNumber, diff --git a/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/entities/MarvelUserInfo.java b/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/entities/MarvelUserInfo.java index ae93b2148f..fa5ef437c4 100644 --- a/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/entities/MarvelUserInfo.java +++ b/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/entities/MarvelUserInfo.java @@ -1,6 +1,6 @@ package org.mytests.uiobjects.example.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class MarvelUserInfo extends DataClass { public String number, type, user, description; diff --git a/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/entities/User.java b/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/entities/User.java index 157ee744db..901f99147e 100644 --- a/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/entities/User.java +++ b/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/entities/User.java @@ -1,7 +1,7 @@ package org.mytests.uiobjects.example.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class User extends DataClass { public String name = "Roman"; diff --git a/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/site/custom/MultiDropdown.java b/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/site/custom/MultiDropdown.java index 859dc61999..7ec47e1078 100644 --- a/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/site/custom/MultiDropdown.java +++ b/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/site/custom/MultiDropdown.java @@ -16,8 +16,8 @@ import static com.epam.jdi.light.elements.init.UIFactory.$; import static com.epam.jdi.light.elements.init.UIFactory.$$; import static com.epam.jdi.light.logger.LogLevels.DEBUG; -import static com.epam.jdi.tools.EnumUtils.getEnumValues; -import static com.epam.jdi.tools.LinqUtils.*; +import static com.jdiai.tools.EnumUtils.getEnumValues; +import static com.jdiai.tools.LinqUtils.*; import static java.util.Arrays.asList; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/site/sections/ContactForm.java b/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/site/sections/ContactForm.java index 1ce81f17c2..0d2851aca3 100644 --- a/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/site/sections/ContactForm.java +++ b/test-templates/jdi-light-junit-template/src/main/java/org/mytests/uiobjects/example/site/sections/ContactForm.java @@ -10,7 +10,7 @@ import java.lang.reflect.Field; -import static com.epam.jdi.tools.ReflectionUtils.isInterface; +import static com.jdiai.tools.ReflectionUtils.isInterface; public class ContactForm extends Form { TextField firstName, lastName, position, passportNumber, passportSeria; diff --git a/test-templates/jdi-light-junit-template/src/test/java/org/mytests/tests/example/DataTableTests.java b/test-templates/jdi-light-junit-template/src/test/java/org/mytests/tests/example/DataTableTests.java index e6112b41be..bd400b169d 100644 --- a/test-templates/jdi-light-junit-template/src/test/java/org/mytests/tests/example/DataTableTests.java +++ b/test-templates/jdi-light-junit-template/src/test/java/org/mytests/tests/example/DataTableTests.java @@ -11,7 +11,7 @@ import static com.epam.jdi.light.elements.complex.table.Column.inColumn; import static com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher.containsValue; import static com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher.hasValue; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.StringUtils.LINE_BREAK; import static java.util.Arrays.asList; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.hamcrest.Matchers.greaterThan; diff --git a/test-templates/jdi-light-testng-template/pom.xml b/test-templates/jdi-light-testng-template/pom.xml index d31e5df102..87cd548c16 100644 --- a/test-templates/jdi-light-testng-template/pom.xml +++ b/test-templates/jdi-light-testng-template/pom.xml @@ -15,7 +15,7 @@ UTF-8 1.9.6 https://jdi-testing.github.io/jdi-light/ - 2.13.8 + 2.15.0 2.10.0 9.4.12.RC2 https://jdi-testing.github.io/jdi-light/ @@ -26,7 +26,7 @@ com.epam.jdi jdi-light-html - 1.3.14 + 1.3.15 @@ -38,7 +38,7 @@ org.testng testng - 6.14.3 + 7.4.0 test diff --git a/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/entities/Contacts.java b/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/entities/Contacts.java index 259cb2f705..d5da1eba92 100644 --- a/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/entities/Contacts.java +++ b/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/entities/Contacts.java @@ -1,6 +1,6 @@ package org.mytests.uiobjects.example.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class Contacts extends DataClass { public String firstName, lastName, acceptConditions, position, passportNumber, diff --git a/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/entities/MarvelUserInfo.java b/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/entities/MarvelUserInfo.java index ae93b2148f..fa5ef437c4 100644 --- a/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/entities/MarvelUserInfo.java +++ b/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/entities/MarvelUserInfo.java @@ -1,6 +1,6 @@ package org.mytests.uiobjects.example.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class MarvelUserInfo extends DataClass { public String number, type, user, description; diff --git a/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/entities/User.java b/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/entities/User.java index 157ee744db..901f99147e 100644 --- a/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/entities/User.java +++ b/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/entities/User.java @@ -1,7 +1,7 @@ package org.mytests.uiobjects.example.entities; -import com.epam.jdi.tools.DataClass; +import com.jdiai.tools.DataClass; public class User extends DataClass { public String name = "Roman"; diff --git a/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/site/custom/MultiDropdown.java b/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/site/custom/MultiDropdown.java index da743decac..77581ebe26 100644 --- a/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/site/custom/MultiDropdown.java +++ b/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/site/custom/MultiDropdown.java @@ -16,8 +16,8 @@ import static com.epam.jdi.light.elements.init.UIFactory.$; import static com.epam.jdi.light.elements.init.UIFactory.$$; import static com.epam.jdi.light.logger.LogLevels.DEBUG; -import static com.epam.jdi.tools.EnumUtils.getEnumValues; -import static com.epam.jdi.tools.LinqUtils.*; +import static com.jdiai.tools.EnumUtils.getEnumValues; +import static com.jdiai.tools.LinqUtils.*; import static java.util.Arrays.asList; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/site/sections/ContactForm.java b/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/site/sections/ContactForm.java index 1ce81f17c2..0d2851aca3 100644 --- a/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/site/sections/ContactForm.java +++ b/test-templates/jdi-light-testng-template/src/main/java/org/mytests/uiobjects/example/site/sections/ContactForm.java @@ -10,7 +10,7 @@ import java.lang.reflect.Field; -import static com.epam.jdi.tools.ReflectionUtils.isInterface; +import static com.jdiai.tools.ReflectionUtils.isInterface; public class ContactForm extends Form { TextField firstName, lastName, position, passportNumber, passportSeria; diff --git a/test-templates/jdi-light-testng-template/src/test/java/org/mytests/tests/example/DataTableTests.java b/test-templates/jdi-light-testng-template/src/test/java/org/mytests/tests/example/DataTableTests.java index 78f6469e50..dd2b33b693 100644 --- a/test-templates/jdi-light-testng-template/src/test/java/org/mytests/tests/example/DataTableTests.java +++ b/test-templates/jdi-light-testng-template/src/test/java/org/mytests/tests/example/DataTableTests.java @@ -11,7 +11,7 @@ import static com.epam.jdi.light.elements.complex.table.Column.inColumn; import static com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher.containsValue; import static com.epam.jdi.light.elements.complex.table.matchers.ColumnMatcher.hasValue; -import static com.epam.jdi.tools.StringUtils.LINE_BREAK; +import static com.jdiai.tools.StringUtils.LINE_BREAK; import static java.util.Arrays.asList; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.hamcrest.Matchers.greaterThan; diff --git a/test-templates/jdi-light-testng-template/src/test/java/org/mytests/tests/testng/RetryListenerClass.java b/test-templates/jdi-light-testng-template/src/test/java/org/mytests/tests/testng/RetryListenerClass.java index 6f6e3efd1d..10d1ce6f95 100644 --- a/test-templates/jdi-light-testng-template/src/test/java/org/mytests/tests/testng/RetryListenerClass.java +++ b/test-templates/jdi-light-testng-template/src/test/java/org/mytests/tests/testng/RetryListenerClass.java @@ -10,10 +10,10 @@ public class RetryListenerClass implements IAnnotationTransformer { @Override - public void transform(ITestAnnotation testannotation, Class testClass, Constructor testConstructor, Method testMethod) { - IRetryAnalyzer retry = testannotation.getRetryAnalyzer(); + public void transform(ITestAnnotation testAnnotation, Class testClass, Constructor testConstructor, Method testMethod) { + Class retry = testAnnotation.getRetryAnalyzerClass(); if (retry == null) { - testannotation.setRetryAnalyzer(RetryFailedTestCases.class); + testAnnotation.setRetryAnalyzer(RetryFailedTestCases.class); } } diff --git a/test-templates/jdi-light-testng-template/src/test/java/org/mytests/tests/testng/TestNGListener.java b/test-templates/jdi-light-testng-template/src/test/java/org/mytests/tests/testng/TestNGListener.java index 90d6c285be..8ac4fe684d 100644 --- a/test-templates/jdi-light-testng-template/src/test/java/org/mytests/tests/testng/TestNGListener.java +++ b/test-templates/jdi-light-testng-template/src/test/java/org/mytests/tests/testng/TestNGListener.java @@ -5,7 +5,7 @@ * Email: roman.iovlev.jdi@gmail.com; Skype: roman.iovlev */ -import com.epam.jdi.tools.Safe; +import com.jdiai.tools.Safe; import org.testng.IInvokedMethod; import org.testng.IInvokedMethodListener; import org.testng.ITestNGMethod; @@ -18,7 +18,7 @@ import static com.epam.jdi.light.logger.AllureLogger.screenshotStep; import static com.epam.jdi.light.settings.WebSettings.TEST_NAME; import static com.epam.jdi.light.settings.WebSettings.logger; -import static com.epam.jdi.tools.LinqUtils.last; +import static com.jdiai.tools.LinqUtils.last; import static java.lang.System.currentTimeMillis; public class TestNGListener implements IInvokedMethodListener { private Safe start = new Safe<>(0L);