Added more EPath Symbol segment unit tests

Author: jmmoser

TASKS.md

@@ -3,9 +3,7 @@
   - [X] EIP passes down port 44818 to TCP layer
   - [X] modbus passes down port 502 to TCP layer
 - [ ] Logix5000
-  - [ ] fix or ensure boolean decoding is working
-  - [ ] understand the difference between direct requests, Connection Manager Unconnected Send messages, Connected messages, and how routes to eni/controller
-  - [ ] use UCMM to get identity and verify device type is programmable logic controller OR fix path routing
+  - [x] fix or ensure boolean decoding is working
   - [X] fix reading symbol structures
   - [X] getTagSymbolInstanceID and _highestListedSymbolInstanceID need to be scoped (global scope vs program scope)
   - [X] When Program data type is read, read all symbols contained
@@ -18,6 +16,8 @@
   - [X] Decide if reading an array should return all values or just the first, if all values then fix
   - [ ] Figure out how to read multidimensional arrays (CIP Vol 1, Table C-5.20)
 - [ ] CIP
+  - [ ] understand the difference between direct requests, Connection Manager Unconnected Send messages, Connected messages, and how routes to eni/controller
+  - [ ] use UCMM to get identity and verify device type is programmable logic controller OR fix path routing
   - [ ] Finish Data Segment
   - [ ] Encoding for Symbolic Segment
   - [X] Cleanup unused EPath code

src/layers/cip/EPath/segments/symbolic.js

@@ -293,12 +293,12 @@ function validate(value, extendedFormat, extendedSize) {
             }
             break;
           default:
-            break;
+            throw new Error(`Invalid extended size`);
         }
         break;
       }
       default:
-        break;
+        throw new Error('Invalid extended format');
     }
   }
 }

tests/cip.epath.symbolic.test.js

@@ -32,6 +32,11 @@ describe('Symbolic Numeric', () => {
     expect(new Symbolic.Numeric(65536).encode()).toEqual(Buffer.from([0x60, 0xC8, 0x00, 0x00, 0x01, 0x00]));
   });
 
+  test('Encode Invalid', () => {
+    expect(() => new Symbolic.Numeric(0xFFFFFFFFF)).toThrow();
+    expect(() => new Symbolic.Numeric(-1)).toThrow();
+  });
+
   test('Decode 8-bit', () => {
     expect(EPath.Decode(Buffer.from([0x60, 0xC6, 0x05]), 0, true, false, segments => {
       expect(segments).toEqual([new Symbolic.Numeric(5)]);
@@ -47,4 +52,30 @@ describe('Symbolic Numeric', () => {
       expect(segments).toEqual([new Symbolic.Numeric(65536)]);
     })).toBe(6);
   });
+});
+
+
+describe('Symbolic Double Byte Characters', () => {
+  test('Encode', () => {
+    expect(new Symbolic.Double(Buffer.from([0x12, 0x34, 0x23, 0x45])).encode()).toEqual(Buffer.from([0x60, 0x22, 0x12, 0x34, 0x23, 0x45]));
+  });
+
+  test('Decode', () => {
+    expect(EPath.Decode(Buffer.from([0x60, 0x22, 0x12, 0x34, 0x23, 0x45]), 0, true, false, segments => {
+      expect(segments).toEqual([new Symbolic.Double(Buffer.from([0x12, 0x34, 0x23, 0x45]))]);
+    })).toBe(6);
+  });
+});
+
+
+describe('Symbolic Triple Byte Characters', () => {
+  test('Encode', () => {
+    expect(new Symbolic.Triple(Buffer.from([0x12, 0x34, 0x56, 0x23, 0x45, 0x67])).encode()).toEqual(Buffer.from([0x60, 0x42, 0x12, 0x34, 0x56, 0x23, 0x45, 0x67]));
+  });
+
+  test('Decode', () => {
+    expect(EPath.Decode(Buffer.from([0x60, 0x42, 0x12, 0x34, 0x56, 0x23, 0x45, 0x67]), 0, true, false, segments => {
+      expect(segments).toEqual([new Symbolic.Triple(Buffer.from([0x12, 0x34, 0x56, 0x23, 0x45, 0x67]))]);
+    })).toBe(8);
+  });
 });