Merge branch 'master' into task/g381_repositoryInterfacesAndFactory

Author: fboucquez

src/infrastructure/Listener.ts

@@ -108,11 +108,8 @@ export class Listener implements IListener {
                     this.webSocket = new WebSocket(this.url);
                 }
                 this.webSocket.onopen = () => {
-                    console.log('connection open');
                 };
                 this.webSocket.onerror = (err) => {
-                    console.log('WebSocket Error ');
-                    console.log(err);
                     reject(err);
                 };
                 this.webSocket.onmessage = (msg) => {

src/model/UInt64.ts

@@ -147,4 +147,37 @@ export class UInt64 {
         const long_b = Long.fromBits(other.lower, other.higher, true);
         return long_a.compare(long_b);
     }
+
+    /**
+     * UInt64 add operation
+     * @param other
+     * @returns {UInt64}
+     */
+    public add(other: UInt64): UInt64 {
+        const long_value = Long.fromBits(this.lower, this.higher, true);
+        const long_b = Long.fromBits(other.lower, other.higher, true);
+        return this.longToUint64(long_value.add(long_b));
+    }
+
+    /**
+     * UInt64 add operation
+     * @param other
+     * @returns {UInt64}
+     */
+    public subtract(other: UInt64): UInt64 {
+        const long_value = Long.fromBits(this.lower, this.higher, true);
+        const long_b = Long.fromBits(other.lower, other.higher, true);
+        if (long_value.compare(long_b) < 0) {
+            throw new Error('Unsigned substraction result cannot be negative.');
+        }
+        return this.longToUint64(long_value.subtract(long_b));
+    }
+
+    /**
+     * Convert long value to UInt64
+     * @param longValue long value
+     */
+    private longToUint64(longValue: Long): UInt64 {
+        return new UInt64([longValue.getLowBitsUnsigned(), longValue.getHighBitsUnsigned()]);
+    }
 }

test/model/UInt64.spec.ts

@@ -185,4 +185,41 @@ describe('Uint64', () => {
             expect(result).to.be.true;
         });
     });
+
+    describe('Operation', () => {
+        it('should return added value', () => {
+            const value = UInt64.fromUint(100);
+            const other = UInt64.fromUint(1);
+            const result = value.add(other);
+            expect(result.compact()).to.be.equal(101);
+        });
+        it('should return added value', () => {
+            const value = UInt64.fromUint(0);
+            const other = UInt64.fromUint(0);
+            const result = value.add(other);
+            expect(result.compact()).to.be.equal(0);
+        });
+
+        it('should return substract value', () => {
+            const value = UInt64.fromUint(100);
+            const other = UInt64.fromUint(1);
+            const result = value.subtract(other);
+            expect(result.compact()).to.be.equal(99);
+        });
+
+        it('should return substract value', () => {
+            const value = UInt64.fromUint(1);
+            const other = UInt64.fromUint(1);
+            const result = value.subtract(other);
+            expect(result.compact()).to.be.equal(0);
+        });
+
+        it('should return substract value', () => {
+            const value = UInt64.fromUint(100);
+            const other = UInt64.fromUint(1);
+            expect(() => {
+                other.subtract(value);
+            }).to.throw(Error, 'Unsigned substraction result cannot be negative.');
+        });
+    });
 });