From 83e69e1fdc56fe45fb41899ecc3cb5a812974008 Mon Sep 17 00:00:00 2001 From: Alekss Litvinovs Date: Fri, 18 Nov 2022 15:48:23 +0200 Subject: [PATCH 1/4] Add lint CI job --- .github/super-linter.env | 5 + .github/workflows/ci.yml | 14 +- README.md | 2 +- checkstyle.xml | 379 ++++++++++++++++++++++++++ src/main/java/testUI/BrowserLogs.java | 263 +++++++++--------- 5 files changed, 534 insertions(+), 129 deletions(-) create mode 100644 .github/super-linter.env create mode 100644 checkstyle.xml diff --git a/.github/super-linter.env b/.github/super-linter.env new file mode 100644 index 0000000..d7a2f5b --- /dev/null +++ b/.github/super-linter.env @@ -0,0 +1,5 @@ +VALIDATE_JAVA=true +JAVA_FILE_NAME=checkstyle.xml +VALIDATE_GITLEAKS=true +VALIDATE_GITHUB_ACTIONS=true +LINTER_RULES_PATH=./ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a32f09..3ac8de3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: java: [ '8', '11', '17' ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v2 with: @@ -27,3 +27,15 @@ jobs: distribution: 'zulu' - name: Build with Maven run: mvn compile + + lint: + runs-on: ubuntu-latest + continue-on-error: true + + steps: + - uses: actions/checkout@v3 + - run: cat .github/super-linter.env >> "$GITHUB_ENV" + - name: Lint with Checkstyle + uses: github/super-linter@v4 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 85116cd..b600f29 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ how it looks... * [Installation](#installation) * [Maven](#maven) * [Gradle (Kotlin)](#gradle-kotlin) - * [Gradle (Groovy )](#gradle-groovy) + * [Gradle (Groovy)](#gradle-groovy) * [Start using TestUI](#start-using-testui) * [Android](#android) * [iOS](#ios) diff --git a/checkstyle.xml b/checkstyle.xml new file mode 100644 index 0000000..171aeaf --- /dev/null +++ b/checkstyle.xml @@ -0,0 +1,379 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/testUI/BrowserLogs.java b/src/main/java/testUI/BrowserLogs.java index cec9000..612971f 100644 --- a/src/main/java/testUI/BrowserLogs.java +++ b/src/main/java/testUI/BrowserLogs.java @@ -33,10 +33,12 @@ public class BrowserLogs { private boolean severalFilters; private static Proxy seleniumProxy; - private BrowserLogs(List> calls, - List filteredCalls, - List> callHar, - boolean severalFilters) { + private BrowserLogs( + List> calls, + List filteredCalls, + List> callHar, + boolean severalFilters + ) { this.calls = calls; this.filteredCalls = filteredCalls; this.callHar = callHar; @@ -70,11 +72,13 @@ public void setLogs() { seleniumProxy.setHttpProxy("localhost:" + getProxy().getPort()); seleniumProxy.setSslProxy("localhost:" + getProxy().getPort()); Configuration.selenideBrowserCapabilities.setCapability( - CapabilityType.PROXY, seleniumProxy); - // enable more detailed HAR capture, if desired (see CaptureType for the complete list) + CapabilityType.PROXY, seleniumProxy); + // enable more detailed HAR capture, if desired (see CaptureType for the + // complete list) proxy.enableHarCaptureTypes( - CaptureType.REQUEST_CONTENT, CaptureType.RESPONSE_CONTENT, - CaptureType.REQUEST_HEADERS, CaptureType.RESPONSE_HEADERS); + CaptureType.REQUEST_CONTENT, CaptureType.RESPONSE_CONTENT, + CaptureType.REQUEST_HEADERS, CaptureType.RESPONSE_HEADERS + ); // create a new HAR with the label "Proxy" proxy.newHar("Proxy"); } @@ -87,7 +91,7 @@ public void setLogs() { if (Configuration.browserLogs || Configuration.logNetworkCalls) { Configuration.selenideBrowserCapabilities.setCapability("goog:loggingPrefs", logPrefs); Configuration.selenideBrowserCapabilities.setCapability( - CapabilityType.LOGGING_PREFS, logPrefs); + CapabilityType.LOGGING_PREFS, logPrefs); } } @@ -101,48 +105,48 @@ public BrowserLogs getNetworkCalls() { if (Configuration.remote != null && !Configuration.remote.isEmpty()) { try { for (LogEntry list : getWebDriver().manage().logs().get(LogType.PERFORMANCE) - .getAll()) { + .getAll()) { JSONObject obj = new JSONObject(list.getMessage()); JSONObject requests = obj.getJSONObject("message").getJSONObject("params"); Map call = new HashMap<>(); if (requests.has("request") && - requests.getJSONObject("request").has("url")) { + requests.getJSONObject("request").has("url")) { call.put("URL", requests.getJSONObject("request").getString("url")); if (requests.getJSONObject("request").has("status")) { call.put( - "Status", - String.valueOf(requests.getJSONObject("request") - .getInt("status")) + "Status", + String.valueOf(requests.getJSONObject("request") + .getInt("status")) ); } else { call.put("Status", "0"); } if (requests.getJSONObject("request").has("headers")) { call.put( - "RequestHeaders", - requests.getJSONObject("request").getJSONObject("headers") - .toString() + "RequestHeaders", + requests.getJSONObject("request").getJSONObject("headers") + .toString() ); } else { call.put("RequestHeaders", ""); } } else if (requests.has("response") && - requests.getJSONObject("response").has("url")) { + requests.getJSONObject("response").has("url")) { call.put("URL", requests.getJSONObject("response").getString("url")); if (requests.getJSONObject("response").has("status")) { call.put( - "Status", - String.valueOf(requests.getJSONObject("response") - .getInt("status")) + "Status", + String.valueOf(requests.getJSONObject("response") + .getInt("status")) ); } else { call.put("Status", "0"); } if (requests.getJSONObject("response").has("headers")) { call.put( - "ResponseHeaders", - requests.getJSONObject("response").getJSONObject("headers") - .toString() + "ResponseHeaders", + requests.getJSONObject("response").getJSONObject("headers") + .toString() ); } else { call.put("RequestHeaders", ""); @@ -153,23 +157,23 @@ public BrowserLogs getNetworkCalls() { call = new HashMap<>(); } if (requests.has("redirectResponse") && - requests.getJSONObject("redirectResponse").has("url")) { + requests.getJSONObject("redirectResponse").has("url")) { call.put("URL", requests.getJSONObject("redirectResponse") - .getString("url")); + .getString("url")); if (requests.getJSONObject("redirectResponse").has("status")) { call.put( - "Status", - String.valueOf(requests.getJSONObject("redirectResponse") - .getInt("status")) + "Status", + String.valueOf(requests.getJSONObject("redirectResponse") + .getInt("status")) ); } else { call.put("Status", "0"); } if (requests.getJSONObject("redirectResponse").has("headers")) { call.put( - "ResponseHeaders", - requests.getJSONObject("redirectResponse") - .getJSONObject("headers").toString() + "ResponseHeaders", + requests.getJSONObject("redirectResponse") + .getJSONObject("headers").toString() ); } else { call.put("ResponseHeaders", ""); @@ -192,11 +196,11 @@ public BrowserLogs getNetworkCalls() { call.put("RequestHeaders", entry.getRequest().getHeaders().toString()); call.put("ResponseHeaders", entry.getResponse().getHeaders().toString()); String payload = entry.getResponse().getContent().getText() == null ? - "" : entry.getResponse().getContent().getText(); + "" : entry.getResponse().getContent().getText(); call.put("Payload", payload); if (entry.getResponse().getStatus() >= 300) { call.put("Response: ", String.valueOf(entry.getResponse().getContent() - .getText())); + .getText())); } callHar.add(call); } @@ -213,7 +217,7 @@ public List getBrowserLogs() { SimpleDateFormat jdf = new SimpleDateFormat("YYYY.MM.dd HH:mm:ss.SSS"); browserLogs.add( - "[" + log.getLevel() + "] " + jdf.format(date) + ": " + log.getMessage() + "[" + log.getLevel() + "] " + jdf.format(date) + ": " + log.getMessage() ); } } catch (UnsupportedCommandException e) { @@ -241,37 +245,37 @@ public BrowserLogs getLastNetworkCalls(int lastX) { if (requests.has("requestId")) { Map call = new HashMap<>(); if (requests.has("request") && - requests.getJSONObject("request").has("url")) { + requests.getJSONObject("request").has("url")) { call.put("URL", requests.getJSONObject("request").getString("url")); if (requests.getJSONObject("request").has("status")) { call.put("Status", requests.getJSONObject("request") - .getString("status")); + .getString("status")); } if (requests.getJSONObject("request").has("headers")) { call.put( - "RequestHeaders", - requests.getJSONObject("request").getJSONObject("headers") - .toString() + "RequestHeaders", + requests.getJSONObject("request").getJSONObject("headers") + .toString() ); } } else if (requests.has("response") && - requests.getJSONObject("response").has("url")) { + requests.getJSONObject("response").has("url")) { call.put( - "URL", - requests.getJSONObject("response").getString("url") + "URL", + requests.getJSONObject("response").getString("url") ); if (requests.getJSONObject("response").has("status")) { call.put( - "Status", - String.valueOf(requests.getJSONObject("response") - .getInt("status")) + "Status", + String.valueOf(requests.getJSONObject("response") + .getInt("status")) ); } if (requests.getJSONObject("response").has("headers")) { call.put( - "ResponseHeaders", - requests.getJSONObject("response") - .getJSONObject("headers").toString() + "ResponseHeaders", + requests.getJSONObject("response") + .getJSONObject("headers").toString() ); } } @@ -294,11 +298,11 @@ public BrowserLogs getLastNetworkCalls(int lastX) { call.put("RequestHeaders", entryList.get(j).getRequest().getHeaders().toString()); call.put("ResponseHeaders", entryList.get(j).getResponse().getHeaders().toString()); String payload = entryList.get(j).getResponse().getContent().getText() == null ? - "" : entryList.get(j).getResponse().getContent().getText(); + "" : entryList.get(j).getResponse().getContent().getText(); call.put("Payload", payload); if (entryList.get(j).getResponse().getStatus() >= 300) { call.put("Response: ", String.valueOf(entryList.get(j).getResponse() - .getContent().getText())); + .getContent().getText())); } callHar.add(call); } @@ -396,11 +400,11 @@ public BrowserLogs filterByHeader(String header, String value) { for (Map call : this.callHar) { JSONObject jsonObject = new JSONObject(); if (call.get("RequestHeaders") != null - && call.get("RequestHeaders").toLowerCase().contains(header.toLowerCase()) - && call.get("RequestHeaders").contains(value) - || call.get("ResponseHeaders") != null - && call.get("ResponseHeaders").toLowerCase().contains(header.toLowerCase()) - && call.get("ResponseHeaders").contains(value)) { + && call.get("RequestHeaders").toLowerCase().contains(header.toLowerCase()) + && call.get("RequestHeaders").contains(value) + || call.get("ResponseHeaders") != null + && call.get("ResponseHeaders").toLowerCase().contains(header.toLowerCase()) + && call.get("ResponseHeaders").contains(value)) { jsonObject.put("URL", call.get("URL")); jsonObject.put("statusCode", call.get("Status")); if (call.get("Payload") != null) { @@ -419,13 +423,13 @@ public BrowserLogs filterByHeader(String header, String value) { for (JSONObject jsonObject : this.filteredCalls) { JSONObject jsonObject2 = new JSONObject(); if (jsonObject.has("RequestHeaders") - && jsonObject.getString("RequestHeaders").toLowerCase() - .contains(header.toLowerCase()) - && jsonObject.getString("RequestHeaders").contains(value) - || jsonObject.has("ResponseHeaders") - && jsonObject.getString("ResponseHeaders").toLowerCase() - .contains(header.toLowerCase()) - && jsonObject.getString("ResponseHeaders").contains(value)) { + && jsonObject.getString("RequestHeaders").toLowerCase() + .contains(header.toLowerCase()) + && jsonObject.getString("RequestHeaders").contains(value) + || jsonObject.has("ResponseHeaders") + && jsonObject.getString("ResponseHeaders").toLowerCase() + .contains(header.toLowerCase()) + && jsonObject.getString("ResponseHeaders").contains(value)) { jsonObject2.put("URL", jsonObject.get("URL")); jsonObject2.put("statusCode", jsonObject.get("statusCode")); if (jsonObject.has("Payload")) { @@ -447,40 +451,40 @@ public BrowserLogs filterByHeader(String header, String value) { public BrowserLogs and() { return new BrowserLogs( - this.calls, - this.filteredCalls, - this.callHar, - true + this.calls, + this.filteredCalls, + this.callHar, + true ); } public BrowserLogs or() { return new BrowserLogs( - this.calls, - this.filteredCalls, - this.callHar, - false + this.calls, + this.filteredCalls, + this.callHar, + false ); } public BrowserLogs assertStatusCode(int statusCode) { for (JSONObject responses : this.filteredCalls) { if (responses.getInt("statusCode") != statusCode - && responses.getInt("statusCode") != 0) { + && responses.getInt("statusCode") != 0) { if (Configuration.useAllure) { Allure.addAttachment( - "Assert Status Code", - "Status code should be " + - statusCode + - " but was " + - responses.getInt("statusCode") + - "\n Response: \n" + - responses + "Assert Status Code", + "Status code should be " + + statusCode + + " but was " + + responses.getInt("statusCode") + + "\n Response: \n" + + responses ); } throw new TestUIException("Status code should be " + statusCode + " but was " - + responses.getInt("statusCode") + "\n Response: \n" + - responses); + + responses.getInt("statusCode") + "\n Response: \n" + + responses); } } return new BrowserLogs(this.calls, this.filteredCalls, this.callHar, this.severalFilters); @@ -488,31 +492,33 @@ public BrowserLogs assertStatusCode(int statusCode) { public BrowserLogs assertStatusCode(int statusCode, int statusCode2) { for (JSONObject responses : this.filteredCalls) { - if ((responses.getInt("statusCode") < statusCode || - responses.getInt("statusCode") > statusCode2) - && responses.getInt("statusCode") != 0) { + if (( + responses.getInt("statusCode") < statusCode || + responses.getInt("statusCode") > statusCode2 + ) + && responses.getInt("statusCode") != 0) { if (Configuration.useAllure) { Allure.addAttachment( - "Assert Status Code", - "Status code should be between " + - statusCode + - " and " + - statusCode2 + - " but was " + - responses.getInt("statusCode") + - "\n Response: \n" + - responses + "Assert Status Code", + "Status code should be between " + + statusCode + + " and " + + statusCode2 + + " but was " + + responses.getInt("statusCode") + + "\n Response: \n" + + responses ); } throw new TestUIException( - "Status code should be between " + - statusCode + - " and " + - statusCode2 + - " but was " + - responses.getInt("statusCode") + - "\n Response: \n" + - responses + "Status code should be between " + + statusCode + + " and " + + statusCode2 + + " but was " + + responses.getInt("statusCode") + + "\n Response: \n" + + responses ); } } @@ -524,42 +530,44 @@ public BrowserLogs assertResponseHeader(String Header, String Value) { boolean found = false; for (JSONObject responses : this.filteredCalls) { if (responses.has("ResponseHeaders") && - !responses.getString("ResponseHeaders").toLowerCase() - .contains(Value.toLowerCase())) { + !responses.getString("ResponseHeaders").toLowerCase() + .contains(Value.toLowerCase())) { if (Configuration.useAllure) { Allure.addAttachment( - "Assert Headers", - "The headers should contain '" + - Header + - "' Equal to '" + - Value + - " but is: \n " + - responses.getString("ResponseHeaders") + - "\n Response: \n" + - responses + "Assert Headers", + "The headers should contain '" + + Header + + "' Equal to '" + + Value + + " but is: \n " + + responses.getString("ResponseHeaders") + + "\n Response: \n" + + responses ); } throw new TestUIException( - "The headers should contain '" + - Header + - "' Equal to '" + - Value + - " but is: \n " + - responses.getString("ResponseHeaders") + - "\n Response: \n" + - responses + "The headers should contain '" + + Header + + "' Equal to '" + + Value + + " but is: \n " + + responses.getString("ResponseHeaders") + + "\n Response: \n" + + responses ); - } else if (responses.has("ResponseHeaders") && - responses.getString("ResponseHeaders").contains(Value)) { + } else if ( + responses.has("ResponseHeaders") + && responses.getString("ResponseHeaders").contains(Value) + ) { found = true; } } if (!found) { throw new TestUIException( - "There were no calls with those response headers: '" + - Header + - "' equal to '" + - Value + "'" + "There were no calls with those response headers: '" + + Header + + "' equal to '" + + Value + "'" ); } return new BrowserLogs(this.calls, this.filteredCalls, this.callHar, this.severalFilters); @@ -567,7 +575,8 @@ public BrowserLogs assertResponseHeader(String Header, String Value) { public BrowserLogs assertFilteredCallExists() { if (this.filteredCalls.size() == 0) { - throw new TestUIException("There are no network calls with the filter parameters included!"); + throw new TestUIException( + "There are no network calls with the filter parameters included!"); } return new BrowserLogs(this.calls, this.filteredCalls, this.callHar, this.severalFilters); } From 37781d1a47f7bf1adbec9507af8e9c50061d0dfe Mon Sep 17 00:00:00 2001 From: Alekss Litvinovs Date: Fri, 18 Nov 2022 15:49:39 +0200 Subject: [PATCH 2/4] Revert BrowserLogs.java --- src/main/java/testUI/BrowserLogs.java | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/main/java/testUI/BrowserLogs.java b/src/main/java/testUI/BrowserLogs.java index 612971f..8eef22e 100644 --- a/src/main/java/testUI/BrowserLogs.java +++ b/src/main/java/testUI/BrowserLogs.java @@ -33,12 +33,10 @@ public class BrowserLogs { private boolean severalFilters; private static Proxy seleniumProxy; - private BrowserLogs( - List> calls, + private BrowserLogs(List> calls, List filteredCalls, List> callHar, - boolean severalFilters - ) { + boolean severalFilters) { this.calls = calls; this.filteredCalls = filteredCalls; this.callHar = callHar; @@ -73,12 +71,10 @@ public void setLogs() { seleniumProxy.setSslProxy("localhost:" + getProxy().getPort()); Configuration.selenideBrowserCapabilities.setCapability( CapabilityType.PROXY, seleniumProxy); - // enable more detailed HAR capture, if desired (see CaptureType for the - // complete list) + // enable more detailed HAR capture, if desired (see CaptureType for the complete list) proxy.enableHarCaptureTypes( CaptureType.REQUEST_CONTENT, CaptureType.RESPONSE_CONTENT, - CaptureType.REQUEST_HEADERS, CaptureType.RESPONSE_HEADERS - ); + CaptureType.REQUEST_HEADERS, CaptureType.RESPONSE_HEADERS); // create a new HAR with the label "Proxy" proxy.newHar("Proxy"); } @@ -492,10 +488,8 @@ public BrowserLogs assertStatusCode(int statusCode) { public BrowserLogs assertStatusCode(int statusCode, int statusCode2) { for (JSONObject responses : this.filteredCalls) { - if (( - responses.getInt("statusCode") < statusCode || - responses.getInt("statusCode") > statusCode2 - ) + if ((responses.getInt("statusCode") < statusCode || + responses.getInt("statusCode") > statusCode2) && responses.getInt("statusCode") != 0) { if (Configuration.useAllure) { Allure.addAttachment( @@ -555,10 +549,8 @@ public BrowserLogs assertResponseHeader(String Header, String Value) { "\n Response: \n" + responses ); - } else if ( - responses.has("ResponseHeaders") - && responses.getString("ResponseHeaders").contains(Value) - ) { + } else if (responses.has("ResponseHeaders") && + responses.getString("ResponseHeaders").contains(Value)) { found = true; } } @@ -575,8 +567,7 @@ public BrowserLogs assertResponseHeader(String Header, String Value) { public BrowserLogs assertFilteredCallExists() { if (this.filteredCalls.size() == 0) { - throw new TestUIException( - "There are no network calls with the filter parameters included!"); + throw new TestUIException("There are no network calls with the filter parameters included!"); } return new BrowserLogs(this.calls, this.filteredCalls, this.callHar, this.severalFilters); } From cc8f9ba8a0d67f7ef4d2fe96313f5436ab961fe7 Mon Sep 17 00:00:00 2001 From: Alekss Litvinovs Date: Fri, 18 Nov 2022 15:54:03 +0200 Subject: [PATCH 3/4] Revert BrowserLogs.java to master --- src/main/java/testUI/BrowserLogs.java | 244 +++++++++++++------------- 1 file changed, 122 insertions(+), 122 deletions(-) diff --git a/src/main/java/testUI/BrowserLogs.java b/src/main/java/testUI/BrowserLogs.java index 8eef22e..cec9000 100644 --- a/src/main/java/testUI/BrowserLogs.java +++ b/src/main/java/testUI/BrowserLogs.java @@ -34,9 +34,9 @@ public class BrowserLogs { private static Proxy seleniumProxy; private BrowserLogs(List> calls, - List filteredCalls, - List> callHar, - boolean severalFilters) { + List filteredCalls, + List> callHar, + boolean severalFilters) { this.calls = calls; this.filteredCalls = filteredCalls; this.callHar = callHar; @@ -70,11 +70,11 @@ public void setLogs() { seleniumProxy.setHttpProxy("localhost:" + getProxy().getPort()); seleniumProxy.setSslProxy("localhost:" + getProxy().getPort()); Configuration.selenideBrowserCapabilities.setCapability( - CapabilityType.PROXY, seleniumProxy); + CapabilityType.PROXY, seleniumProxy); // enable more detailed HAR capture, if desired (see CaptureType for the complete list) proxy.enableHarCaptureTypes( - CaptureType.REQUEST_CONTENT, CaptureType.RESPONSE_CONTENT, - CaptureType.REQUEST_HEADERS, CaptureType.RESPONSE_HEADERS); + CaptureType.REQUEST_CONTENT, CaptureType.RESPONSE_CONTENT, + CaptureType.REQUEST_HEADERS, CaptureType.RESPONSE_HEADERS); // create a new HAR with the label "Proxy" proxy.newHar("Proxy"); } @@ -87,7 +87,7 @@ public void setLogs() { if (Configuration.browserLogs || Configuration.logNetworkCalls) { Configuration.selenideBrowserCapabilities.setCapability("goog:loggingPrefs", logPrefs); Configuration.selenideBrowserCapabilities.setCapability( - CapabilityType.LOGGING_PREFS, logPrefs); + CapabilityType.LOGGING_PREFS, logPrefs); } } @@ -101,48 +101,48 @@ public BrowserLogs getNetworkCalls() { if (Configuration.remote != null && !Configuration.remote.isEmpty()) { try { for (LogEntry list : getWebDriver().manage().logs().get(LogType.PERFORMANCE) - .getAll()) { + .getAll()) { JSONObject obj = new JSONObject(list.getMessage()); JSONObject requests = obj.getJSONObject("message").getJSONObject("params"); Map call = new HashMap<>(); if (requests.has("request") && - requests.getJSONObject("request").has("url")) { + requests.getJSONObject("request").has("url")) { call.put("URL", requests.getJSONObject("request").getString("url")); if (requests.getJSONObject("request").has("status")) { call.put( - "Status", - String.valueOf(requests.getJSONObject("request") - .getInt("status")) + "Status", + String.valueOf(requests.getJSONObject("request") + .getInt("status")) ); } else { call.put("Status", "0"); } if (requests.getJSONObject("request").has("headers")) { call.put( - "RequestHeaders", - requests.getJSONObject("request").getJSONObject("headers") - .toString() + "RequestHeaders", + requests.getJSONObject("request").getJSONObject("headers") + .toString() ); } else { call.put("RequestHeaders", ""); } } else if (requests.has("response") && - requests.getJSONObject("response").has("url")) { + requests.getJSONObject("response").has("url")) { call.put("URL", requests.getJSONObject("response").getString("url")); if (requests.getJSONObject("response").has("status")) { call.put( - "Status", - String.valueOf(requests.getJSONObject("response") - .getInt("status")) + "Status", + String.valueOf(requests.getJSONObject("response") + .getInt("status")) ); } else { call.put("Status", "0"); } if (requests.getJSONObject("response").has("headers")) { call.put( - "ResponseHeaders", - requests.getJSONObject("response").getJSONObject("headers") - .toString() + "ResponseHeaders", + requests.getJSONObject("response").getJSONObject("headers") + .toString() ); } else { call.put("RequestHeaders", ""); @@ -153,23 +153,23 @@ public BrowserLogs getNetworkCalls() { call = new HashMap<>(); } if (requests.has("redirectResponse") && - requests.getJSONObject("redirectResponse").has("url")) { + requests.getJSONObject("redirectResponse").has("url")) { call.put("URL", requests.getJSONObject("redirectResponse") - .getString("url")); + .getString("url")); if (requests.getJSONObject("redirectResponse").has("status")) { call.put( - "Status", - String.valueOf(requests.getJSONObject("redirectResponse") - .getInt("status")) + "Status", + String.valueOf(requests.getJSONObject("redirectResponse") + .getInt("status")) ); } else { call.put("Status", "0"); } if (requests.getJSONObject("redirectResponse").has("headers")) { call.put( - "ResponseHeaders", - requests.getJSONObject("redirectResponse") - .getJSONObject("headers").toString() + "ResponseHeaders", + requests.getJSONObject("redirectResponse") + .getJSONObject("headers").toString() ); } else { call.put("ResponseHeaders", ""); @@ -192,11 +192,11 @@ public BrowserLogs getNetworkCalls() { call.put("RequestHeaders", entry.getRequest().getHeaders().toString()); call.put("ResponseHeaders", entry.getResponse().getHeaders().toString()); String payload = entry.getResponse().getContent().getText() == null ? - "" : entry.getResponse().getContent().getText(); + "" : entry.getResponse().getContent().getText(); call.put("Payload", payload); if (entry.getResponse().getStatus() >= 300) { call.put("Response: ", String.valueOf(entry.getResponse().getContent() - .getText())); + .getText())); } callHar.add(call); } @@ -213,7 +213,7 @@ public List getBrowserLogs() { SimpleDateFormat jdf = new SimpleDateFormat("YYYY.MM.dd HH:mm:ss.SSS"); browserLogs.add( - "[" + log.getLevel() + "] " + jdf.format(date) + ": " + log.getMessage() + "[" + log.getLevel() + "] " + jdf.format(date) + ": " + log.getMessage() ); } } catch (UnsupportedCommandException e) { @@ -241,37 +241,37 @@ public BrowserLogs getLastNetworkCalls(int lastX) { if (requests.has("requestId")) { Map call = new HashMap<>(); if (requests.has("request") && - requests.getJSONObject("request").has("url")) { + requests.getJSONObject("request").has("url")) { call.put("URL", requests.getJSONObject("request").getString("url")); if (requests.getJSONObject("request").has("status")) { call.put("Status", requests.getJSONObject("request") - .getString("status")); + .getString("status")); } if (requests.getJSONObject("request").has("headers")) { call.put( - "RequestHeaders", - requests.getJSONObject("request").getJSONObject("headers") - .toString() + "RequestHeaders", + requests.getJSONObject("request").getJSONObject("headers") + .toString() ); } } else if (requests.has("response") && - requests.getJSONObject("response").has("url")) { + requests.getJSONObject("response").has("url")) { call.put( - "URL", - requests.getJSONObject("response").getString("url") + "URL", + requests.getJSONObject("response").getString("url") ); if (requests.getJSONObject("response").has("status")) { call.put( - "Status", - String.valueOf(requests.getJSONObject("response") - .getInt("status")) + "Status", + String.valueOf(requests.getJSONObject("response") + .getInt("status")) ); } if (requests.getJSONObject("response").has("headers")) { call.put( - "ResponseHeaders", - requests.getJSONObject("response") - .getJSONObject("headers").toString() + "ResponseHeaders", + requests.getJSONObject("response") + .getJSONObject("headers").toString() ); } } @@ -294,11 +294,11 @@ public BrowserLogs getLastNetworkCalls(int lastX) { call.put("RequestHeaders", entryList.get(j).getRequest().getHeaders().toString()); call.put("ResponseHeaders", entryList.get(j).getResponse().getHeaders().toString()); String payload = entryList.get(j).getResponse().getContent().getText() == null ? - "" : entryList.get(j).getResponse().getContent().getText(); + "" : entryList.get(j).getResponse().getContent().getText(); call.put("Payload", payload); if (entryList.get(j).getResponse().getStatus() >= 300) { call.put("Response: ", String.valueOf(entryList.get(j).getResponse() - .getContent().getText())); + .getContent().getText())); } callHar.add(call); } @@ -396,11 +396,11 @@ public BrowserLogs filterByHeader(String header, String value) { for (Map call : this.callHar) { JSONObject jsonObject = new JSONObject(); if (call.get("RequestHeaders") != null - && call.get("RequestHeaders").toLowerCase().contains(header.toLowerCase()) - && call.get("RequestHeaders").contains(value) - || call.get("ResponseHeaders") != null - && call.get("ResponseHeaders").toLowerCase().contains(header.toLowerCase()) - && call.get("ResponseHeaders").contains(value)) { + && call.get("RequestHeaders").toLowerCase().contains(header.toLowerCase()) + && call.get("RequestHeaders").contains(value) + || call.get("ResponseHeaders") != null + && call.get("ResponseHeaders").toLowerCase().contains(header.toLowerCase()) + && call.get("ResponseHeaders").contains(value)) { jsonObject.put("URL", call.get("URL")); jsonObject.put("statusCode", call.get("Status")); if (call.get("Payload") != null) { @@ -419,13 +419,13 @@ public BrowserLogs filterByHeader(String header, String value) { for (JSONObject jsonObject : this.filteredCalls) { JSONObject jsonObject2 = new JSONObject(); if (jsonObject.has("RequestHeaders") - && jsonObject.getString("RequestHeaders").toLowerCase() - .contains(header.toLowerCase()) - && jsonObject.getString("RequestHeaders").contains(value) - || jsonObject.has("ResponseHeaders") - && jsonObject.getString("ResponseHeaders").toLowerCase() - .contains(header.toLowerCase()) - && jsonObject.getString("ResponseHeaders").contains(value)) { + && jsonObject.getString("RequestHeaders").toLowerCase() + .contains(header.toLowerCase()) + && jsonObject.getString("RequestHeaders").contains(value) + || jsonObject.has("ResponseHeaders") + && jsonObject.getString("ResponseHeaders").toLowerCase() + .contains(header.toLowerCase()) + && jsonObject.getString("ResponseHeaders").contains(value)) { jsonObject2.put("URL", jsonObject.get("URL")); jsonObject2.put("statusCode", jsonObject.get("statusCode")); if (jsonObject.has("Payload")) { @@ -447,40 +447,40 @@ public BrowserLogs filterByHeader(String header, String value) { public BrowserLogs and() { return new BrowserLogs( - this.calls, - this.filteredCalls, - this.callHar, - true + this.calls, + this.filteredCalls, + this.callHar, + true ); } public BrowserLogs or() { return new BrowserLogs( - this.calls, - this.filteredCalls, - this.callHar, - false + this.calls, + this.filteredCalls, + this.callHar, + false ); } public BrowserLogs assertStatusCode(int statusCode) { for (JSONObject responses : this.filteredCalls) { if (responses.getInt("statusCode") != statusCode - && responses.getInt("statusCode") != 0) { + && responses.getInt("statusCode") != 0) { if (Configuration.useAllure) { Allure.addAttachment( - "Assert Status Code", - "Status code should be " + - statusCode + - " but was " + - responses.getInt("statusCode") + - "\n Response: \n" + - responses + "Assert Status Code", + "Status code should be " + + statusCode + + " but was " + + responses.getInt("statusCode") + + "\n Response: \n" + + responses ); } throw new TestUIException("Status code should be " + statusCode + " but was " - + responses.getInt("statusCode") + "\n Response: \n" + - responses); + + responses.getInt("statusCode") + "\n Response: \n" + + responses); } } return new BrowserLogs(this.calls, this.filteredCalls, this.callHar, this.severalFilters); @@ -489,30 +489,30 @@ public BrowserLogs assertStatusCode(int statusCode) { public BrowserLogs assertStatusCode(int statusCode, int statusCode2) { for (JSONObject responses : this.filteredCalls) { if ((responses.getInt("statusCode") < statusCode || - responses.getInt("statusCode") > statusCode2) - && responses.getInt("statusCode") != 0) { + responses.getInt("statusCode") > statusCode2) + && responses.getInt("statusCode") != 0) { if (Configuration.useAllure) { Allure.addAttachment( - "Assert Status Code", - "Status code should be between " + - statusCode + - " and " + - statusCode2 + - " but was " + - responses.getInt("statusCode") + - "\n Response: \n" + - responses + "Assert Status Code", + "Status code should be between " + + statusCode + + " and " + + statusCode2 + + " but was " + + responses.getInt("statusCode") + + "\n Response: \n" + + responses ); } throw new TestUIException( - "Status code should be between " + - statusCode + - " and " + - statusCode2 + - " but was " + - responses.getInt("statusCode") + - "\n Response: \n" + - responses + "Status code should be between " + + statusCode + + " and " + + statusCode2 + + " but was " + + responses.getInt("statusCode") + + "\n Response: \n" + + responses ); } } @@ -524,42 +524,42 @@ public BrowserLogs assertResponseHeader(String Header, String Value) { boolean found = false; for (JSONObject responses : this.filteredCalls) { if (responses.has("ResponseHeaders") && - !responses.getString("ResponseHeaders").toLowerCase() - .contains(Value.toLowerCase())) { + !responses.getString("ResponseHeaders").toLowerCase() + .contains(Value.toLowerCase())) { if (Configuration.useAllure) { Allure.addAttachment( - "Assert Headers", - "The headers should contain '" + - Header + - "' Equal to '" + - Value + - " but is: \n " + - responses.getString("ResponseHeaders") + - "\n Response: \n" + - responses + "Assert Headers", + "The headers should contain '" + + Header + + "' Equal to '" + + Value + + " but is: \n " + + responses.getString("ResponseHeaders") + + "\n Response: \n" + + responses ); } throw new TestUIException( - "The headers should contain '" + - Header + - "' Equal to '" + - Value + - " but is: \n " + - responses.getString("ResponseHeaders") + - "\n Response: \n" + - responses + "The headers should contain '" + + Header + + "' Equal to '" + + Value + + " but is: \n " + + responses.getString("ResponseHeaders") + + "\n Response: \n" + + responses ); } else if (responses.has("ResponseHeaders") && - responses.getString("ResponseHeaders").contains(Value)) { + responses.getString("ResponseHeaders").contains(Value)) { found = true; } } if (!found) { throw new TestUIException( - "There were no calls with those response headers: '" + - Header + - "' equal to '" + - Value + "'" + "There were no calls with those response headers: '" + + Header + + "' equal to '" + + Value + "'" ); } return new BrowserLogs(this.calls, this.filteredCalls, this.callHar, this.severalFilters); From 2f546ef77b9cebfe38fea2c8be7064c8f821b434 Mon Sep 17 00:00:00 2001 From: Alekss Litvinovs Date: Tue, 17 Jan 2023 13:57:27 +0200 Subject: [PATCH 4/4] Comment out lint CI job --- .github/workflows/ci.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ac8de3..813a1de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ macos-latest, windows-latest, ubuntu-latest ] - java: [ '8', '11', '17' ] + os: [macos-latest, windows-latest, ubuntu-latest] + java: ["8", "11", "17"] steps: - uses: actions/checkout@v3 @@ -24,18 +24,18 @@ jobs: uses: actions/setup-java@v2 with: java-version: ${{ matrix.java }} - distribution: 'zulu' + distribution: "zulu" - name: Build with Maven run: mvn compile - - lint: - runs-on: ubuntu-latest - continue-on-error: true - - steps: - - uses: actions/checkout@v3 - - run: cat .github/super-linter.env >> "$GITHUB_ENV" - - name: Lint with Checkstyle - uses: github/super-linter@v4 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# TODO: Uncomment once all code is formatted +# lint: +# runs-on: ubuntu-latest +# continue-on-error: true +# +# steps: +# - uses: actions/checkout@v3 +# - run: cat .github/super-linter.env >> "$GITHUB_ENV" +# - name: Lint with Checkstyle +# uses: github/super-linter@v4 +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}