[plugin-web-app-to-rest-api] Add XPath support for resource validatio… #4683

uarlouski · 2023-12-21T11:25:45Z

…n steps

github-actions · 2023-12-21T11:30:24Z

Qodana Community for JVM

It seems all right 👌

No new problems were found according to the checks applied

💡 Qodana analysis was run in the pull request mode: only the changed files were checked
☁️ View the detailed Qodana report

Contact Qodana team

Contact us at qodana-support@jetbrains.com

Or via our issue tracker: https://jb.gg/qodana-issue
Or share your feedback: https://jb.gg/qodana-discussions

codecov · 2023-12-21T11:45:17Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (505c96f) 97.40% compared to head (e1787af) 97.39%.
Report is 1 commits behind head on master.

Additional details and impacted files

@@             Coverage Diff              @@
##             master    #4683      +/-   ##
============================================
- Coverage     97.40%   97.39%   -0.02%     
+ Complexity     6801     6797       -4     
============================================
  Files           917      916       -1     
  Lines         18876    18872       -4     
  Branches       1254     1254              
============================================
- Hits          18387    18381       -6     
- Misses          383      384       +1     
- Partials        106      107       +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

valfirst · 2023-12-29T07:16:21Z

vividus-plugin-html/src/main/java/org/vividus/util/HtmlUtils.java

+            return getElements(baseUri, html, d -> d.select(locator));
+        }
+        return getElements(baseUri, html, d -> d.selectXpath(locator));


Function should be moved to HtmlLocatorType

valfirst · 2023-12-29T07:18:12Z

...ugin-web-app-to-rest-api/src/main/java/org/vividus/steps/integration/ResourceCheckSteps.java

@@ -278,16 +280,17 @@ private static boolean isNotAbsolute(URI uri)
     *         c. If GET status code acceptable than check considered as passed otherwise failed;
     * <b>Example:</b>
     * <pre>
-     * Then all resources by selector a are valid on:
+     * Then all resources found by css selector `a` are valid on:


Suggested change

* Then all resources found by css selector `a` are valid on:

* Then all resources found by CSS selector `a` are valid on:

valfirst · 2023-12-29T07:18:27Z

vividus-plugin-web-app-to-rest-api/src/main/resources/steps/defaults/composite.steps

@@ -0,0 +1,8 @@
+Composite: Then all resources by selector `$cssSelector` from $html are valid
+!-- DEPRECATED: 0.7.0, Then all resources found by $locatorType `$locator` in $html are valid
+Then all resources found by css selector `<cssSelector>` in <html> are valid


Suggested change

Then all resources found by css selector `<cssSelector>` in <html> are valid

Then all resources found by CSS selector `<cssSelector>` in <html> are valid

valfirst · 2023-12-29T07:18:47Z

vividus-plugin-web-app-to-rest-api/src/main/resources/steps/defaults/composite.steps

+
+Composite: Then all resources by selector `$cssSelector` are valid on:$pages
+!-- DEPRECATED: 0.7.0, Then all resources found by $locatorType `$locator` are valid on:$pages
+Then all resources found by css selector `<cssSelector>` are valid on:<pages>


Suggested change

Then all resources found by css selector `<cssSelector>` are valid on:<pages>

Then all resources found by CSS selector `<cssSelector>` are valid on:<pages>

valfirst · 2023-12-29T07:19:49Z

vividus-plugin-web-app-to-rest-api/src/main/resources/steps/defaults/composite.steps

@@ -0,0 +1,8 @@
+Composite: Then all resources by selector `$cssSelector` from $html are valid
+!-- DEPRECATED: 0.7.0, Then all resources found by $locatorType `$locator` in $html are valid


it's not a valid replacement pattern

valfirst · 2023-12-29T07:19:55Z

vividus-plugin-web-app-to-rest-api/src/main/resources/steps/defaults/composite.steps

+
+
+Composite: Then all resources by selector `$cssSelector` are valid on:$pages
+!-- DEPRECATED: 0.7.0, Then all resources found by $locatorType `$locator` are valid on:$pages


it's not a valid replacement pattern

valfirst · 2023-12-29T10:08:46Z

vividus-plugin-html/src/main/java/org/vividus/html/HtmlLocatorType.java

+    public abstract Elements locate(String baseUri, String html, String locator);
+
+    public Elements locate(String html, String locator)
+    {
+        return locate("", html, locator);
+    }


Suggested change

public abstract Elements locate(String baseUri, String html, String locator);

public Elements locate(String html, String locator)

{

return locate("", html, locator);

}

public abstract Elements findElements(String baseUri, String html, String locator);

public Elements findElements(String html, String locator)

{

return findElements("", html, locator);

}

valfirst · 2023-12-29T10:10:01Z

vividus-plugin-html/src/test/java/org/vividus/html/LocatorTypeTests.java

+            Document document = mock(Document.class);
+            Elements elements = mock(Elements.class);


Suggested change

Document document = mock(Document.class);

Elements elements = mock(Elements.class);

Document document = mock();

Elements elements = mock();

valfirst · 2023-12-29T16:09:43Z

vividus-plugin-html/src/main/java/org/vividus/html/HtmlLocatorType.java

+        this.description = description;
+    }
+
+    public abstract Elements findElements(String baseUri, String html, String locator);


Suggested change

public abstract Elements findElements(String baseUri, String html, String locator);

protected abstract Elements findElements(Document htmlDocument, String locator);

@Override

public Elements findElements(String baseUri, String html, String locator)

{

return findElements(Jsoup.parse(html, baseUri), locator);

}

or use Function as a field

valfirst · 2023-12-29T16:10:43Z

vividus-plugin-web-app-to-rest-api/src/main/resources/steps/defaults/composite.steps

@@ -0,0 +1,8 @@
+Composite: Then all resources by selector `$cssSelector` from $html are valid
+!-- DEPRECATED: 0.7.0, Then all resources found by $htmlLocatorType `$htmlLocator` in $html are valid


it's not a valid replacement pattern

valfirst · 2023-12-29T16:10:44Z

vividus-plugin-web-app-to-rest-api/src/main/resources/steps/defaults/composite.steps

+
+
+Composite: Then all resources by selector `$cssSelector` are valid on:$pages
+!-- DEPRECATED: 0.7.0, Then all resources found by $htmlLocatorType `$htmlLocator` are valid on:$pages


it's not a valid replacement pattern

…n steps

sonarqubecloud · 2024-01-01T15:38:02Z

Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

uarlouski requested a review from a team as a code owner December 21, 2023 11:25

uarlouski requested review from valfirst, vkepin and ikalinin1 December 21, 2023 11:25

uarlouski force-pushed the feature/add-xpath-for-resource-steps branch from dbff6bf to d572ad6 Compare December 21, 2023 12:00

uarlouski force-pushed the feature/add-xpath-for-resource-steps branch from d572ad6 to 6a57cf3 Compare December 28, 2023 14:48

valfirst requested changes Dec 29, 2023

View reviewed changes

uarlouski requested a review from valfirst December 29, 2023 10:02

valfirst reviewed Dec 29, 2023

View reviewed changes

ikalinin1 approved these changes Dec 29, 2023

View reviewed changes

uarlouski requested a review from valfirst December 29, 2023 13:57

valfirst reviewed Dec 29, 2023

View reviewed changes

uarlouski added 6 commits January 1, 2024 16:04

[plugin-web-app-to-rest-api] Add XPath support for resource validatio…

bc15d30

…n steps

renames

a6aa608

fixes

60f66fa

fixes

d6ef8eb

pattern fix

7318479

minor

081a0de

uarlouski force-pushed the feature/add-xpath-for-resource-steps branch from 3c901f6 to db4a30c Compare January 1, 2024 14:05

minor

e1787af

uarlouski force-pushed the feature/add-xpath-for-resource-steps branch from db4a30c to e1787af Compare January 1, 2024 15:33

valfirst approved these changes Jan 2, 2024

View reviewed changes

valfirst merged commit 5bee812 into master Jan 2, 2024
8 of 9 checks passed

valfirst deleted the feature/add-xpath-for-resource-steps branch January 2, 2024 06:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[plugin-web-app-to-rest-api] Add XPath support for resource validatio… #4683

[plugin-web-app-to-rest-api] Add XPath support for resource validatio… #4683

uarlouski commented Dec 21, 2023

github-actions bot commented Dec 21, 2023 •

edited

Loading

codecov bot commented Dec 21, 2023 •

edited

Loading

valfirst Dec 29, 2023

valfirst Dec 29, 2023

valfirst Dec 29, 2023

valfirst Dec 29, 2023

valfirst Dec 29, 2023

valfirst Dec 29, 2023

valfirst Dec 29, 2023

valfirst Dec 29, 2023

valfirst Dec 29, 2023

valfirst Dec 29, 2023

valfirst Dec 29, 2023

sonarqubecloud bot commented Jan 1, 2024

	* Then all resources found by css selector `a` are valid on:
	* Then all resources found by CSS selector `a` are valid on:

	Then all resources found by css selector `<cssSelector>` in <html> are valid
	Then all resources found by CSS selector `<cssSelector>` in <html> are valid

		@@ -0,0 +1,8 @@
		Composite: Then all resources by selector `$cssSelector` from $html are valid
		!-- DEPRECATED: 0.7.0, Then all resources found by $locatorType `$locator` in $html are valid

		Document document = mock(Document.class);
		Elements elements = mock(Elements.class);

-    public abstract Elements findElements(String baseUri, String html, String locator);
+    protected abstract Elements findElements(Document htmlDocument, String locator);
+    @Override
+    public Elements findElements(String baseUri, String html, String locator)
+    {
+        return findElements(Jsoup.parse(html, baseUri), locator);
+    }

[plugin-web-app-to-rest-api] Add XPath support for resource validatio… #4683

[plugin-web-app-to-rest-api] Add XPath support for resource validatio… #4683

Conversation

uarlouski commented Dec 21, 2023

github-actions bot commented Dec 21, 2023 • edited Loading

Qodana Community for JVM

codecov bot commented Dec 21, 2023 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Jan 1, 2024

Quality Gate passed

github-actions bot commented Dec 21, 2023 •

edited

Loading

codecov bot commented Dec 21, 2023 •

edited

Loading