diff --git a/.gitignore b/.gitignore index 752ffd04..344c1d38 100644 --- a/.gitignore +++ b/.gitignore @@ -2,26 +2,12 @@ # Project Specific ###################### /target/www/** -/src/test/javascript/coverage/ -/src/test/javascript/PhantomJS*/ /test-output/ example_usage/lib/test-output/ example_usage/lib/ExtentReport.html -example_usage/lib/codeless_test-0.0.3-SNAPSHOT-jar-with-dependencies.jar +example_usage/lib/codeless-jar-with-dependencies.jar -###################### -# Node -###################### -/node/ -node_tmp/ -node_modules/ -npm-debug.log.* - -###################### -# SASS -###################### -.sass-cache/ ###################### # Eclipse diff --git a/CHANGLOG.md b/CHANGLOG.md index b364e3bb..ab47876a 100644 --- a/CHANGLOG.md +++ b/CHANGLOG.md @@ -17,6 +17,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Fixed +## 0.2.0 (Feb 14, 2022) + +### Added +* [copy_sources] add script into pom.xml to copy to example_usage\lib from executable_with_all_dependency.jar +* [copy_sources] add script into pom.xml to copy to example_usage\lib\web_drivers from codeless_test\web_driver + +### Changed +* [example_usage] run bat/sh uses identical jar file(codeless-jar-with-dependencies.jar) +* [main] uses maven 3.8.1 +* [test] web_drivers update, uses guava 31.0.1, common-lang3 3.12.0, extentsreport 5.0.8 +* [core] uses slf4j 1.7.35, restassured 4.5.0, jackson 2.13.1, poi 4.1.2, assertj 3.22.0, commons-csv 1.9.0, swagger-parser 1.0.56, ooxml-schema 1.4, Selenium4 + +### Removed +* [example_usage] remove web_drivers folder +* [example_usage] remove *.jar as duplicates + ## 0.1.0 (Jan 10, 2022) ### Changed diff --git a/codeless_core/pom.xml b/codeless_core/pom.xml index 8a7b2c2e..7b37b918 100644 --- a/codeless_core/pom.xml +++ b/codeless_core/pom.xml @@ -12,12 +12,12 @@ 7.5 4.13.2 - 3.141.59 + 4.1.2 7.6.0 - 1.7.25 - 4.4.0 - 2.11.0 - 3.17 + 1.7.35 + 4.5.0 + 2.13.1 + 4.1.2 @@ -25,12 +25,12 @@ org.assertj assertj-core - 3.11.1 + 3.22.0 org.apache.commons commons-csv - 1.4 + 1.9.0 org.testng @@ -47,11 +47,6 @@ mockito-core 2.23.4 - - org.apache.commons - commons-lang3 - 3.7 - org.mockito mockito-all @@ -129,7 +124,7 @@ io.swagger swagger-parser - 1.0.37 + 1.0.56 @@ -158,7 +153,7 @@ org.apache.poi ooxml-schemas - 1.3 + 1.4 @@ -172,7 +167,6 @@ slf4j-log4j12 ${sl4j.version} - diff --git a/codeless_test/pom.xml b/codeless_test/pom.xml index eadf1a87..24c3cc57 100644 --- a/codeless_test/pom.xml +++ b/codeless_test/pom.xml @@ -46,13 +46,13 @@ org.apache.commons commons-lang3 - 3.7 + 3.12.0 - com.relevantcodes - extentreports - 2.41.2 + com.aventstack + extentreports + 5.0.8 @@ -66,7 +66,7 @@ com.google.guava guava - [24.1.1,) + [31.0.1,) diff --git a/codeless_test/src/main/java/com/tmobile/ct/codeless/test/excel/ExcelFileReader.java b/codeless_test/src/main/java/com/tmobile/ct/codeless/test/excel/ExcelFileReader.java index c22017e7..c94d7013 100644 --- a/codeless_test/src/main/java/com/tmobile/ct/codeless/test/excel/ExcelFileReader.java +++ b/codeless_test/src/main/java/com/tmobile/ct/codeless/test/excel/ExcelFileReader.java @@ -19,7 +19,6 @@ import java.io.IOException; import org.apache.poi.EncryptedDocumentException; -import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.WorkbookFactory; @@ -43,7 +42,7 @@ public static Workbook readExcelFile(String resource, boolean addClassPath) { } try { return WorkbookFactory.create(workbookFile); - } catch (EncryptedDocumentException | InvalidFormatException | IOException e) { + } catch (EncryptedDocumentException | IOException e) { e.printStackTrace(); return null; } diff --git a/codeless_test/src/main/java/com/tmobile/ct/codeless/test/extentreport/ExtentTestManager.java b/codeless_test/src/main/java/com/tmobile/ct/codeless/test/extentreport/ExtentTestManager.java index e6452cc0..96a21aec 100644 --- a/codeless_test/src/main/java/com/tmobile/ct/codeless/test/extentreport/ExtentTestManager.java +++ b/codeless_test/src/main/java/com/tmobile/ct/codeless/test/extentreport/ExtentTestManager.java @@ -17,8 +17,13 @@ import java.util.HashMap; -import com.relevantcodes.extentreports.ExtentReports; -import com.relevantcodes.extentreports.ExtentTest; +import com.aventstack.extentreports.ExtentReports; +import com.aventstack.extentreports.ExtentTest; +import com.aventstack.extentreports.markuputils.MarkupHelper; +import com.aventstack.extentreports.reporter.ExtentSparkReporter; +//import com.relevantcodes.extentreports.ExtentReports; +//import com.relevantcodes.extentreports.ExtentTest; +import com.aventstack.extentreports.reporter.configuration.Theme; /** * The Class ExtentTestManager. @@ -42,8 +47,14 @@ public class ExtentTestManager { public synchronized static ExtentReports getReporter() { if (extent == null) { // Set HTML reporting file location - extent = new ExtentReports(System.getProperty("user.dir") + "/ExtentReport.html", true); - + extent = new ExtentReports(); + ExtentSparkReporter spark = new ExtentSparkReporter(System.getProperty("user.dir") + "/ExtentReport.html"); + spark.config().setTheme(Theme.STANDARD); + //spark.config().setTimeStampFormat("MM/dd/yyyy HH:mm:ss"); + spark.config().setReportName("Codeless Report"); + spark.config().setEncoding("UTF-8"); + spark.config().setTimelineEnabled(true); + extent.attachReporter(spark); } return extent; } @@ -57,7 +68,7 @@ public synchronized static ExtentReports getReporter() { */ public static synchronized ExtentTest startTest(String testName, String desc) { try { - ExtentTest test = extent.startTest(testName, desc); + ExtentTest test = extent.createTest(testName, desc); extentTestMap.put((int) (long) (Thread.currentThread().getId()), test); return test; } catch (Exception e) { @@ -80,7 +91,8 @@ public static synchronized ExtentTest getTest() { * End test. */ public static synchronized void endTest() { - extent.endTest((ExtentTest) extentTestMap.get((int) (long) (Thread.currentThread().getId()))); + //extent..endTest((ExtentTest) extentTestMap.get((int) (long) (Thread.currentThread().getId()))); + //getTest().info(MarkupHelper.createUnorderedList(extentTestMap).getMarkup()); } } diff --git a/codeless_test/src/main/java/com/tmobile/ct/codeless/test/extentreport/TestStepReporter.java b/codeless_test/src/main/java/com/tmobile/ct/codeless/test/extentreport/TestStepReporter.java index 184ccdda..3cc21d09 100644 --- a/codeless_test/src/main/java/com/tmobile/ct/codeless/test/extentreport/TestStepReporter.java +++ b/codeless_test/src/main/java/com/tmobile/ct/codeless/test/extentreport/TestStepReporter.java @@ -19,8 +19,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.aventstack.extentreports.MediaEntityBuilder; +import com.aventstack.extentreports.Status; +import com.aventstack.extentreports.markuputils.MarkupHelper; import com.google.common.base.Optional; -import com.relevantcodes.extentreports.LogStatus; +//import com.relevantcodes.extentreports.LogStatus; import com.tmobile.ct.codeless.core.Result; import com.tmobile.ct.codeless.core.Step; import com.tmobile.ct.codeless.service.Call; @@ -61,7 +64,7 @@ public static void reporter(Step step) throws Exception { private static void logServiceStepResult(Step step) { - LogStatus status = logStepResult(step); + Status status = logStepResult(step); Map testConfig = step.getTest().getConfig(); if (testConfig.containsKey(Config.LOGGING_DETAILS_ENABLED)) { loggingEnabled = Boolean @@ -69,16 +72,16 @@ private static void logServiceStepResult(Step step) { } if (loggingEnabled) { ServiceCallDTO serviceCall = ServiceLogFilter.filter((ServiceCall) step); - ExtentTestManager.getTest().log(status, step.getName(), getDOMResult(serviceCall)); + ExtentTestManager.getTest().log(status, getDOMResult(serviceCall)); } else { - ExtentTestManager.getTest().log(status, step.getName(), ""); + ExtentTestManager.getTest().log(status, step.getName()); } } private static void logUiStepResult(UiStep step) throws Exception { String screenshotPath = ""; - LogStatus status = logStepResult(step); + Status status = logStepResult(step); if (step.getTest().getConfig().containsKey(Config.TEST_SCREENSHOT_POLICY)) { String screenShotPolicy = Optional .fromNullable((String)step.getTest().getConfig().get(Config.TEST_SCREENSHOT_POLICY)) @@ -86,12 +89,12 @@ private static void logUiStepResult(UiStep step) throws Exception { String actionName = step.getAction().getClass().getSimpleName(); - if (!actionName.equalsIgnoreCase("close") && status != LogStatus.SKIP) { + if (!actionName.equalsIgnoreCase("close") && status != Status.SKIP) { if (screenShotPolicy.equalsIgnoreCase(Config.ALL_STEPS)) { screenshotPath = WebDriverFactory.getScreenhot(step.getTest().getWebDriver(), step.getName()); step.setScreenShotPath(screenshotPath); - } else if (screenShotPolicy.equalsIgnoreCase(Config.FAILURE_ONLY) && status == LogStatus.FAIL) { + } else if (screenShotPolicy.equalsIgnoreCase(Config.FAILURE_ONLY) && status == Status.FAIL) { screenshotPath = WebDriverFactory.getScreenhot(step.getTest().getWebDriver(), step.getName()); step.setScreenShotPath(screenshotPath); } @@ -100,9 +103,9 @@ private static void logUiStepResult(UiStep step) throws Exception { if (StringUtils.isNotBlank(screenshotPath)) { ExtentTestManager.getTest().log(status, step.getName(), - ExtentTestManager.getTest().addBase64ScreenShot(screenshotPath)); + MediaEntityBuilder.createScreenCaptureFromPath(screenshotPath).build()); } else { - ExtentTestManager.getTest().log(status, step.getName(), ""); + ExtentTestManager.getTest().log(status, step.getName()); } } @@ -124,19 +127,19 @@ private static String getDOMResult(ServiceCallDTO serviceCall) { } - private static LogStatus logStepResult(Step step) { + private static Status logStepResult(Step step) { return step instanceof Call ? getLog(((Call) step).getResult()) : getLog(((UiStepImpl) step).getResult()); } - private static LogStatus getLog(Result result) { + private static Status getLog(Result result) { switch (result) { case PASS: - return LogStatus.PASS; + return Status.PASS; case FAIL: - return LogStatus.FAIL; + return Status.FAIL; case SKIP: - return LogStatus.SKIP; + return Status.SKIP; } return null; } diff --git a/codeless_test/src/main/java/com/tmobile/ct/codeless/test/testng/TestngTest.java b/codeless_test/src/main/java/com/tmobile/ct/codeless/test/testng/TestngTest.java index 9e2c03ac..ec18aa4d 100644 --- a/codeless_test/src/main/java/com/tmobile/ct/codeless/test/testng/TestngTest.java +++ b/codeless_test/src/main/java/com/tmobile/ct/codeless/test/testng/TestngTest.java @@ -164,7 +164,7 @@ public void executeTest(Test test) throws Exception { }); try { - ExtentTestManager.getTest().setDescription(test.getName()); + ExtentTestManager.getTest().createNode(test.getName()); Integer stepOrder = 1; // execute steps diff --git a/codeless_test/src/main/resources/extent.properties b/codeless_test/src/main/resources/extent.properties new file mode 100644 index 00000000..5af1bb9b --- /dev/null +++ b/codeless_test/src/main/resources/extent.properties @@ -0,0 +1 @@ +extent.reporter.spark.start=true \ No newline at end of file diff --git a/codeless_test/src/test/resources/suites/test_google.xlsx b/codeless_test/src/test/resources/suites/test_google.xlsx index 42007110..4fb92b4e 100644 Binary files a/codeless_test/src/test/resources/suites/test_google.xlsx and b/codeless_test/src/test/resources/suites/test_google.xlsx differ diff --git a/codeless_test/web_drivers/mac/chromedriver b/codeless_test/web_drivers/mac/chromedriver index 7a2a7b5d..b97d4794 100644 Binary files a/codeless_test/web_drivers/mac/chromedriver and b/codeless_test/web_drivers/mac/chromedriver differ diff --git a/codeless_test/web_drivers/mac/geckodriver b/codeless_test/web_drivers/mac/geckodriver index 87916370..35dd191b 100644 Binary files a/codeless_test/web_drivers/mac/geckodriver and b/codeless_test/web_drivers/mac/geckodriver differ diff --git a/codeless_test/web_drivers/mac/msedgedriver b/codeless_test/web_drivers/mac/msedgedriver index a0ef8199..7cfa81a1 100644 Binary files a/codeless_test/web_drivers/mac/msedgedriver and b/codeless_test/web_drivers/mac/msedgedriver differ diff --git a/codeless_test/web_drivers/windows/chromedriver.exe b/codeless_test/web_drivers/windows/chromedriver.exe index 0464f857..a391356b 100644 Binary files a/codeless_test/web_drivers/windows/chromedriver.exe and b/codeless_test/web_drivers/windows/chromedriver.exe differ diff --git a/codeless_test/web_drivers/windows/geckodriver.exe b/codeless_test/web_drivers/windows/geckodriver.exe index a0104767..c59764ab 100644 Binary files a/codeless_test/web_drivers/windows/geckodriver.exe and b/codeless_test/web_drivers/windows/geckodriver.exe differ diff --git a/codeless_test/web_drivers/windows/msedgedriver.exe b/codeless_test/web_drivers/windows/msedgedriver.exe index 4c948bf1..18acd500 100644 Binary files a/codeless_test/web_drivers/windows/msedgedriver.exe and b/codeless_test/web_drivers/windows/msedgedriver.exe differ diff --git a/codeless_ui/src/main/java/com/tmobile/ct/codeless/ui/driver/SupportedPlatform.java b/codeless_ui/src/main/java/com/tmobile/ct/codeless/ui/driver/SupportedPlatform.java index fc754873..42f1dd2d 100644 --- a/codeless_ui/src/main/java/com/tmobile/ct/codeless/ui/driver/SupportedPlatform.java +++ b/codeless_ui/src/main/java/com/tmobile/ct/codeless/ui/driver/SupportedPlatform.java @@ -31,28 +31,28 @@ public enum SupportedPlatform { /** The iPhone. */ - iPhone(DesiredCapabilities.iphone(), RemoteWebDriver.class), + iPhone(new DesiredCapabilities(), RemoteWebDriver.class), /** The iPad. */ - iPad(DesiredCapabilities.ipad(), RemoteWebDriver.class), + iPad(new DesiredCapabilities(), RemoteWebDriver.class), /** The android. */ - android(DesiredCapabilities.android(), RemoteWebDriver.class), + android(new DesiredCapabilities(), RemoteWebDriver.class), /** The chrome. */ - chrome(DesiredCapabilities.chrome(), RemoteWebDriver.class), + chrome(new DesiredCapabilities(), RemoteWebDriver.class), /** The firefox. */ - firefox(DesiredCapabilities.firefox(), RemoteWebDriver.class), + firefox(new DesiredCapabilities(), RemoteWebDriver.class), /** The edge. */ - edge(DesiredCapabilities.edge(), RemoteWebDriver.class), + edge(new DesiredCapabilities(), RemoteWebDriver.class), /** The opera blink. */ - opera(DesiredCapabilities.operaBlink(),RemoteWebDriver.class), + opera(new DesiredCapabilities(),RemoteWebDriver.class), /** The safari. */ - safari(DesiredCapabilities.safari(), RemoteWebDriver.class), + safari(new DesiredCapabilities(), RemoteWebDriver.class), /** The default remote. */ defaultRemote(new DesiredCapabilities(), RemoteWebDriver.class); diff --git a/codeless_ui/src/main/java/com/tmobile/ct/codeless/ui/driver/WebDriverFactory.java b/codeless_ui/src/main/java/com/tmobile/ct/codeless/ui/driver/WebDriverFactory.java index c74d2292..aceeca1d 100644 --- a/codeless_ui/src/main/java/com/tmobile/ct/codeless/ui/driver/WebDriverFactory.java +++ b/codeless_ui/src/main/java/com/tmobile/ct/codeless/ui/driver/WebDriverFactory.java @@ -21,6 +21,7 @@ import java.net.URL; import java.nio.file.Paths; import java.text.SimpleDateFormat; +import java.time.Duration; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -232,8 +233,8 @@ private String getWebDriverPath(String webDriverPath) { private void initWebDriver(WebDriver driver) { try { driver.manage().window().maximize(); - driver.manage().timeouts().pageLoadTimeout(30, TimeUnit.SECONDS); - driver.manage().timeouts().setScriptTimeout(30, TimeUnit.SECONDS); + driver.manage().timeouts().pageLoadTimeout(Duration.ofSeconds(30)); + driver.manage().timeouts().scriptTimeout(Duration.ofSeconds(30)); } catch (Exception e) { e.printStackTrace(); } diff --git a/codeless_ui/src/main/java/com/tmobile/ct/codeless/ui/model/controls/WebElementProxyFactory.java b/codeless_ui/src/main/java/com/tmobile/ct/codeless/ui/model/controls/WebElementProxyFactory.java index 3ae2764c..7d2c15e5 100644 --- a/codeless_ui/src/main/java/com/tmobile/ct/codeless/ui/model/controls/WebElementProxyFactory.java +++ b/codeless_ui/src/main/java/com/tmobile/ct/codeless/ui/model/controls/WebElementProxyFactory.java @@ -22,8 +22,8 @@ import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; -import org.openqa.selenium.interactions.internal.Locatable; -import org.openqa.selenium.internal.WrapsElement; +import org.openqa.selenium.interactions.Locatable; +import org.openqa.selenium.WrapsElement; import org.openqa.selenium.support.pagefactory.ElementLocator; import org.openqa.selenium.support.pagefactory.internal.LocatingElementHandler; diff --git a/codeless_ui/src/test/java/com/tmobile/ct/codeless/ui/UiStepTest.java b/codeless_ui/src/test/java/com/tmobile/ct/codeless/ui/UiStepTest.java index 3c498ecb..e1b5907b 100644 --- a/codeless_ui/src/test/java/com/tmobile/ct/codeless/ui/UiStepTest.java +++ b/codeless_ui/src/test/java/com/tmobile/ct/codeless/ui/UiStepTest.java @@ -69,7 +69,7 @@ public void itShouldExecuteAction() { options.addArguments("--headless", "--disable-gpu", "--window-size=1920,1200", "--ignore-certificate-errors"); driver = new ChromeDriver(options); when(test.getWebDriver()).thenReturn(driver); - driver.get("D:\\Code\\CTA\\edp-workspace\\etp_codeless_ui\\src\\test\\resources\\test_website\\login.html"); + driver.get("https://www.atitesting.com/login"); step.run(); diff --git a/codeless_ui/src/test/java/com/tmobile/ct/codeless/ui/action/ActionTest.java b/codeless_ui/src/test/java/com/tmobile/ct/codeless/ui/action/ActionTest.java index 3696ee7e..fd294240 100644 --- a/codeless_ui/src/test/java/com/tmobile/ct/codeless/ui/action/ActionTest.java +++ b/codeless_ui/src/test/java/com/tmobile/ct/codeless/ui/action/ActionTest.java @@ -43,7 +43,7 @@ public void setup() { ChromeOptions options = new ChromeOptions(); options.addArguments("--headless", "--disable-gpu", "--window-size=1920,1200","--ignore-certificate-errors"); driver = new ChromeDriver(options); - driver.get("D:\\Code\\CTA\\edp-workspace\\etp_codeless_ui\\src\\test\\resources\\test_website\\login.html"); + driver.get("https://www.atitesting.com/login"); config = new ActionConfig(); config.clickType = ClickType.click; config.waitTime = 2; diff --git a/codeless_ui/src/test/java/com/tmobile/ct/codeless/ui/test/WebDriverFactoryTest.java b/codeless_ui/src/test/java/com/tmobile/ct/codeless/ui/test/WebDriverFactoryTest.java index ec178974..a1610bd7 100644 --- a/codeless_ui/src/test/java/com/tmobile/ct/codeless/ui/test/WebDriverFactoryTest.java +++ b/codeless_ui/src/test/java/com/tmobile/ct/codeless/ui/test/WebDriverFactoryTest.java @@ -70,7 +70,7 @@ public Map mockRemoteRunConfig() { excelConfig.put("platform-type", "chrome"); excelConfig.put("webdriver.runlocal", "FALSE"); excelConfig.put("webdriver.platformName.chrome", "Windows"); - excelConfig.put("webdriver.browserVersion.chrome", "90.0"); + excelConfig.put("webdriver.browserVersion.chrome", "96.0"); excelConfig.put("webdriver.hub", "https://127.0.0.1"); return excelConfig; diff --git a/copy_files/pom.xml b/copy_files/pom.xml index abbdc8dc..74438989 100644 --- a/copy_files/pom.xml +++ b/copy_files/pom.xml @@ -70,6 +70,24 @@ + + copy-resources + process-classes + + copy-resources + + + ./../example_usage/lib/web_drivers + + + ./../codeless_test/web_drivers + + **/*.* + + + + + @@ -88,13 +106,17 @@ ./../target/codeless-${revision}.jar - - - - com.coderplus.maven.plugins - copy-rename-maven-plugin - 1.0 - + + copy-file + compile + + copy + + + ./../target/codeless-${revision}.jar + ./../example_usage/lib/codeless-jar-with-dependencies.jar + + copy-and-rename-pom-file compile diff --git a/example_usage/bin/run.bat b/example_usage/bin/run.bat index d33cc4a8..c826d6be 100644 --- a/example_usage/bin/run.bat +++ b/example_usage/bin/run.bat @@ -7,7 +7,7 @@ echo =============================================== echo Executing suite %1 echo =============================================== cd "%script_path%\..\lib" -java -jar codeless_test-0.0.9-jar-with-dependencies.jar -suite="%1" -datasheet="%2" +java -jar codeless-jar-with-dependencies.jar -suite="%1" -datasheet="%2" echo =============================================== echo Collecting log files diff --git a/example_usage/bin/run.sh b/example_usage/bin/run.sh index 2950a9e6..55cc863a 100755 --- a/example_usage/bin/run.sh +++ b/example_usage/bin/run.sh @@ -7,7 +7,7 @@ echo =============================================== echo Executing suite $1 echo =============================================== cd "$script_path/../lib" -java -jar codeless_test-0.0.9-jar-with-dependencies.jar -suite="$1" -datasheet="$2" +java -jar codeless-jar-with-dependencies.jar -suite="$1" -datasheet="$2" echo =============================================== echo Collecting log files diff --git a/example_usage/lib/codeless.config.properties b/example_usage/lib/codeless.config.properties index 0bf50c32..1ea98936 100644 --- a/example_usage/lib/codeless.config.properties +++ b/example_usage/lib/codeless.config.properties @@ -16,7 +16,7 @@ webdriver.platformName.edge=Windows webdriver.browserVersion.edge=91 webdriver.platformName.firefox=Windows -webdriver.browserVersion.firefox=60 +webdriver.browserVersion.firefox=90 webdriver.platformName.safari=macos 10.12 webdriver.browserVersion.safari=9.0 diff --git a/example_usage/lib/codeless_test-0.0.9-jar-with-dependencies.jar b/example_usage/lib/codeless_test-0.0.9-jar-with-dependencies.jar deleted file mode 100644 index 18e20c4e..00000000 Binary files a/example_usage/lib/codeless_test-0.0.9-jar-with-dependencies.jar and /dev/null differ diff --git a/example_usage/lib/web_drivers/mac/chromedriver b/example_usage/lib/web_drivers/mac/chromedriver deleted file mode 100644 index a4c4584f..00000000 Binary files a/example_usage/lib/web_drivers/mac/chromedriver and /dev/null differ diff --git a/example_usage/lib/web_drivers/mac/geckodriver b/example_usage/lib/web_drivers/mac/geckodriver deleted file mode 100644 index a125321e..00000000 Binary files a/example_usage/lib/web_drivers/mac/geckodriver and /dev/null differ diff --git a/example_usage/lib/web_drivers/windows/IEDriverServer.exe b/example_usage/lib/web_drivers/windows/IEDriverServer.exe deleted file mode 100644 index d1f83cb9..00000000 Binary files a/example_usage/lib/web_drivers/windows/IEDriverServer.exe and /dev/null differ diff --git a/example_usage/lib/web_drivers/windows/chromedriver.exe b/example_usage/lib/web_drivers/windows/chromedriver.exe deleted file mode 100644 index 6dfdabfa..00000000 Binary files a/example_usage/lib/web_drivers/windows/chromedriver.exe and /dev/null differ diff --git a/example_usage/lib/web_drivers/windows/geckodriver.exe b/example_usage/lib/web_drivers/windows/geckodriver.exe deleted file mode 100644 index 68777178..00000000 Binary files a/example_usage/lib/web_drivers/windows/geckodriver.exe and /dev/null differ diff --git a/example_usage/suites/cbtest.xlsx b/example_usage/suites/cbtest.xlsx index 7cbbaf36..ee3e9b76 100644 Binary files a/example_usage/suites/cbtest.xlsx and b/example_usage/suites/cbtest.xlsx differ diff --git a/example_usage/suites/jsonExample.xlsx b/example_usage/suites/jsonExample.xlsx index 13d5f095..d8414aca 100644 Binary files a/example_usage/suites/jsonExample.xlsx and b/example_usage/suites/jsonExample.xlsx differ diff --git a/example_usage/suites/sampleipadtest.xlsx b/example_usage/suites/sampleipadtest.xlsx index a3e6a5ab..1160a6f6 100644 Binary files a/example_usage/suites/sampleipadtest.xlsx and b/example_usage/suites/sampleipadtest.xlsx differ diff --git a/example_usage/suites/sampletest.xlsx b/example_usage/suites/sampletest.xlsx index b5b67d4f..4321e156 100644 Binary files a/example_usage/suites/sampletest.xlsx and b/example_usage/suites/sampletest.xlsx differ diff --git a/pom.xml b/pom.xml index 7743b88f..4c174c55 100644 --- a/pom.xml +++ b/pom.xml @@ -6,8 +6,8 @@ ${revision} - 0.1.0 - 3.7.0 + 0.2.0 + 3.8.1 1.8 1.8 UTF-8 diff --git a/pom_bak.xml b/pom_bak.xml deleted file mode 100644 index c5d1c08f..00000000 --- a/pom_bak.xml +++ /dev/null @@ -1,19 +0,0 @@ - - 4.0.0 - com.tmobile.ct - codeless - 0.0.11 - pom - - 1.8 - 1.8 - - - codeless_core - codeless_service - codeless_ui - codeless_test - selenium_action - copy_files - - diff --git a/selenium_action/src/main/java/com/tmobile/selenium/sam/action/actions/Frame.java b/selenium_action/src/main/java/com/tmobile/selenium/sam/action/actions/Frame.java index 92f96219..09bf8519 100644 --- a/selenium_action/src/main/java/com/tmobile/selenium/sam/action/actions/Frame.java +++ b/selenium_action/src/main/java/com/tmobile/selenium/sam/action/actions/Frame.java @@ -3,6 +3,8 @@ */ package com.tmobile.selenium.sam.action.actions; +import java.time.Duration; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; @@ -40,7 +42,7 @@ public Frame(WebDriver driver, Element element, ActionParams params) { @Override public void mainAction() throws Exception{ - new WebDriverWait(driver, waitTime).until(ExpectedConditions.frameToBeAvailableAndSwitchToIt(element.get())); + new WebDriverWait(driver, Duration.ofSeconds(waitTime)).until(ExpectedConditions.frameToBeAvailableAndSwitchToIt(element.get())); } diff --git a/selenium_action/src/main/java/com/tmobile/selenium/sam/action/actions/conditions/Alert.java b/selenium_action/src/main/java/com/tmobile/selenium/sam/action/actions/conditions/Alert.java index ffa11db6..d8d259e2 100644 --- a/selenium_action/src/main/java/com/tmobile/selenium/sam/action/actions/conditions/Alert.java +++ b/selenium_action/src/main/java/com/tmobile/selenium/sam/action/actions/conditions/Alert.java @@ -3,6 +3,8 @@ */ package com.tmobile.selenium.sam.action.actions.conditions; +import java.time.Duration; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; @@ -35,7 +37,7 @@ public Alert(WebDriver driver, int waitTime) { @Override public boolean check() { try { - new WebDriverWait(driver, waitTime).until(ExpectedConditions.alertIsPresent()).accept(); + new WebDriverWait(driver, Duration.ofSeconds(waitTime)).until(ExpectedConditions.alertIsPresent()).accept(); return true; } catch (Exception e) { return false; diff --git a/selenium_action/src/main/java/com/tmobile/selenium/sam/action/utils/Wait.java b/selenium_action/src/main/java/com/tmobile/selenium/sam/action/utils/Wait.java index b2f0791c..f8c59cf6 100644 --- a/selenium_action/src/main/java/com/tmobile/selenium/sam/action/utils/Wait.java +++ b/selenium_action/src/main/java/com/tmobile/selenium/sam/action/utils/Wait.java @@ -16,6 +16,7 @@ package com.tmobile.selenium.sam.action.utils; import java.lang.reflect.InvocationTargetException; +import java.time.Duration; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; @@ -121,21 +122,21 @@ public boolean execute() throws Exception{ * Visible. */ private void visible(){ - new WebDriverWait(driver, waitTime).until(ExpectedConditions.visibilityOf(element.get())); + new WebDriverWait(driver, Duration.ofSeconds(waitTime)).until(ExpectedConditions.visibilityOf(element.get())); } /** * Clickable. */ private void clickable(){ - new WebDriverWait(driver, waitTime).until(ExpectedConditions.elementToBeClickable(element.get())); + new WebDriverWait(driver, Duration.ofSeconds(waitTime)).until(ExpectedConditions.elementToBeClickable(element.get())); } /** * Enabled. */ private void enabled(){ - new WebDriverWait(driver, waitTime).until( + new WebDriverWait(driver, Duration.ofSeconds(waitTime)).until( new ExpectedCondition() { public Boolean apply(WebDriver wdriver) { return element.get().isEnabled(); @@ -147,21 +148,21 @@ public Boolean apply(WebDriver wdriver) { * I frame. */ private void iFrame(){ - new WebDriverWait(driver, waitTime).until(ExpectedConditions.frameToBeAvailableAndSwitchToIt(element.get())); + new WebDriverWait(driver, Duration.ofSeconds(waitTime)).until(ExpectedConditions.frameToBeAvailableAndSwitchToIt(element.get())); } /** * Window. */ private void window(){ - new WebDriverWait(driver, waitTime).until(ExpectedConditions.numberOfWindowsToBe(2)); + new WebDriverWait(driver, Duration.ofSeconds(waitTime)).until(ExpectedConditions.numberOfWindowsToBe(2)); } /** * Not visible. */ private void notVisible(){ - new WebDriverWait(driver, waitTime).until(ExpectedConditions.not(ExpectedConditions.visibilityOf(element.get()))); + new WebDriverWait(driver, Duration.ofSeconds(waitTime)).until(ExpectedConditions.not(ExpectedConditions.visibilityOf(element.get()))); } /** @@ -174,7 +175,7 @@ public Boolean apply(WebDriver driver) { .equals("complete"); } }; - WebDriverWait wait = new WebDriverWait(driver, waitTime); + WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(waitTime)); wait.until(pageLoadCondition); }