chore: improve code coverage and remove unused code

node-opcua · Jun 5, 2023 · a8ef721 · a8ef721
1 parent b96cec0
commit a8ef721
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 20 deletions.
diff --git a/packages/node-opcua-address-space/source/helpers/ensure_secure_access.ts b/packages/node-opcua-address-space/source/helpers/ensure_secure_access.ts
@@ -10,24 +10,6 @@ function isChannelSecure(channel: IChannelBase): boolean {
     return false;
 }
 
-function newIsUserReadable(this: BaseNode, context: ISessionContext): boolean {
-    if (context) {
-        if (!context.session) {
-            // console.log(" context has no session", context);
-            return false;
-        }
-        if (!context.session.channel) {
-            // console.log(" context has no channel", context);
-            return false;
-        }
-        if (!isChannelSecure(context.session.channel)) {
-            return false;
-        }
-        return true;
-    }
-    return false;
-}
-
 /**
  * make sure that the given ia node can only be read
  * by Administrator user on a encrypted channel
@@ -57,7 +39,6 @@ const restrictedAccessFlag = makeAccessRestrictionsFlag("SigningRequired | Encry
 export function ensureObjectIsSecure(node: BaseNode): void {
     node.setAccessRestrictions(restrictedAccessFlag);
     if (node.nodeClass === NodeClass.Variable) {
-        // replaceMethod(node, "isUserReadable", newIsUserReadable);
         const variable = node as UAVariable;
         variable.setRolePermissions(restrictedPermissions);
     }

diff --git a/packages/node-opcua-address-space/test/test_address_space_dispose.ts b/packages/node-opcua-address-space/test/test_address_space_dispose.ts
@@ -1,7 +1,7 @@
 // tslint:disable:no-console
 import * as fs from "fs";
 import * as path from "path";
-import should from "should";
+import "should";
 
 import { AddressSpace } from "..";
 import { generateAddressSpace } from "../nodeJS";

diff --git a/packages/node-opcua-end2end-test/test/end_to_end/test_umbrella_e2e_seriesA.js b/packages/node-opcua-end2end-test/test/end_to_end/test_umbrella_e2e_seriesA.js
@@ -27,4 +27,5 @@ describe("testing Client - Umbrella-A ", function () {
     require("./u_test_e2e_call_service")(test);
     require("./u_test_e2e_ClientSession_readVariableValue")(test);
     require("./u_test_e2e_client_node_crawler")(test);
+    require("./u_test_e2e_ read_history_server_capabilities").t(test);
 });
diff --git a/...s/node-opcua-end2end-test/test/end_to_end/u_test_e2e_ read_history_server_capabilities.ts b/...s/node-opcua-end2end-test/test/end_to_end/u_test_e2e_ read_history_server_capabilities.ts
@@ -0,0 +1,39 @@
+import should from "should";
+import { OPCUAClient, readHistoryServerCapabilities } from "node-opcua-client";
+export function t(test: any) {
+    describe("ReadHistoryServerCapabilities", function () {
+        it("should read history server capabilities", async () => {
+            const client = OPCUAClient.create({});
+            await client.withSessionAsync(test.endpointUrl, async (session) => {
+                const cap = await readHistoryServerCapabilities(session);
+
+                console.log(cap);
+
+                cap.accessHistoryDataCapability.value.should.eql(false);
+                cap.accessHistoryEventsCapability.value.should.eql(false);
+
+                cap.maxReturnDataValues.value.should.eql(0);
+                cap.maxReturnEventValues.value.should.eql(0);
+
+                cap.deleteAtTimeCapability.value.should.eql(false);
+                cap.deleteRawCapability.value.should.eql(false);
+                cap.deleteEventCapability.value.should.eql(false);
+                //        cap.deleteAnnotationCapability.value.should.eql(false);
+
+                cap.insertAnnotationCapability.value.should.eql(false);
+                cap.insertDataCapability.value.should.eql(false);
+                cap.insertEventCapability.value.should.eql(false);
+
+                cap.replaceDataCapability.value.should.eql(false);
+                cap.replaceEventCapability.value.should.eql(false);
+                //        cap.replaceAnnotationCapability.should.eql(false);
+
+                cap.updateEventCapability.value.should.eql(false);
+                cap.updateDataCapability.value.should.eql(false);
+                //   cap.updateAnnotationCapability.should.eql(false);
+
+                should(cap["aggregateFunctions/AnnotationCount"].value).eql(null);
+            });
+        });
+    });
+}