HPCC4J-618 WIP Add WsECL testsuite #719

rpastrana · 2024-06-28T16:38:41Z

Adds WsECL test suite
Adds published query setup logic
Adds simple ECL query file
Adds wsdl, xsd, req, resp request logic
Changes Utils.connection to allow post init changs of conn

Type of change:

This change is a bug fix (non-breaking change which fixes an issue).
This change is a new feature (non-breaking change which adds functionality).
This change is a breaking change (fix or feature that will cause existing behavior to change).

Checklist:

Testing:

rpastrana · 2024-06-28T16:43:10Z

@asselitx please take a look at this work in progress.
Ive added all the scaffolding and base logic I believe we need.
I will leave the response verification to you if that's ok.
Let's discuss offline. Thanks.

rpastrana · 2024-06-28T16:45:08Z

wsclient/src/main/java/org/hpccsystems/ws/client/utils/Connection.java

@@ -486,12 +486,27 @@ private void setProtocol(String protocol_)
     * @param port_
     *            the new port
     */
-    private void setPort(String port_)
+    public void setPort(String port_)


@jpmcmu I'm making this change so we can copy the wseclwatch connection, and simply edit the port to the wsecl port.
I'm not sure if we'd be better off creating a brand new connection based off of the eclwatch connection

@asselitx ignore this change

- Adds WsECL test suite - Adds published query setup logic - Adds simple ECL query file - Adds wsdl, xsd, req, resp request logic - Changes Utils.connection to allow post init changs of conn Signed-off-by: Rodrigo Pastrana <[email protected]>

github-actions · 2024-06-28T16:46:42Z

Jira Issue: https://hpccsystems.atlassian.net/browse/HPCC4J-618

Jirabot Action Result:
Workflow Transition: Merge Pending
Updated PR

rpastrana · 2024-06-28T16:47:42Z

wsclient/src/test/java/org/hpccsystems/ws/client/WSECLTests.java

@@ -0,0 +1,181 @@
+/*##############################################################################


@asselitx this is the wsecl test suite, any wsecl related tests would be hosted here

rpastrana · 2024-06-28T16:48:59Z

wsclient/src/test/java/org/hpccsystems/ws/client/WSECLTests.java

+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+public class WSECLTests extends BaseRemoteTest


BaseRemoteTests initializes wseclwatch connection, based on optional env vars

rpastrana · 2024-06-28T16:49:50Z

wsclient/src/test/java/org/hpccsystems/ws/client/WSECLTests.java

+    @BeforeClass
+    public static void setup() throws Exception
+    {
+        wswuclient = wsclient.getWsWorkunitsClient(); //for publishing queries


this method runs before the tests.
Here we try to publish an ecl query, then confirm it was actually published, and setup the wsecl connection

rpastrana · 2024-06-28T16:50:22Z

wsclient/src/test/java/org/hpccsystems/ws/client/WSECLTests.java

+    @Test
+    public void testWsECLGetWSDL()
+    {
+        assumeTrue("WsECL connection not available", wseclConn != null);


We ignore the test if any of these conditions fail

Might there be a way to common-up these 'assumeTrue' pre-checks, or always run one test with them first that all other tests are contingent upon? After finishing the review, this might not be as important as I thought. It looks like I won't be creating multiple new functions that need to follow the same pattern, rather filling in the meat of these four here.

Ofcourse, we can create a new method with all necessary prereq tests and manually call it directly before each test, or simply annotate it as
"BeforeEach":

https://stackoverflow.com/questions/63819472/how-can-i-use-the-beforeeach-method-for-testing-in-java

rpastrana · 2024-06-28T16:50:59Z

wsclient/src/test/java/org/hpccsystems/ws/client/WSECLTests.java

+        {
+            String wsdlURI = "/WsEcl/definitions/query/" + thorclustername + "/" + eclScriptName + "/main/" + eclScriptName + ".wsdl";
+
+            String wsdlResponse = wseclConn.sendGetRequest(wsdlURI);


simple http get request based on the wsecl connection setup above, and the target URI constructed here.

rpastrana · 2024-06-28T16:51:44Z

wsclient/src/test/java/org/hpccsystems/ws/client/WSECLTests.java

+            String wsdlResponse = wseclConn.sendGetRequest(wsdlURI);
+            Assert.assertNotNull("Unexpected Null response", wsdlResponse);
+            //TODO determine good way to confirm success/failure
+            //Assert.assertArrayEquals(expectedWsdlResponse, wsdlResponse)


we can add expected responses under tests/resources and compare here

rpastrana · 2024-06-28T16:52:31Z

wsclient/src/test/resources/RoxieEchoPersonInfo.ecl

@@ -0,0 +1,3 @@
+import $.esdl_example;


abandoning this ecl query since it requires esdl_example, opting for the simple ecl query below

rpastrana · 2024-06-28T16:53:13Z

wsclient/src/test/resources/SimpleFunction.ecl

@@ -0,0 +1,19 @@
+MyFunc(STRING DataIn, STRING1 SearchChar) := FUNCTION


if the content of the query matters, we can figure out how to publish RoxieEchoPersonInfo instead.

asselitx

Hey Rodrigo this all looks nicely set up, thanks! Take my comments as starting points for our call when I return.

asselitx · 2024-07-19T21:38:32Z

wsclient/src/test/java/org/hpccsystems/ws/client/WSECLTests.java

+             WorkunitWrapper wu = new WorkunitWrapper();
+             wu.setECL(ecl);
+             wu.setJobname(eclScriptName);
+             wu.setCluster(thorclustername);


My experience has been with queries deployed to roxies, so this question may be naive. Are we able to test all the sample XML, XSD and WSDL features by targeting thor? I may need a quick explanation or pointer to relevant docs explaining how thor handles soap features if its different from roxie.

The current assumption is that the target engine doesn't affect the presence/absence of the wsecl features for req/resp/xsd/wsdl. But targeting thor is not necessary, it was just convenient. We can target Roxie if preferred/necessary but you'll need to target a configurable (or discoverable) roxie name.

asselitx · 2024-07-19T21:42:23Z

wsclient/src/test/java/org/hpccsystems/ws/client/WSECLTests.java

+    @Test
+    public void testWsECLGetWSDL()
+    {
+        assumeTrue("WsECL connection not available", wseclConn != null);


Might there be a way to common-up these 'assumeTrue' pre-checks, or always run one test with them first that all other tests are contingent upon? After finishing the review, this might not be as important as I thought. It looks like I won't be creating multiple new functions that need to follow the same pattern, rather filling in the meat of these four here.

rpastrana requested a review from asselitx June 28, 2024 16:41

rpastrana commented Jun 28, 2024

View reviewed changes

HPCC4J-618 WIP Add WsECL testsuite

4768ca4

- Adds WsECL test suite - Adds published query setup logic - Adds simple ECL query file - Adds wsdl, xsd, req, resp request logic - Changes Utils.connection to allow post init changs of conn Signed-off-by: Rodrigo Pastrana <[email protected]>

rpastrana force-pushed the HPCC4J618-wsecltests branch from 32cd624 to 4768ca4 Compare June 28, 2024 16:46

rpastrana commented Jun 28, 2024

View reviewed changes

asselitx reviewed Jul 19, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

HPCC4J-618 WIP Add WsECL testsuite #719

HPCC4J-618 WIP Add WsECL testsuite #719

rpastrana commented Jun 28, 2024

rpastrana commented Jun 28, 2024

rpastrana Jun 28, 2024

github-actions bot commented Jun 28, 2024

rpastrana Jun 28, 2024

rpastrana Jun 28, 2024

rpastrana Jun 28, 2024

rpastrana Jun 28, 2024

asselitx Jul 19, 2024 •

edited

Loading

rpastrana Jul 22, 2024

rpastrana Jun 28, 2024

rpastrana Jun 28, 2024

rpastrana Jun 28, 2024

rpastrana Jun 28, 2024

asselitx left a comment

asselitx Jul 19, 2024

rpastrana Jul 22, 2024

asselitx Jul 19, 2024 •

edited

Loading

		@@ -0,0 +1,181 @@
		/*##############################################################################

		@@ -0,0 +1,19 @@
		MyFunc(STRING DataIn, STRING1 SearchChar) := FUNCTION

HPCC4J-618 WIP Add WsECL testsuite #719

Are you sure you want to change the base?

HPCC4J-618 WIP Add WsECL testsuite #719

Conversation

rpastrana commented Jun 28, 2024

Type of change:

Checklist:

Testing:

rpastrana commented Jun 28, 2024

Choose a reason for hiding this comment

github-actions bot commented Jun 28, 2024

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

asselitx Jul 19, 2024 • edited Loading

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

asselitx left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

asselitx Jul 19, 2024 • edited Loading

Choose a reason for hiding this comment

asselitx Jul 19, 2024 •

edited

Loading

asselitx Jul 19, 2024 •

edited

Loading