tests: adapt new form rules

Author: egekorkan

packages/binding-modbus/src/modbus-client.ts

@@ -212,10 +212,14 @@ export default class ModbusClient implements ProtocolClient {
         return endianness;
     }
 
-    private overrideFormFromURLPath(input: ModbusForm) {
+    // This generates a form with url content based on the uri scheme
+    // Ideally, more code should be refactored to use uri only
+    private generateFormFromURLPath(input: ModbusForm) {
         const { pathname, searchParams: query } = new URL(input.href);
         const pathComp = pathname.split("/");
-
+        if ((pathComp.length < 3) || pathComp[1] ==='' || pathComp[2]==='') {
+            throw new Error("Malformed href: unitID and address must be defined");
+        }
         input["modv:unitID"] = parseInt(pathComp[1], 10);
         input["modv:address"] = parseInt(pathComp[2], 10);
 
@@ -243,7 +247,7 @@ export default class ModbusClient implements ProtocolClient {
         const mode = contentLength > 0 ? "w" : "r";
 
         // Use form values if provided, otherwise use form values (we are more merciful then the spec for retro-compatibility)
-        this.overrideFormFromURLPath(form);
+        this.generateFormFromURLPath(form);
 
         // take over latest content of form into a new result set
         const result: ModbusForm = { ...form };

packages/binding-modbus/test/modbus-client-test.ts

@@ -269,7 +269,6 @@ describe("Modbus client test", () => {
         it("should throw exception for unknown function", () => {
             const form: ModbusForm = {
                 href: "modbus+tcp://127.0.0.1:8502/1/0?quantity=3",
-                // @ts-expect-error since unknown function
                 "modv:function": 255,
             };
 
@@ -286,7 +285,18 @@ describe("Modbus client test", () => {
 
             const promise = client.readResource(form);
 
-            return promise.should.eventually.rejectedWith("Malformed form: address must be defined");
+            return promise.should.eventually.rejectedWith("Malformed href: unitID and address must be defined");
+        });
+
+        it("should throw exception for missing unitID", () => {
+            const form: ModbusForm = {
+                href: "modbus+tcp://127.0.0.1:8502",
+                "modv:function": 1,
+            };
+
+            const promise = client.readResource(form);
+
+            return promise.should.eventually.rejectedWith("Malformed href: unitID and address must be defined");
         });
     });