From 26bc218c5c2302824d71b86cfb8e3129fbdae6b9 Mon Sep 17 00:00:00 2001 From: Ramesh Babu Date: Thu, 5 May 2022 20:08:28 +0530 Subject: [PATCH 01/12] [Core] Use selcukes.yaml for all configs --- .../io/github/selcukes/commons/config/Environment.java | 2 ++ selcukes-commons/src/main/resources/selcukes.yaml | 9 +++++++++ .../github/selcukes/testng/SelcukesRuntimeAdapter.java | 2 +- .../{selcukes-test.properties => selcukes.properties} | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) rename selcukes-testng/src/test/resources/{selcukes-test.properties => selcukes.properties} (75%) diff --git a/selcukes-commons/src/main/java/io/github/selcukes/commons/config/Environment.java b/selcukes-commons/src/main/java/io/github/selcukes/commons/config/Environment.java index 1c26c4d1d..8a8343817 100644 --- a/selcukes-commons/src/main/java/io/github/selcukes/commons/config/Environment.java +++ b/selcukes-commons/src/main/java/io/github/selcukes/commons/config/Environment.java @@ -30,9 +30,11 @@ public class Environment { private String env; private String baseUrl; private Map excelRunner; + private Map cucumber; private Map web; private Map windows; private Map mobile; + private Map reports; private Map video; private Map notifier; } diff --git a/selcukes-commons/src/main/resources/selcukes.yaml b/selcukes-commons/src/main/resources/selcukes.yaml index dc622d32c..522e091d1 100644 --- a/selcukes-commons/src/main/resources/selcukes.yaml +++ b/selcukes-commons/src/main/resources/selcukes.yaml @@ -7,6 +7,11 @@ baseUrl: excelRunner: filePath: "" suiteName: "smoke" +cucumber: + features: + glue: + tags: + plugin: web: remote: false browserName: CHROME @@ -17,6 +22,10 @@ windows: winApp-path: "C:/Program Files (x86)/Windows Application Driver/WinAppDriver.exe" mobile: serviceUrl: "http://127.0.0.1:4723" +reports: + emailReport: true + htmlReport: true + reportsPath: video: recording: false recorderType: FFMPEG diff --git a/selcukes-testng/src/main/java/io/github/selcukes/testng/SelcukesRuntimeAdapter.java b/selcukes-testng/src/main/java/io/github/selcukes/testng/SelcukesRuntimeAdapter.java index 0f0bd3dba..b2b5ac997 100644 --- a/selcukes-testng/src/main/java/io/github/selcukes/testng/SelcukesRuntimeAdapter.java +++ b/selcukes-testng/src/main/java/io/github/selcukes/testng/SelcukesRuntimeAdapter.java @@ -75,7 +75,7 @@ public void perform() { logger.debug(() -> String.format("Using Runtime Cucumber Options:\nFeatures : [%s]\nGlue : [%s]\nTags : [%s] " + "\n ", features, glue, tag)); } catch (Exception exception) { - logger.warn(() -> "Failed loading selcukes-test properties. Using default CucumberOptions to execute..."); + logger.warn(() -> "Failed loading selcukes properties. Using default CucumberOptions to execute..."); } } diff --git a/selcukes-testng/src/test/resources/selcukes-test.properties b/selcukes-testng/src/test/resources/selcukes.properties similarity index 75% rename from selcukes-testng/src/test/resources/selcukes-test.properties rename to selcukes-testng/src/test/resources/selcukes.properties index 6d670c698..2b6c9f961 100644 --- a/selcukes-testng/src/test/resources/selcukes-test.properties +++ b/selcukes-testng/src/test/resources/selcukes.properties @@ -2,4 +2,4 @@ test.module=google selcukes.features=src/test/resources/features/${test.module} selcukes.tags= selcukes.glue=io.github.selcukes.testng.tests -selcukes.reports-path=target/cucumber-reports \ No newline at end of file +selcukes.reports.path=target/cucumber-reports \ No newline at end of file From 5acba5da3a73b7f3ac0343a17f8f74fede2bc824 Mon Sep 17 00:00:00 2001 From: Ramesh Babu Date: Fri, 6 May 2022 12:44:53 +0530 Subject: [PATCH 02/12] [Core] Using selcukes.yaml for all configs --- .../selcukes/commons/config/Environment.java | 4 +- .../properties/SelcukesTestProperties.java | 44 +++++++++++-------- .../commons/tests/PropertiesTest.java | 5 +-- .../src/test/resources/selcukes.properties | 11 ----- .../{main => test}/resources/selcukes.yaml | 8 ++-- .../src/test}/resources/selcukes.yaml | 0 .../selcukes/excel/ExcelSuiteListener.java | 2 +- .../io/github/selcukes/excel/ExcelUtils.java | 4 +- .../src/test/resources/selcukes.properties | 4 -- .../src/test/resources/selcukes.yaml | 22 ++++++++++ .../selcukes/extent/report/ExtentService.java | 4 +- .../src/test/resources/selcukes.properties | 5 --- .../src/test/resources/selcukes.yaml | 18 ++++++++ .../src/test/resources/selcukes.properties | 5 --- .../src/test}/resources/selcukes.yaml | 9 ++-- .../testng/SelcukesRuntimeAdapter.java | 42 ++++++++++-------- .../src/test/resources/selcukes.properties | 5 --- .../src/test/resources/selcukes.yaml | 18 ++++++++ 18 files changed, 125 insertions(+), 85 deletions(-) delete mode 100644 selcukes-commons/src/test/resources/selcukes.properties rename selcukes-commons/src/{main => test}/resources/selcukes.yaml (84%) rename {selcukes-reports/src/main => selcukes-core/src/test}/resources/selcukes.yaml (100%) delete mode 100644 selcukes-excel-runner/src/test/resources/selcukes.properties create mode 100644 selcukes-excel-runner/src/test/resources/selcukes.yaml delete mode 100644 selcukes-extent-reports/src/test/resources/selcukes.properties create mode 100644 selcukes-extent-reports/src/test/resources/selcukes.yaml delete mode 100644 selcukes-junit/src/test/resources/selcukes.properties rename {selcukes-excel-runner/src/main => selcukes-reports/src/test}/resources/selcukes.yaml (61%) delete mode 100644 selcukes-testng/src/test/resources/selcukes.properties create mode 100644 selcukes-testng/src/test/resources/selcukes.yaml diff --git a/selcukes-commons/src/main/java/io/github/selcukes/commons/config/Environment.java b/selcukes-commons/src/main/java/io/github/selcukes/commons/config/Environment.java index 8a8343817..0a7ca021c 100644 --- a/selcukes-commons/src/main/java/io/github/selcukes/commons/config/Environment.java +++ b/selcukes-commons/src/main/java/io/github/selcukes/commons/config/Environment.java @@ -24,12 +24,12 @@ @JsonIgnoreProperties(ignoreUnknown = true) @Data -@DataFile(fileName = "selcukes.yaml", folderPath = "src/main/resources") +@DataFile(fileName = "selcukes.yaml") public class Environment { private String projectName; private String env; private String baseUrl; - private Map excelRunner; + private Map excel; private Map cucumber; private Map web; private Map windows; diff --git a/selcukes-commons/src/main/java/io/github/selcukes/commons/properties/SelcukesTestProperties.java b/selcukes-commons/src/main/java/io/github/selcukes/commons/properties/SelcukesTestProperties.java index 31499c60a..997e99699 100644 --- a/selcukes-commons/src/main/java/io/github/selcukes/commons/properties/SelcukesTestProperties.java +++ b/selcukes-commons/src/main/java/io/github/selcukes/commons/properties/SelcukesTestProperties.java @@ -19,42 +19,50 @@ import io.github.selcukes.databind.utils.StringHelper; import lombok.CustomLog; -import java.util.Map; +import static io.github.selcukes.commons.config.ConfigFactory.getConfig; @CustomLog public class SelcukesTestProperties { public static final String EXCEL_RUNNER = "selcukes.excel.runner"; public static final String EXCEL_SUITE_NAME = "selcukes.excel.suiteName"; public static final String EXCEL_SUITE_FILE = "selcukes.excel.suiteFile"; - public static final String EXTENT_REPORT = "selcukes.extent.report"; public static final String FEATURES = "selcukes.features"; public static final String GLUE = "selcukes.glue"; public static final String TAGS = "selcukes.tags"; public static final String PLUGIN = "selcukes.plugin"; + public static final String EMAIL_REPORT = "selcukes.reports.emailReport"; + public static final String HTML_REPORT = "selcukes.reports.htmlReport"; public static final String REPORTS_PATH = "selcukes.reports.path"; - public static final String TIMESTAMP_REPORT = "selcukes.timestamp.report"; - private final Map properties; + public static final String REPORTS_File = "selcukes.reports.fileName"; + public static final String TIMESTAMP_REPORT = "selcukes.reports.timestamp"; - public SelcukesTestProperties() { - properties = PropertiesMapper - .readAsMap("selcukes.properties"); + public static void setSystemProperty(String key, String value) { + if (!StringHelper.isNullOrEmpty(value)) { + System.setProperty(key, value); + } } - - public String getProperty(String propertyKey) { + public String getExcelProperty(String propertyKey) { if (System.getProperty(propertyKey) != null) return System.getProperty(propertyKey); - return properties.getOrDefault(propertyKey, ""); + String key = propertyKey.substring(propertyKey.lastIndexOf(".") + 1); + return getConfig().getExcel().getOrDefault(key, ""); } - - public String getSubstitutedProperty(String propertyKey) { - return StringHelper.interpolate(getProperty(propertyKey), - matcher -> getProperty(matcher.group(1))); + public String getCucumberProperty(String propertyKey) { + if (System.getProperty(propertyKey) != null) + return System.getProperty(propertyKey); + String key = propertyKey.substring(propertyKey.lastIndexOf(".") + 1); + return getConfig().getCucumber().getOrDefault(key, ""); } + public String getReportsProperty(String propertyKey) { + if (System.getProperty(propertyKey) != null) + return System.getProperty(propertyKey); + String key = propertyKey.substring(propertyKey.lastIndexOf(".") + 1); + return getConfig().getReports().getOrDefault(key, ""); + } - public static void setSystemProperty(String key, String value) { - if (!value.isBlank()) { - System.setProperty(key, value); - } + public String getSubstitutedConfigProperty(String propertyKey) { + return StringHelper.interpolate(getCucumberProperty(propertyKey), + matcher -> getCucumberProperty(matcher.group(1))); } } diff --git a/selcukes-commons/src/test/java/io/github/selcukes/commons/tests/PropertiesTest.java b/selcukes-commons/src/test/java/io/github/selcukes/commons/tests/PropertiesTest.java index 63c4e8ebb..78c038a29 100644 --- a/selcukes-commons/src/test/java/io/github/selcukes/commons/tests/PropertiesTest.java +++ b/selcukes-commons/src/test/java/io/github/selcukes/commons/tests/PropertiesTest.java @@ -77,9 +77,6 @@ public void linkedPropertiesTest() { @Test public void selcukesTestPropsTest() { SelcukesTestProperties properties = new SelcukesTestProperties(); - assertEquals(properties.getSubstitutedProperty(FEATURES), "Hello RB Test"); - assertEquals(properties.getProperty(EXCEL_SUITE_FILE), "TestData.xlsx"); - assertEquals(properties.getProperty("dummy"), ""); - assertEquals(properties.getSubstitutedProperty(GLUE), "Sample of RB Test"); + logger.info(() -> properties.getSubstitutedConfigProperty(FEATURES)); } } diff --git a/selcukes-commons/src/test/resources/selcukes.properties b/selcukes-commons/src/test/resources/selcukes.properties deleted file mode 100644 index 417837ccd..000000000 --- a/selcukes-commons/src/test/resources/selcukes.properties +++ /dev/null @@ -1,11 +0,0 @@ -my.test=RB Test -selcukes.excel.runner=true -selcukes.excel.suiteName=SMOKE -selcukes.excel.suiteFile=TestData.xlsx -selcukes.extent.report=true -selcukes.features=Hello ${my.test} -selcukes.glue=Sample ${maker} of ${my.test} -selcukes.tags= -selcukes.plugin= -selcukes.reports.path= -selcukes.timestamp.report=true \ No newline at end of file diff --git a/selcukes-commons/src/main/resources/selcukes.yaml b/selcukes-commons/src/test/resources/selcukes.yaml similarity index 84% rename from selcukes-commons/src/main/resources/selcukes.yaml rename to selcukes-commons/src/test/resources/selcukes.yaml index 522e091d1..c471acc55 100644 --- a/selcukes-commons/src/main/resources/selcukes.yaml +++ b/selcukes-commons/src/test/resources/selcukes.yaml @@ -4,12 +4,14 @@ projectName: Selcukes env: Dev proxy: false baseUrl: -excelRunner: +excel: + runner: filePath: "" suiteName: "smoke" cucumber: - features: - glue: + module: google + features: src/test/resources/features/${module} + glue: io.github.selcukes.testng.tests tags: plugin: web: diff --git a/selcukes-reports/src/main/resources/selcukes.yaml b/selcukes-core/src/test/resources/selcukes.yaml similarity index 100% rename from selcukes-reports/src/main/resources/selcukes.yaml rename to selcukes-core/src/test/resources/selcukes.yaml diff --git a/selcukes-excel-runner/src/main/java/io/github/selcukes/excel/ExcelSuiteListener.java b/selcukes-excel-runner/src/main/java/io/github/selcukes/excel/ExcelSuiteListener.java index 55d81a61f..c3cc2030f 100644 --- a/selcukes-excel-runner/src/main/java/io/github/selcukes/excel/ExcelSuiteListener.java +++ b/selcukes-excel-runner/src/main/java/io/github/selcukes/excel/ExcelSuiteListener.java @@ -24,7 +24,7 @@ public class ExcelSuiteListener implements ISuiteListener { @Override public void onStart(ISuite suite) { SelcukesTestProperties testProperties = new SelcukesTestProperties(); - if (!testProperties.getProperty(SelcukesTestProperties.EXCEL_RUNNER).equalsIgnoreCase("false")) + if (!testProperties.getExcelProperty(SelcukesTestProperties.EXCEL_RUNNER).equalsIgnoreCase("false")) ExcelUtils.initTestRunner(); } } diff --git a/selcukes-excel-runner/src/main/java/io/github/selcukes/excel/ExcelUtils.java b/selcukes-excel-runner/src/main/java/io/github/selcukes/excel/ExcelUtils.java index 36c0b96fa..bf2401c9a 100644 --- a/selcukes-excel-runner/src/main/java/io/github/selcukes/excel/ExcelUtils.java +++ b/selcukes-excel-runner/src/main/java/io/github/selcukes/excel/ExcelUtils.java @@ -35,13 +35,13 @@ public class ExcelUtils { private static final Map>> allSheetsDataMap = new LinkedHashMap<>(); private static Map>> allSheetsMap = new LinkedHashMap<>(); public static final List runScenarios = new ArrayList<>(); - private static final String TEST_SUITE_RUNNER_SHEET = ConfigFactory.getConfig().getExcelRunner().get("suiteName"); + private static final String TEST_SUITE_RUNNER_SHEET = ConfigFactory.getConfig().getExcel().get("suiteName"); private static final List IGNORE_SHEETS = new ArrayList<>( Arrays.asList("Master", "Smoke", "Regression", "StaticData")); public static void initTestRunner() { ExcelReader excelReader = new ExcelReader( - ConfigFactory.getConfig().getExcelRunner().get("fileName")); + ConfigFactory.getConfig().getExcel().get("fileName")); // Store all sheets data allSheetsMap = excelReader.getAllSheets().stream() diff --git a/selcukes-excel-runner/src/test/resources/selcukes.properties b/selcukes-excel-runner/src/test/resources/selcukes.properties deleted file mode 100644 index 98ec3a69a..000000000 --- a/selcukes-excel-runner/src/test/resources/selcukes.properties +++ /dev/null @@ -1,4 +0,0 @@ -selcukes.features=src/test/resources/features -selcukes.tags= -selcukes.glue=io.github.selcukes.excel.steps -selcukes.reports.path= \ No newline at end of file diff --git a/selcukes-excel-runner/src/test/resources/selcukes.yaml b/selcukes-excel-runner/src/test/resources/selcukes.yaml new file mode 100644 index 000000000..d434ba146 --- /dev/null +++ b/selcukes-excel-runner/src/test/resources/selcukes.yaml @@ -0,0 +1,22 @@ +# Selcukes Environment Properties +--- +projectName: Selcukes +env: Dev +proxy: false +baseUrl: +excel: + runner: true + fileName: "TestData.xlsx" + suiteName: "Smoke" +cucumber: + module: + features: src/test/resources/features + glue: io.github.selcukes.excel.steps + tags: + plugin: +reports: + emailReport: true + htmlReport: true + path: target + fileName: TestReport + timestamp: false diff --git a/selcukes-extent-reports/src/main/java/io/github/selcukes/extent/report/ExtentService.java b/selcukes-extent-reports/src/main/java/io/github/selcukes/extent/report/ExtentService.java index 6d36d5812..1939bf2d5 100644 --- a/selcukes-extent-reports/src/main/java/io/github/selcukes/extent/report/ExtentService.java +++ b/selcukes-extent-reports/src/main/java/io/github/selcukes/extent/report/ExtentService.java @@ -48,8 +48,8 @@ public static Object getProperty(String key) { } private static class ExtentReportsLoader { - private static final String THUMBNAIL_REPORT = "selcukes.extent.thumbnail"; - private static final String TIMESTAMP_REPORT = "selcukes.timestamp.report"; + private static final String THUMBNAIL_REPORT = "selcukes.reports.thumbnail"; + private static final String TIMESTAMP_REPORT = "selcukes.reports.timestamp"; private static final ExtentReports INSTANCE = new ExtentReports(); private static final String[] DEFAULT_SETUP_PATH = new String[]{"extent.properties", "com/aventstack/adapter/extent.properties"}; diff --git a/selcukes-extent-reports/src/test/resources/selcukes.properties b/selcukes-extent-reports/src/test/resources/selcukes.properties deleted file mode 100644 index 177aec239..000000000 --- a/selcukes-extent-reports/src/test/resources/selcukes.properties +++ /dev/null @@ -1,5 +0,0 @@ -selcukes.features=src/test/resources/ -selcukes.tags= -selcukes.glue=io.github.selcukes.extent.report.tests.steps -selcukes.reports.path= -selcukes.timestamp.report=true \ No newline at end of file diff --git a/selcukes-extent-reports/src/test/resources/selcukes.yaml b/selcukes-extent-reports/src/test/resources/selcukes.yaml new file mode 100644 index 000000000..4ad9444a1 --- /dev/null +++ b/selcukes-extent-reports/src/test/resources/selcukes.yaml @@ -0,0 +1,18 @@ +# Selcukes Environment Properties +--- +projectName: Selcukes +env: Dev +proxy: false +baseUrl: +cucumber: + module: + features: src/test/resources/ + glue: io.github.selcukes.extent.report.tests.steps + tags: + plugin: +reports: + emailReport: true + htmlReport: true + path: target + fileName: TestReport + timestamp: false \ No newline at end of file diff --git a/selcukes-junit/src/test/resources/selcukes.properties b/selcukes-junit/src/test/resources/selcukes.properties deleted file mode 100644 index 750bc13e2..000000000 --- a/selcukes-junit/src/test/resources/selcukes.properties +++ /dev/null @@ -1,5 +0,0 @@ -test.module=google -selcukes.features=src/test/resources/features/${test.module} -selcukes.tags=@ex -selcukes.glue=io.github.selcukes.junit.tests -selcukes.reports.path=target/cucumber-reports \ No newline at end of file diff --git a/selcukes-excel-runner/src/main/resources/selcukes.yaml b/selcukes-reports/src/test/resources/selcukes.yaml similarity index 61% rename from selcukes-excel-runner/src/main/resources/selcukes.yaml rename to selcukes-reports/src/test/resources/selcukes.yaml index 06cea0a9b..3434478ac 100644 --- a/selcukes-excel-runner/src/main/resources/selcukes.yaml +++ b/selcukes-reports/src/test/resources/selcukes.yaml @@ -4,9 +4,6 @@ projectName: Selcukes env: Dev proxy: false baseUrl: -excelRunner: - fileName: "TestData.xlsx" - suiteName: "Smoke" web: remote: false browserName: CHROME @@ -14,13 +11,14 @@ web: serviceUrl: "http://127.0.0.1:8080" windows: serviceUrl: "http://127.0.0.1:4723" - winApp-path: "C:/Program Files (x86)/Windows Application Driver/WinAppDriver.exe" + winApp-path: "C:/Program Files/Windows Application Driver/WinAppDriver.exe" + app: "C:\\Windows\\System32\\notepad.exe" mobile: serviceUrl: "http://127.0.0.1:4723" video: recording: false recorderType: FFMPEG - ffmpegPath: + ffmpegPath: D:\\MyProject\support\video\ffmpeg\bin\ watermarkStatus: false notifier: notification: false @@ -28,3 +26,4 @@ notifier: webhook-token: WEBHOOKXXXX api-token: APIXXXX channel: selcukes + authorIcon: https://avatars0.githubusercontent.com/u/2510294?s=400&u=5d6412ba1dd13052992ff66317ae28d007a971d3&v=4 diff --git a/selcukes-testng/src/main/java/io/github/selcukes/testng/SelcukesRuntimeAdapter.java b/selcukes-testng/src/main/java/io/github/selcukes/testng/SelcukesRuntimeAdapter.java index b2b5ac997..3b23f3dfe 100644 --- a/selcukes-testng/src/main/java/io/github/selcukes/testng/SelcukesRuntimeAdapter.java +++ b/selcukes-testng/src/main/java/io/github/selcukes/testng/SelcukesRuntimeAdapter.java @@ -16,11 +16,13 @@ package io.github.selcukes.testng; + import io.github.selcukes.commons.helper.DateHelper; import io.github.selcukes.commons.properties.SelcukesTestProperties; import lombok.CustomLog; import static io.github.selcukes.commons.properties.SelcukesTestProperties.*; +import static io.github.selcukes.databind.utils.StringHelper.isNullOrEmpty; @CustomLog public class SelcukesRuntimeAdapter implements SelcukesRuntimeOptions { @@ -36,35 +38,38 @@ public static SelcukesRuntimeOptions getInstance() { public void perform() { try { SelcukesTestProperties properties = new SelcukesTestProperties(); - String features = properties.getSubstitutedProperty(FEATURES); - String glue = properties.getProperty(GLUE); - String tag = properties.getProperty(TAGS); - String additionalPlugin = properties.getProperty(PLUGIN); - String reportsPath = properties.getProperty(REPORTS_PATH); - String timestampReport = properties.getProperty(TIMESTAMP_REPORT); - String extentReport = properties.getProperty(EXTENT_REPORT); - - String extentReportPath = reportsPath; + String features = properties.getSubstitutedConfigProperty(FEATURES); + String glue = properties.getCucumberProperty(GLUE); + String tag = properties.getCucumberProperty(TAGS); + String additionalPlugin = properties.getCucumberProperty(PLUGIN); + String reportsPath = properties.getReportsProperty(REPORTS_PATH); + String timestampReport = properties.getReportsProperty(TIMESTAMP_REPORT); + String emailReport = properties.getReportsProperty(EMAIL_REPORT); + String reportsFile = properties.getReportsProperty(REPORTS_File); + if (isNullOrEmpty(reportsFile)) + reportsFile = "TestReport"; - if (reportsPath.isBlank()) { - reportsPath = "target/cucumber-reports"; - extentReportPath = "target/extent-reports"; + if (isNullOrEmpty(reportsPath)) { + reportsPath = "target"; } + String cucumberReportPath = reportsPath + "/cucumber-reports"; + String extentReportPath = reportsPath + "/extent-reports"; + String timestamp = timestampReport.equalsIgnoreCase("true") ? "-" + DateHelper.get().dateTime() : ""; - String plugin = String.format("html:%s/cucumber%s.html, json:%s/cucumber%s.json", - reportsPath, timestamp, reportsPath, timestamp); + String plugin = String.format("html:%s/%s%s.html, json:%s/cucumber%s.json", + cucumberReportPath, reportsFile, timestamp, cucumberReportPath, timestamp); - if (!additionalPlugin.isBlank()) { + if (!isNullOrEmpty(additionalPlugin)) { plugin = plugin + "," + additionalPlugin; } - if (!extentReport.equalsIgnoreCase("false")) { + if (!isNullOrEmpty(emailReport) && !emailReport.equalsIgnoreCase("false")) { setSystemProperty("extent.reporter.spark.start", "true"); - setSystemProperty("extent.reporter.spark.out", extentReportPath + "/TestReport.html"); + setSystemProperty("extent.reporter.spark.out", String.format("%s/%s.html", extentReportPath, reportsFile)); setSystemProperty(TIMESTAMP_REPORT, timestampReport); - plugin=plugin + "," + "io.github.selcukes.extent.report.SelcukesExtentAdapter:"; + plugin = plugin + "," + "io.github.selcukes.extent.report.SelcukesExtentAdapter:"; } setSystemProperty("cucumber.plugin", plugin); setSystemProperty("cucumber.features", features); @@ -79,4 +84,5 @@ public void perform() { } } + } diff --git a/selcukes-testng/src/test/resources/selcukes.properties b/selcukes-testng/src/test/resources/selcukes.properties deleted file mode 100644 index 2b6c9f961..000000000 --- a/selcukes-testng/src/test/resources/selcukes.properties +++ /dev/null @@ -1,5 +0,0 @@ -test.module=google -selcukes.features=src/test/resources/features/${test.module} -selcukes.tags= -selcukes.glue=io.github.selcukes.testng.tests -selcukes.reports.path=target/cucumber-reports \ No newline at end of file diff --git a/selcukes-testng/src/test/resources/selcukes.yaml b/selcukes-testng/src/test/resources/selcukes.yaml new file mode 100644 index 000000000..95823f9c7 --- /dev/null +++ b/selcukes-testng/src/test/resources/selcukes.yaml @@ -0,0 +1,18 @@ +# Selcukes Environment Properties +--- +projectName: Selcukes +env: Dev +proxy: false +baseUrl: +cucumber: + module: google + features: src/test/resources/features/${module} + glue: io.github.selcukes.testng.tests + tags: + plugin: +reports: + emailReport: false + htmlReport: true + path: target + fileName: TestReport + timestamp: false From 8eff60ed8884c224bd86ebd4fc610274ec61f990 Mon Sep 17 00:00:00 2001 From: Ramesh Babu Date: Fri, 6 May 2022 12:52:57 +0530 Subject: [PATCH 03/12] [Core] Updated Test --- .../github/selcukes/commons/tests/PropertiesTest.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/selcukes-commons/src/test/java/io/github/selcukes/commons/tests/PropertiesTest.java b/selcukes-commons/src/test/java/io/github/selcukes/commons/tests/PropertiesTest.java index 78c038a29..0c3dfa3d9 100644 --- a/selcukes-commons/src/test/java/io/github/selcukes/commons/tests/PropertiesTest.java +++ b/selcukes-commons/src/test/java/io/github/selcukes/commons/tests/PropertiesTest.java @@ -27,22 +27,13 @@ import java.nio.file.Path; import java.util.Map; -import static io.github.selcukes.commons.properties.SelcukesTestProperties.*; +import static io.github.selcukes.commons.properties.SelcukesTestProperties.FEATURES; import static org.testng.Assert.*; public class PropertiesTest { private final Logger logger = LoggerFactory.getLogger(getClass()); private final static String PROPS_FILE = "target/temp.properties"; - @Test - public void loadPropertiesMapTest() { - final Map propertiesMap = PropertiesMapper.readAsMap("selcukes.properties"); - assertEquals(propertiesMap.size(), 11); - assertEquals(propertiesMap.get(EXCEL_RUNNER), "true"); - assertEquals(propertiesMap.get(EXCEL_SUITE_NAME), "SMOKE"); - propertiesMap.forEach((k, v) -> logger.info(() -> String.format("Key :[%s] Value :[%s]", k, v))); - } - @Test public void createPropertyFileTest() { Map data = Map.of("userName", "QA", From ca9fd19fc6f8681fef857e848bd9168f7d708d96 Mon Sep 17 00:00:00 2001 From: Ramesh Babu Date: Fri, 6 May 2022 13:42:56 +0530 Subject: [PATCH 04/12] [Core] Updated Log message --- .../java/io/github/selcukes/wdb/version/VersionDetector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webdriver-binaries/src/main/java/io/github/selcukes/wdb/version/VersionDetector.java b/webdriver-binaries/src/main/java/io/github/selcukes/wdb/version/VersionDetector.java index 44a2378d3..9f408e2cb 100644 --- a/webdriver-binaries/src/main/java/io/github/selcukes/wdb/version/VersionDetector.java +++ b/webdriver-binaries/src/main/java/io/github/selcukes/wdb/version/VersionDetector.java @@ -49,7 +49,7 @@ public String getVersion() { if (version.isPresent()) { String cacheVersion = version.get(); if (!cacheVersion.isBlank()) { - logger.debug(() -> "Using cache Binary version : " + cacheVersion); + logger.info(() -> String.format("Using cached %s version : [%s]", driverName, cacheVersion)); return cacheVersion; } } From bc53235bb6797fed7c58b1e030ce7c05e8f400ee Mon Sep 17 00:00:00 2001 From: Ramesh Babu Date: Fri, 6 May 2022 13:52:57 +0530 Subject: [PATCH 05/12] [WebDriver Binaries] Updated Tests --- .../java/io/github/selcukes/wdb/version/VersionDetector.java | 2 +- .../test/java/io/github/selcukes/tests/WebDriverBinaryTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webdriver-binaries/src/main/java/io/github/selcukes/wdb/version/VersionDetector.java b/webdriver-binaries/src/main/java/io/github/selcukes/wdb/version/VersionDetector.java index 9f408e2cb..51ff67bff 100644 --- a/webdriver-binaries/src/main/java/io/github/selcukes/wdb/version/VersionDetector.java +++ b/webdriver-binaries/src/main/java/io/github/selcukes/wdb/version/VersionDetector.java @@ -49,7 +49,7 @@ public String getVersion() { if (version.isPresent()) { String cacheVersion = version.get(); if (!cacheVersion.isBlank()) { - logger.info(() -> String.format("Using cached %s version : [%s]", driverName, cacheVersion)); + logger.info(() -> String.format("Using cached %s [%s] version", driverName, cacheVersion)); return cacheVersion; } } diff --git a/webdriver-binaries/src/test/java/io/github/selcukes/tests/WebDriverBinaryTest.java b/webdriver-binaries/src/test/java/io/github/selcukes/tests/WebDriverBinaryTest.java index 8599b9188..3fff97d7d 100644 --- a/webdriver-binaries/src/test/java/io/github/selcukes/tests/WebDriverBinaryTest.java +++ b/webdriver-binaries/src/test/java/io/github/selcukes/tests/WebDriverBinaryTest.java @@ -102,7 +102,7 @@ public void disableAutoBrowserVersionCheckTest() { @Test(priority = 1000) public void cleanBinaryCacheTest() { - BinaryInfo binaryInfo = WebDriverBinary.chromeDriver().targetPath("temp").clearBinaryCache().setup(); + BinaryInfo binaryInfo = WebDriverBinary.chromeDriver().clearBinaryCache().setup(); String binProp = binaryInfo.getBinaryProperty(); String binaryDownloadedPath = binaryInfo.getBinaryPath(); logger.debug(() -> "Binary path for { " + binProp + "} is {" + binaryDownloadedPath + "}"); From bd3a4da58b64686c6468a327b4171d00d2ce5f0d Mon Sep 17 00:00:00 2001 From: Ramesh Babu Date: Fri, 6 May 2022 14:09:18 +0530 Subject: [PATCH 06/12] [WebDriver Binaries] Updated Options --- .../github/selcukes/core/driver/BrowserOptions.java | 12 ++++++++---- .../io/github/selcukes/wdb/driver/LocalDriver.java | 2 +- .../github/selcukes/tests/WebDriverBinaryTest.java | 10 +++++----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/selcukes-core/src/main/java/io/github/selcukes/core/driver/BrowserOptions.java b/selcukes-core/src/main/java/io/github/selcukes/core/driver/BrowserOptions.java index 6e024fc11..4feee80ef 100644 --- a/selcukes-core/src/main/java/io/github/selcukes/core/driver/BrowserOptions.java +++ b/selcukes-core/src/main/java/io/github/selcukes/core/driver/BrowserOptions.java @@ -30,19 +30,20 @@ import static org.openqa.selenium.remote.CapabilityType.UNEXPECTED_ALERT_BEHAVIOUR; public class BrowserOptions { + public Capabilities getBrowserOptions(DriverType driverType, boolean isGrid) { - boolean headless = Platform.isLinux(); + boolean isLinux = Platform.isLinux(); if (isGrid) { setBinaries(driverType); } switch (driverType) { case EDGE: EdgeOptions edgeOptions = new EdgeOptions(); - edgeOptions.setHeadless(headless); + edgeOptions.addArguments("--no-sandbox","--headless", "--disable-dev-shm-usage"); return edgeOptions; case FIREFOX: FirefoxOptions firefoxOptions = new FirefoxOptions(); - firefoxOptions.setHeadless(headless); + firefoxOptions.setHeadless(isLinux); return firefoxOptions; case IEXPLORER: InternetExplorerOptions ieOptions = new InternetExplorerOptions().requireWindowFocus(); @@ -55,7 +56,10 @@ public Capabilities getBrowserOptions(DriverType driverType, boolean isGrid) { ieOptions.setCapability("enablePersistentHover", true); return ieOptions; default: - return new ChromeOptions().setHeadless(headless); + ChromeOptions chromeOptions=new ChromeOptions(); + if (isLinux) + chromeOptions.addArguments("--no-sandbox","--headless", "--disable-dev-shm-usage"); + return chromeOptions; } } diff --git a/webdriver-binaries/src/main/java/io/github/selcukes/wdb/driver/LocalDriver.java b/webdriver-binaries/src/main/java/io/github/selcukes/wdb/driver/LocalDriver.java index bacb1fd51..cfd7d486c 100644 --- a/webdriver-binaries/src/main/java/io/github/selcukes/wdb/driver/LocalDriver.java +++ b/webdriver-binaries/src/main/java/io/github/selcukes/wdb/driver/LocalDriver.java @@ -39,7 +39,7 @@ public WebDriver createWebDriver(DriverType driverType, boolean headless) { default: WebDriverBinary.chromeDriver().setup(); ChromeOptions chromeOptions = new ChromeOptions(); - chromeOptions.setHeadless(headless); + chromeOptions.addArguments("--no-sandbox","--headless", "--disable-dev-shm-usage"); return new ChromeDriver(chromeOptions); } diff --git a/webdriver-binaries/src/test/java/io/github/selcukes/tests/WebDriverBinaryTest.java b/webdriver-binaries/src/test/java/io/github/selcukes/tests/WebDriverBinaryTest.java index 3fff97d7d..ad0c4e577 100644 --- a/webdriver-binaries/src/test/java/io/github/selcukes/tests/WebDriverBinaryTest.java +++ b/webdriver-binaries/src/test/java/io/github/selcukes/tests/WebDriverBinaryTest.java @@ -30,7 +30,7 @@ public class WebDriverBinaryTest { @Test public void chromeDriverTest() { - BinaryInfo binaryInfo = WebDriverBinary.chromeDriver().targetPath("temp").setup(); + BinaryInfo binaryInfo = WebDriverBinary.chromeDriver().setup(); String binProp = binaryInfo.getBinaryProperty(); assertEquals(binProp, "webdriver.chrome.driver"); logger.debug(() -> "Binary path for { " + binProp + "} is {" + getProperty(binProp) + "}"); @@ -38,7 +38,7 @@ public void chromeDriverTest() { @Test public void firefoxDriverTest() { - BinaryInfo binaryInfo = WebDriverBinary.firefoxDriver().targetPath("temp").version("v0.26.0").arch64().setup(); + BinaryInfo binaryInfo = WebDriverBinary.firefoxDriver().version("v0.26.0").arch64().setup(); String binProp = binaryInfo.getBinaryProperty(); assertEquals(binProp, "webdriver.gecko.driver"); logger.debug(() -> "Binary path for { " + binProp + "} is {" + getProperty(binProp) + "}"); @@ -46,7 +46,7 @@ public void firefoxDriverTest() { @Test public void ieDriverTest() { - BinaryInfo binaryInfo = WebDriverBinary.ieDriver().targetPath("temp").arch32().setup(); + BinaryInfo binaryInfo = WebDriverBinary.ieDriver().arch32().setup(); String binProp = binaryInfo.getBinaryProperty(); assertEquals(binProp, "webdriver.ie.driver"); logger.debug(() -> "Binary path for { " + binProp + "} is {" + getProperty(binProp) + "}"); @@ -55,7 +55,7 @@ public void ieDriverTest() { @Test public void edgeDriverTest() { - BinaryInfo binaryInfo = WebDriverBinary.edgeDriver().targetPath("temp").setup(); + BinaryInfo binaryInfo = WebDriverBinary.edgeDriver().setup(); String binProp = binaryInfo.getBinaryProperty(); assertEquals(binProp, "webdriver.edge.driver"); logger.debug(() -> "Binary path for { " + binProp + "} is {" + getProperty(binProp) + "}"); @@ -64,7 +64,7 @@ public void edgeDriverTest() { @Test public void operaDriverTest() { - BinaryInfo binaryInfo = WebDriverBinary.operaDriver().targetPath("temp").setup(); + BinaryInfo binaryInfo = WebDriverBinary.operaDriver().setup(); String binProp = binaryInfo.getBinaryProperty(); assertEquals(binProp, "webdriver.opera.driver"); logger.debug(() -> "Binary path for { " + binProp + "} is {" + getProperty(binProp) + "}"); From 91e5d1eb611bdad670c3361f3dc3c75b0776a8ed Mon Sep 17 00:00:00 2001 From: Ramesh Babu Date: Fri, 6 May 2022 14:31:01 +0530 Subject: [PATCH 07/12] [WebDriver Binaries] cleanup --- .../github/selcukes/commons/properties/PropertiesMapper.java | 5 +++-- .../main/java/io/github/selcukes/wdb/driver/LocalDriver.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/selcukes-commons/src/main/java/io/github/selcukes/commons/properties/PropertiesMapper.java b/selcukes-commons/src/main/java/io/github/selcukes/commons/properties/PropertiesMapper.java index 1fb57f128..9f6e3bb06 100644 --- a/selcukes-commons/src/main/java/io/github/selcukes/commons/properties/PropertiesMapper.java +++ b/selcukes-commons/src/main/java/io/github/selcukes/commons/properties/PropertiesMapper.java @@ -23,6 +23,7 @@ import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.util.LinkedHashMap; import java.util.Map; @@ -40,8 +41,8 @@ public static Map readAsMap(final String propertyFile) { public static LinkedProperties getProperties(final String propertyFile) { LinkedProperties properties = new LinkedProperties(); - try { - properties.load(ConfigFactory.getStream(propertyFile)); + try (InputStream stream = ConfigFactory.getStream(propertyFile)) { + properties.load(stream); } catch (IOException e) { throw new ConfigurationException("Could not parse property file '" + propertyFile + "'", e); } diff --git a/webdriver-binaries/src/main/java/io/github/selcukes/wdb/driver/LocalDriver.java b/webdriver-binaries/src/main/java/io/github/selcukes/wdb/driver/LocalDriver.java index cfd7d486c..9cb0c5037 100644 --- a/webdriver-binaries/src/main/java/io/github/selcukes/wdb/driver/LocalDriver.java +++ b/webdriver-binaries/src/main/java/io/github/selcukes/wdb/driver/LocalDriver.java @@ -39,6 +39,7 @@ public WebDriver createWebDriver(DriverType driverType, boolean headless) { default: WebDriverBinary.chromeDriver().setup(); ChromeOptions chromeOptions = new ChromeOptions(); + if(headless) chromeOptions.addArguments("--no-sandbox","--headless", "--disable-dev-shm-usage"); return new ChromeDriver(chromeOptions); } From 1ee341615e74a81345b9a04e48ff863926329ec4 Mon Sep 17 00:00:00 2001 From: Ramesh Babu Date: Fri, 6 May 2022 14:36:40 +0530 Subject: [PATCH 08/12] [Core] disabled parllel test --- .../io/github/selcukes/core/tests/grid/ClassicGridTest.java | 2 +- .../main/java/io/github/selcukes/wdb/driver/LocalDriver.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/selcukes-core/src/test/java/io/github/selcukes/core/tests/grid/ClassicGridTest.java b/selcukes-core/src/test/java/io/github/selcukes/core/tests/grid/ClassicGridTest.java index 6bd0a132f..1c84dbcc1 100644 --- a/selcukes-core/src/test/java/io/github/selcukes/core/tests/grid/ClassicGridTest.java +++ b/selcukes-core/src/test/java/io/github/selcukes/core/tests/grid/ClassicGridTest.java @@ -39,7 +39,7 @@ public Object[][] driverTypes() { } @SneakyThrows - @Test(dataProvider = "driverTypes") + @Test(enabled = false,dataProvider = "driverTypes") public void parallelBrowserTest(DriverType driverType) { BrowserOptions browserOptions = new BrowserOptions(); createDriver(DeviceType.BROWSER, browserOptions.getBrowserOptions(driverType, true)); diff --git a/webdriver-binaries/src/main/java/io/github/selcukes/wdb/driver/LocalDriver.java b/webdriver-binaries/src/main/java/io/github/selcukes/wdb/driver/LocalDriver.java index 9cb0c5037..bacb1fd51 100644 --- a/webdriver-binaries/src/main/java/io/github/selcukes/wdb/driver/LocalDriver.java +++ b/webdriver-binaries/src/main/java/io/github/selcukes/wdb/driver/LocalDriver.java @@ -39,8 +39,7 @@ public WebDriver createWebDriver(DriverType driverType, boolean headless) { default: WebDriverBinary.chromeDriver().setup(); ChromeOptions chromeOptions = new ChromeOptions(); - if(headless) - chromeOptions.addArguments("--no-sandbox","--headless", "--disable-dev-shm-usage"); + chromeOptions.setHeadless(headless); return new ChromeDriver(chromeOptions); } From 6ba69e28e6729fc083cffe24e3b5ccf0653ead86 Mon Sep 17 00:00:00 2001 From: Ramesh Babu Date: Fri, 6 May 2022 14:41:01 +0530 Subject: [PATCH 09/12] [Core] disabled web test --- .../test/java/io/github/selcukes/core/tests/WebTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/selcukes-core/src/test/java/io/github/selcukes/core/tests/WebTest.java b/selcukes-core/src/test/java/io/github/selcukes/core/tests/WebTest.java index ecb7130a9..52fec7a8c 100644 --- a/selcukes-core/src/test/java/io/github/selcukes/core/tests/WebTest.java +++ b/selcukes-core/src/test/java/io/github/selcukes/core/tests/WebTest.java @@ -21,12 +21,12 @@ import io.github.selcukes.core.page.WebPage; import org.openqa.selenium.WebDriver; import org.testng.Assert; -import org.testng.annotations.AfterTest; +import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; public class WebTest extends GridBaseTest { - @Test + @Test(enabled = false) public void remoteTest() { WebDriver driver = DriverManager.createDriver(DeviceType.BROWSER); WebPage page = new WebPage(driver); @@ -34,7 +34,7 @@ public void remoteTest() { Assert.assertEquals(page.title(), "Google"); } - @AfterTest + @AfterMethod void afterTest() { DriverManager.removeDriver(); } From cec025c5e1a318faaa76b486c1480101141951eb Mon Sep 17 00:00:00 2001 From: Ramesh Babu Date: Fri, 6 May 2022 14:44:50 +0530 Subject: [PATCH 10/12] [Core] Updated config file --- .../selcukes/core/driver/BrowserOptions.java | 11 ++++--- .../src/main/resources/selcukes.yaml | 29 ------------------- .../src/test/resources/selcukes.yaml | 4 +-- 3 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 selcukes-core/src/main/resources/selcukes.yaml diff --git a/selcukes-core/src/main/java/io/github/selcukes/core/driver/BrowserOptions.java b/selcukes-core/src/main/java/io/github/selcukes/core/driver/BrowserOptions.java index 4feee80ef..74674f1bb 100644 --- a/selcukes-core/src/main/java/io/github/selcukes/core/driver/BrowserOptions.java +++ b/selcukes-core/src/main/java/io/github/selcukes/core/driver/BrowserOptions.java @@ -32,18 +32,18 @@ public class BrowserOptions { public Capabilities getBrowserOptions(DriverType driverType, boolean isGrid) { - boolean isLinux = Platform.isLinux(); + boolean headless = Platform.isLinux(); if (isGrid) { setBinaries(driverType); } switch (driverType) { case EDGE: EdgeOptions edgeOptions = new EdgeOptions(); - edgeOptions.addArguments("--no-sandbox","--headless", "--disable-dev-shm-usage"); + edgeOptions.setHeadless(headless); return edgeOptions; case FIREFOX: FirefoxOptions firefoxOptions = new FirefoxOptions(); - firefoxOptions.setHeadless(isLinux); + firefoxOptions.setHeadless(headless); return firefoxOptions; case IEXPLORER: InternetExplorerOptions ieOptions = new InternetExplorerOptions().requireWindowFocus(); @@ -56,9 +56,8 @@ public Capabilities getBrowserOptions(DriverType driverType, boolean isGrid) { ieOptions.setCapability("enablePersistentHover", true); return ieOptions; default: - ChromeOptions chromeOptions=new ChromeOptions(); - if (isLinux) - chromeOptions.addArguments("--no-sandbox","--headless", "--disable-dev-shm-usage"); + ChromeOptions chromeOptions = new ChromeOptions(); + chromeOptions.setHeadless(headless); return chromeOptions; } diff --git a/selcukes-core/src/main/resources/selcukes.yaml b/selcukes-core/src/main/resources/selcukes.yaml deleted file mode 100644 index 51d690528..000000000 --- a/selcukes-core/src/main/resources/selcukes.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# Selcukes Environment Properties ---- -projectName: Selcukes -env: Dev -proxy: false -baseUrl: -web: - remote: true - browserName: CHROME - headLess: true - serviceUrl: "http://localhost:" -windows: - serviceUrl: "http://127.0.0.1:4723" - winApp-path: "C:/Program Files (x86)/Windows Application Driver/WinAppDriver.exe" - app: "C:\\Windows\\System32\\notepad.exe" -mobile: - serviceUrl: "http://127.0.0.1:4723" - app: "ApiDemos-debug.apk" -video: - recording: false - recorderType: FFMPEG - ffmpegPath: - watermarkStatus: false -notifier: - notification: false - type: slack - webhook-token: WEBHOOKXXXX - api-token: APIXXXX - channel: selcukes diff --git a/selcukes-core/src/test/resources/selcukes.yaml b/selcukes-core/src/test/resources/selcukes.yaml index 3434478ac..41fc78ab1 100644 --- a/selcukes-core/src/test/resources/selcukes.yaml +++ b/selcukes-core/src/test/resources/selcukes.yaml @@ -5,10 +5,10 @@ env: Dev proxy: false baseUrl: web: - remote: false + remote: true browserName: CHROME headLess: true - serviceUrl: "http://127.0.0.1:8080" + serviceUrl: "http://127.0.0.1:" windows: serviceUrl: "http://127.0.0.1:4723" winApp-path: "C:/Program Files/Windows Application Driver/WinAppDriver.exe" From 3a81303f90551f3a29300a1c6a05da7544079acf Mon Sep 17 00:00:00 2001 From: Ramesh Babu Date: Fri, 6 May 2022 14:46:02 +0530 Subject: [PATCH 11/12] [Core] Enabled parallel Tests --- .../src/test/java/io/github/selcukes/core/tests/WebTest.java | 2 +- .../io/github/selcukes/core/tests/grid/ClassicGridTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/selcukes-core/src/test/java/io/github/selcukes/core/tests/WebTest.java b/selcukes-core/src/test/java/io/github/selcukes/core/tests/WebTest.java index 52fec7a8c..c116260b8 100644 --- a/selcukes-core/src/test/java/io/github/selcukes/core/tests/WebTest.java +++ b/selcukes-core/src/test/java/io/github/selcukes/core/tests/WebTest.java @@ -26,7 +26,7 @@ public class WebTest extends GridBaseTest { - @Test(enabled = false) + @Test public void remoteTest() { WebDriver driver = DriverManager.createDriver(DeviceType.BROWSER); WebPage page = new WebPage(driver); diff --git a/selcukes-core/src/test/java/io/github/selcukes/core/tests/grid/ClassicGridTest.java b/selcukes-core/src/test/java/io/github/selcukes/core/tests/grid/ClassicGridTest.java index 1c84dbcc1..6bd0a132f 100644 --- a/selcukes-core/src/test/java/io/github/selcukes/core/tests/grid/ClassicGridTest.java +++ b/selcukes-core/src/test/java/io/github/selcukes/core/tests/grid/ClassicGridTest.java @@ -39,7 +39,7 @@ public Object[][] driverTypes() { } @SneakyThrows - @Test(enabled = false,dataProvider = "driverTypes") + @Test(dataProvider = "driverTypes") public void parallelBrowserTest(DriverType driverType) { BrowserOptions browserOptions = new BrowserOptions(); createDriver(DeviceType.BROWSER, browserOptions.getBrowserOptions(driverType, true)); From 93b0f100a9186ab3d9d77b3f80520e8b47093593 Mon Sep 17 00:00:00 2001 From: Ramesh Babu Date: Fri, 6 May 2022 14:50:59 +0530 Subject: [PATCH 12/12] [Common] Sonar fix --- .../selcukes/commons/properties/SelcukesTestProperties.java | 2 +- .../java/io/github/selcukes/testng/SelcukesRuntimeAdapter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/selcukes-commons/src/main/java/io/github/selcukes/commons/properties/SelcukesTestProperties.java b/selcukes-commons/src/main/java/io/github/selcukes/commons/properties/SelcukesTestProperties.java index 997e99699..8e3cf56c1 100644 --- a/selcukes-commons/src/main/java/io/github/selcukes/commons/properties/SelcukesTestProperties.java +++ b/selcukes-commons/src/main/java/io/github/selcukes/commons/properties/SelcukesTestProperties.java @@ -33,7 +33,7 @@ public class SelcukesTestProperties { public static final String EMAIL_REPORT = "selcukes.reports.emailReport"; public static final String HTML_REPORT = "selcukes.reports.htmlReport"; public static final String REPORTS_PATH = "selcukes.reports.path"; - public static final String REPORTS_File = "selcukes.reports.fileName"; + public static final String REPORTS_FILE = "selcukes.reports.fileName"; public static final String TIMESTAMP_REPORT = "selcukes.reports.timestamp"; public static void setSystemProperty(String key, String value) { diff --git a/selcukes-testng/src/main/java/io/github/selcukes/testng/SelcukesRuntimeAdapter.java b/selcukes-testng/src/main/java/io/github/selcukes/testng/SelcukesRuntimeAdapter.java index 3b23f3dfe..fd06193c8 100644 --- a/selcukes-testng/src/main/java/io/github/selcukes/testng/SelcukesRuntimeAdapter.java +++ b/selcukes-testng/src/main/java/io/github/selcukes/testng/SelcukesRuntimeAdapter.java @@ -45,7 +45,7 @@ public void perform() { String reportsPath = properties.getReportsProperty(REPORTS_PATH); String timestampReport = properties.getReportsProperty(TIMESTAMP_REPORT); String emailReport = properties.getReportsProperty(EMAIL_REPORT); - String reportsFile = properties.getReportsProperty(REPORTS_File); + String reportsFile = properties.getReportsProperty(REPORTS_FILE); if (isNullOrEmpty(reportsFile)) reportsFile = "TestReport";