Move couple tests to ES6 and dummy channel to test scope

Author: lutovich

src/v1/internal/ch-dummy.js renamed to test/internal/ch-dummy.js

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import {CombinedBuffer} from './buf';
+import {CombinedBuffer} from '../../src/v1/internal/buf';
 
 const observer = {
   instance: null,

test/internal/chunking.test.js

@@ -17,17 +17,18 @@
  * limitations under the License.
  */
 
-var Chunker = require('../../lib/v1/internal/chunking').Chunker;
-var Dechunker = require('../../lib/v1/internal/chunking').Dechunker;
-var alloc = require('../../lib/v1/internal/buf').alloc;
-var CombinedBuffer = require('../../lib/v1/internal/buf').CombinedBuffer;
-var DummyChannel = require('../../lib/v1/internal/ch-dummy.js').channel;
-
-describe('Chunker', function() {
-  it('should chunk simple data', function() {
+import {Chunker, Dechunker} from '../../src/v1/internal/chunking';
+import {alloc} from '../../src/v1/internal/buf';
+import {channel} from './ch-dummy';
+
+const DummyChannel = channel;
+
+describe('Chunker', () => {
+
+  it('should chunk simple data', () => {
     // Given
-    var ch = new DummyChannel();
-    var chunker = new Chunker(ch);
+    const ch = new DummyChannel();
+    const chunker = new Chunker(ch);
 
     // When
     chunker.writeInt32(1);
@@ -37,10 +38,11 @@ describe('Chunker', function() {
     // Then
     expect(ch.toHex()).toBe('00 08 00 00 00 01 00 00 00 02');
   });
-  it('should chunk blobs larger than the output buffer', function() {
+
+  it('should chunk blobs larger than the output buffer', () => {
     // Given
-    var ch = new DummyChannel();
-    var chunker = new Chunker(ch, 4);
+    const ch = new DummyChannel();
+    const chunker = new Chunker(ch, 4);
 
     // When
     chunker.writeBytes(bytes( 1,2,3,4,5,6 ));
@@ -49,10 +51,11 @@ describe('Chunker', function() {
     // Then
     expect(ch.toHex()).toBe('00 02 01 02 00 02 03 04 00 02 05 06');
   });
-  it('should include message boundaries', function() {
+
+  it('should include message boundaries', () => {
     // Given
-    var ch = new DummyChannel();
-    var chunker = new Chunker(ch);
+    const ch = new DummyChannel();
+    const chunker = new Chunker(ch);
 
     // When
     chunker.writeInt32(1);
@@ -65,13 +68,16 @@ describe('Chunker', function() {
   });
 });
 
-describe('Dechunker', function() {
-  it('should unchunk a simple message', function() {
+describe('Dechunker', () => {
+
+  it('should unchunk a simple message', () => {
     // Given
-    var messages = [];
-    var dechunker = new Dechunker();
-    var chunker = new Chunker(dechunker);
-    dechunker.onmessage = function(buffer) { messages.push(buffer); };
+    const messages = [];
+    const dechunker = new Dechunker();
+    const chunker = new Chunker(dechunker);
+    dechunker.onmessage = buffer => {
+      messages.push(buffer);
+    };
 
     // When
     chunker.writeInt16(1);
@@ -86,10 +92,10 @@ describe('Dechunker', function() {
     expect(messages[0].toHex()).toBe('00 01 00 02 00 03');
   });
 
-  it('should handle message split at any point', function() {
+  it('should handle message split at any point', () => {
     // Given
-    var ch = new DummyChannel();
-    var chunker = new Chunker(ch);
+    const ch = new DummyChannel();
+    const chunker = new Chunker(ch);
 
     // And given the following message
     chunker.writeInt8(1);
@@ -100,31 +106,33 @@ describe('Dechunker', function() {
     chunker.messageBoundary();
     chunker.flush();
 
-    var chunked = ch.toBuffer();
+    const chunked = ch.toBuffer();
 
     // When I try splitting this chunked data at every possible position
     // into two separate buffers, and send those to the dechunker
-    for (var i = 1; i < chunked.length; i++) {
-      var slice1 = chunked.getSlice( 0, i );
-      var slice2 = chunked.getSlice( i, chunked.length - i );
+    for (let i = 1; i < chunked.length; i++) {
+      const slice1 = chunked.getSlice(0, i);
+      const slice2 = chunked.getSlice(i, chunked.length - i);
 
       // Dechunk the slices
-      var messages = [];
-      var dechunker = new Dechunker();
-      dechunker.onmessage = function(buffer) { messages.push(buffer); };
+      const messages = [];
+      const dechunker = new Dechunker();
+      dechunker.onmessage = buffer => {
+        messages.push(buffer);
+      };
       dechunker.write( slice1 );
       dechunker.write( slice2 );
 
       // Then, the output should be correct
       expect( messages.length ).toBe( 1 );
       expect(messages[0].toHex()).toBe('01 00 02 00 00 00 03 04 00 00 00 05');
-    };
+    }
   });
 });
 
 function bytes() {
-  var b = alloc( arguments.length );
-  for( var i=0; i<arguments.length; i++ ) {
+  const b = alloc(arguments.length);
+  for (let i = 0; i < arguments.length; i++) {
     b.writeUInt8( arguments[i] );
   }
   b.position = 0;

test/internal/connection.test.js

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import * as DummyChannel from '../../src/v1/internal/ch-dummy';
+import * as DummyChannel from './ch-dummy';
 import Connection from '../../src/v1/internal/connection';
 import {Packer} from '../../src/v1/internal/packstream-v1';
 import {Chunker} from '../../src/v1/internal/chunking';

test/internal/utf8.test.js

@@ -16,107 +16,108 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
-var utf8 = require('../../lib/v1/internal/utf8').default;
-var buffers = require('../../lib/v1/internal/buf');
 
-describe('utf8', function() {
-  it('should have a nice clean buffer position after serializing', function() {
+import {alloc, CombinedBuffer} from '../../src/v1/internal/buf';
+import utf8 from '../../src/v1/internal/utf8';
+
+describe('utf8', () => {
+
+  it('should have a nice clean buffer position after serializing', () => {
     // When
-    var buffer = utf8.encode("hello, world!");
+    const buffer = utf8.encode('hello, world!');
 
     // Then
     expect( buffer.position ).toBe( 0 );
   });
 
-  it('should respect position of single buffer', function() {
+  it('should respect position of single buffer', () => {
     // When
-    var buffer = utf8.encode("hello, world!");
+    const buffer = utf8.encode('hello, world!');
     buffer.readInt8();
-    var decoded = utf8.decode(buffer, buffer.length - 1);
+    const decoded = utf8.decode(buffer, buffer.length - 1);
     // Then
     expect( decoded ).toBe( "ello, world!" );
     expect(buffer.position).toEqual(13)
   });
 
 
-  it('should be able to decode substring', function() {
+  it('should be able to decode substring', () => {
     // When
-    var buffer = utf8.encode("hello, world!");
+    const buffer = utf8.encode('hello, world!');
     buffer.readInt8();
-    var decoded = utf8.decode(buffer, 3);
+    const decoded = utf8.decode(buffer, 3);
     // Then
     expect( decoded ).toBe( "ell" );
     expect(buffer.position).toEqual(4)
   });
 
-  it('should read/write utf8', function() {
+  it('should read/write utf8', () => {
     expect( packAndUnpack( "" ) ).toBe( "" );
     expect( packAndUnpack( "åäö123" ) ).toBe( "åäö123"  );
   });
 
-  it('should decode utf8 from a complete combined buffer', function() {
+  it('should decode utf8 from a complete combined buffer', () => {
     // Given
-    var msg = "asåfqwer";
-    var buf = utf8.encode(msg);
-    var bufa = buf.readSlice(3);
-    var bufb = buf.readSlice(3);
-    var bufc = buf.readSlice(3);
-    var combined = new buffers.CombinedBuffer( [bufa, bufb, bufc] );
+    const msg = 'asåfqwer';
+    const buf = utf8.encode(msg);
+    const bufa = buf.readSlice(3);
+    const bufb = buf.readSlice(3);
+    const bufc = buf.readSlice(3);
+    const combined = new CombinedBuffer([bufa, bufb, bufc]);
 
     // When
-    var decoded = utf8.decode(combined, combined.length);
+    const decoded = utf8.decode(combined, combined.length);
 
     // Then
     expect(decoded).toBe(msg);
   });
 
-  it('should decode utf8 from part of a combined buffer', function() {
+  it('should decode utf8 from part of a combined buffer', () => {
     // Given
-    var msg = "asåfq";
-    var expectMsg = msg.substring(0, msg.length-1);
-    var buf = utf8.encode(msg);
-    var bufa = buf.readSlice(3);
-    var bufb = buf.readSlice(3);
-    var unrelatedData = buffers.alloc(3);
-    var combined = new buffers.CombinedBuffer( [bufa, bufb, unrelatedData] );
+    const msg = 'asåfq';
+    const expectMsg = msg.substring(0, msg.length - 1);
+    const buf = utf8.encode(msg);
+    const bufa = buf.readSlice(3);
+    const bufb = buf.readSlice(3);
+    const unrelatedData = alloc(3);
+    const combined = new CombinedBuffer([bufa, bufb, unrelatedData]);
 
     // When 
     // We read all but the unrelatedData and the last character of bufb
-    var decoded = utf8.decode(combined, combined.length - 1 - unrelatedData.length );
+    const decoded = utf8.decode(combined, combined.length - 1 - unrelatedData.length);
 
     // Then
     expect(decoded).toBe(expectMsg);
   });
 
-  it('should respect the position in the combined buffer', function() {
+  it('should respect the position in the combined buffer', () => {
     // Given
-    var msg = "abcdefgh";
-    var buf = utf8.encode(msg);
-    var bufa = buf.readSlice(4);
-    var bufb = buf.readSlice(4);
-    var combined = new buffers.CombinedBuffer( [bufa, bufb] );
+    const msg = 'abcdefgh';
+    const buf = utf8.encode(msg);
+    const bufa = buf.readSlice(4);
+    const bufb = buf.readSlice(4);
+    const combined = new CombinedBuffer([bufa, bufb]);
     //move position forward
     combined.readInt8();
     combined.readInt8();
 
     // When
-    var decoded = utf8.decode(combined, combined.length - 2);
+    const decoded = utf8.decode(combined, combined.length - 2);
 
 
     // Then
     expect(decoded).toEqual("cdefgh");
     expect(combined.position).toBe(8)
   });
 
-  it('should be able to decode a substring in a combined buffer across buffers', function() {
+  it('should be able to decode a substring in a combined buffer across buffers', () => {
     // Given
-    var msg = "abcdefghijkl";
-    var buf = utf8.encode(msg);
-    var bufa = buf.readSlice(4);
-    var bufb = buf.readSlice(4);
-    var bufc = buf.readSlice(4);
-    var combined = new buffers.CombinedBuffer( [bufa, bufb, bufc] );
+    const msg = 'abcdefghijkl';
+    const buf = utf8.encode(msg);
+    const bufa = buf.readSlice(4);
+    const bufb = buf.readSlice(4);
+    const bufc = buf.readSlice(4);
+    const combined = new CombinedBuffer([bufa, bufb, bufc]);
     //move position forward
     combined.readInt8();
     combined.readInt8();
@@ -125,21 +126,21 @@ describe('utf8', function() {
     combined.readInt8();
 
     // When
-    var decoded = utf8.decode(combined, 4);
+    const decoded = utf8.decode(combined, 4);
 
     // Then
     expect(decoded).toBe("fghi");
     expect(combined.position).toBe(9)
   });
 
-  it('should be able to decode a substring in a combined within buffer', function() {
+  it('should be able to decode a substring in a combined within buffer', () => {
     // Given
-    var msg = "abcdefghijkl";
-    var buf = utf8.encode(msg);
-    var bufa = buf.readSlice(4);
-    var bufb = buf.readSlice(4);
-    var bufc = buf.readSlice(4);
-    var combined = new buffers.CombinedBuffer( [bufa, bufb, bufc] );
+    const msg = 'abcdefghijkl';
+    const buf = utf8.encode(msg);
+    const bufa = buf.readSlice(4);
+    const bufb = buf.readSlice(4);
+    const bufc = buf.readSlice(4);
+    const combined = new CombinedBuffer([bufa, bufb, bufc]);
     //move position forward
     combined.readInt8();
     combined.readInt8();
@@ -148,7 +149,7 @@ describe('utf8', function() {
     combined.readInt8();
 
     // When
-    var decoded = utf8.decode(combined, 2);
+    const decoded = utf8.decode(combined, 2);
 
     // Then
     expect(decoded).toBe("fg");
@@ -157,6 +158,6 @@ describe('utf8', function() {
 });
 
 function packAndUnpack( str ) {
-  var buffer = utf8.encode( str );
+  const buffer = utf8.encode(str);
   return utf8.decode( buffer, buffer.length );
 }