From 28e90a35ff600997f50dd778c13f0a1bed249fda Mon Sep 17 00:00:00 2001
From: Laur Ivan <laur@laurivan.com>
Date: Fri, 11 Mar 2022 12:09:49 +0100
Subject: [PATCH] Renamed tests so they're executed in order. Add tests for
 16,17.

---
 src/DPT10.ts                            |  2 +-
 src/DPT11.ts                            |  2 +-
 src/DPT12.ts                            |  2 +-
 src/DPT13.ts                            |  2 +-
 src/DPT14.ts                            |  2 +-
 src/DPT15.ts                            |  2 +-
 src/DPT16.ts                            |  2 +-
 src/DPT17.ts                            |  2 +-
 src/DPT18.ts                            |  2 +-
 src/DPT19.ts                            |  2 +-
 src/DPT20.ts                            |  2 +-
 src/DPT21.ts                            |  2 +-
 src/DPT237.ts                           |  2 +-
 tests/{DPT1.test.ts => DPT001.test.ts}  |  2 +-
 tests/{DPT2.test.ts => DPT002.test.ts}  |  2 +-
 tests/{DPT3.test.ts => DPT003.test.ts}  |  2 +-
 tests/{DPT4.test.ts => DPT004.test.ts}  |  2 +-
 tests/{DPT5.test.ts => DPT005.test.ts}  |  2 +-
 tests/{DPT6.test.ts => DPT006.test.ts}  |  2 +-
 tests/{DPT7.test.ts => DPT007.test.ts}  |  2 +-
 tests/{DPT8.test.ts => DPT008.test.ts}  |  2 +-
 tests/{DPT9.test.ts => DPT009.test.ts}  |  2 +-
 tests/{DPT10.test.ts => DPT010.test.ts} |  2 +-
 tests/{DPT11.test.ts => DPT011.test.ts} |  2 +-
 tests/{DPT12.test.ts => DPT012.test.ts} |  2 +-
 tests/{DPT13.test.ts => DPT013.test.ts} |  2 +-
 tests/{DPT14.test.ts => DPT014.test.ts} |  2 +-
 tests/{DPT15.test.ts => DPT015.test.ts} |  2 +-
 tests/DPT016.test.ts                    | 59 +++++++++++++++++++++++++
 tests/DPT017.test.ts                    | 58 ++++++++++++++++++++++++
 tests/{DPT18.test.ts => DPT018.test.ts} |  2 +-
 tests/{DPT19.test.ts => DPT019.test.ts} |  2 +-
 tests/{DPT20.test.ts => DPT020.test.ts} |  2 +-
 tests/{DPT21.test.ts => DPT021.test.ts} |  2 +-
 tests/DPT16.test.ts                     | 13 ------
 tests/DPT17.test.ts                     | 13 ------
 36 files changed, 149 insertions(+), 58 deletions(-)
 rename tests/{DPT1.test.ts => DPT001.test.ts} (97%)
 rename tests/{DPT2.test.ts => DPT002.test.ts} (98%)
 rename tests/{DPT3.test.ts => DPT003.test.ts} (98%)
 rename tests/{DPT4.test.ts => DPT004.test.ts} (97%)
 rename tests/{DPT5.test.ts => DPT005.test.ts} (97%)
 rename tests/{DPT6.test.ts => DPT006.test.ts} (97%)
 rename tests/{DPT7.test.ts => DPT007.test.ts} (97%)
 rename tests/{DPT8.test.ts => DPT008.test.ts} (97%)
 rename tests/{DPT9.test.ts => DPT009.test.ts} (97%)
 rename tests/{DPT10.test.ts => DPT010.test.ts} (98%)
 rename tests/{DPT11.test.ts => DPT011.test.ts} (88%)
 rename tests/{DPT12.test.ts => DPT012.test.ts} (88%)
 rename tests/{DPT13.test.ts => DPT013.test.ts} (88%)
 rename tests/{DPT14.test.ts => DPT014.test.ts} (88%)
 rename tests/{DPT15.test.ts => DPT015.test.ts} (98%)
 create mode 100644 tests/DPT016.test.ts
 create mode 100644 tests/DPT017.test.ts
 rename tests/{DPT18.test.ts => DPT018.test.ts} (88%)
 rename tests/{DPT19.test.ts => DPT019.test.ts} (88%)
 rename tests/{DPT20.test.ts => DPT020.test.ts} (88%)
 rename tests/{DPT21.test.ts => DPT021.test.ts} (88%)
 delete mode 100644 tests/DPT16.test.ts
 delete mode 100644 tests/DPT17.test.ts

diff --git a/src/DPT10.ts b/src/DPT10.ts
index 7e97715..c96edbe 100644
--- a/src/DPT10.ts
+++ b/src/DPT10.ts
@@ -19,7 +19,7 @@ export class DPT10 implements DPT {
    */
   decoder(buffer: Buffer): Date {
     if (buffer.length !== this.bufferLength)
-      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer} for DPT8.  Expected ${this.bufferLength}.`);
+      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer}.  Expected ${this.bufferLength}.`);
 
     const [dnh, minutes, seconds] = buffer;
     const dow = (dnh & 0b11100000) >> 5;
diff --git a/src/DPT11.ts b/src/DPT11.ts
index 1aeef43..26522a3 100644
--- a/src/DPT11.ts
+++ b/src/DPT11.ts
@@ -16,7 +16,7 @@ export class DPT11 implements DPT {
    */
   decoder(buffer: Buffer): Date {
     if (buffer.length !== this.bufferLength)
-      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer} for DPT8.  Expected ${this.bufferLength}.`);
+      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer}.  Expected ${this.bufferLength}.`);
 
     const day = buffer[0] & 31; //0b00011111);
     const month = buffer[1] & 15; //0b00001111);
diff --git a/src/DPT12.ts b/src/DPT12.ts
index b67a0a5..48b1a11 100644
--- a/src/DPT12.ts
+++ b/src/DPT12.ts
@@ -17,7 +17,7 @@ export class DPT12 implements DPT {
    */
   decoder(buffer: Buffer): number {
     if (buffer.length !== this.bufferLength)
-      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer} for DPT8.  Expected ${this.bufferLength}.`);
+      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer}.  Expected ${this.bufferLength}.`);
 
     return buffer.readUInt32BE(0);
   };
diff --git a/src/DPT13.ts b/src/DPT13.ts
index 72c4376..eddeab8 100644
--- a/src/DPT13.ts
+++ b/src/DPT13.ts
@@ -17,7 +17,7 @@ export class DPT13 implements DPT {
    */
   decoder(buffer: Buffer): number {
     if (buffer.length !== this.bufferLength)
-      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer} for DPT8.  Expected ${this.bufferLength}.`);
+      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer}.  Expected ${this.bufferLength}.`);
 
     // In 4 bytes, there's no way to exceed the range
     return buffer.readInt32BE(0)
diff --git a/src/DPT14.ts b/src/DPT14.ts
index 8324c18..b622711 100644
--- a/src/DPT14.ts
+++ b/src/DPT14.ts
@@ -17,7 +17,7 @@ export class DPT14 implements DPT {
    */
   decoder(buffer: Buffer): number {
     if (buffer.length !== this.bufferLength)
-      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer} for DPT8.  Expected ${this.bufferLength}.`);
+      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer}.  Expected ${this.bufferLength}.`);
 
     return buffer.readFloatBE(0);
   };
diff --git a/src/DPT15.ts b/src/DPT15.ts
index 4c46981..2ee6e19 100644
--- a/src/DPT15.ts
+++ b/src/DPT15.ts
@@ -46,7 +46,7 @@ export class DPT15 implements DPT {
    */
   decoder(buffer: Buffer): DPT15Result {
     if (buffer.length !== this.bufferLength)
-      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer} for DPT8.  Expected ${this.bufferLength}.`);
+      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer}.  Expected ${this.bufferLength}.`);
 
     const result: DPT15Result = {
       U: (buffer[0] & 0xf0) >> 4,
diff --git a/src/DPT16.ts b/src/DPT16.ts
index cc0c5f8..717e7af 100644
--- a/src/DPT16.ts
+++ b/src/DPT16.ts
@@ -16,7 +16,7 @@ export class DPT16 implements DPT {
    */
   decoder(buffer: Buffer): string {
     if (buffer.length !== this.bufferLength)
-      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer} for DPT8.  Expected ${this.bufferLength}.`);
+      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer}.  Expected ${this.bufferLength}.`);
 
 
     return buffer.toString('ascii');
diff --git a/src/DPT17.ts b/src/DPT17.ts
index d7a891b..3f41149 100644
--- a/src/DPT17.ts
+++ b/src/DPT17.ts
@@ -16,7 +16,7 @@ export class DPT17 implements DPT {
    */
   decoder(buffer: Buffer): number {
     if (buffer.length !== this.bufferLength)
-      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer} for DPT8.  Expected ${this.bufferLength}.`);
+      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer}.  Expected ${this.bufferLength}.`);
 
     // Scene number between 0 and 63
     return buffer.readUInt8(0) & 0b00111111;
diff --git a/src/DPT18.ts b/src/DPT18.ts
index 201db60..152b3a9 100644
--- a/src/DPT18.ts
+++ b/src/DPT18.ts
@@ -21,7 +21,7 @@ export class DPT18 implements DPT {
    */
   decoder(buffer: Buffer): DPT18Result {
     if (buffer.length !== this.bufferLength)
-      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer} for DPT8.  Expected ${this.bufferLength}.`);
+      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer}.  Expected ${this.bufferLength}.`);
 
 
     return {
diff --git a/src/DPT19.ts b/src/DPT19.ts
index 3f02e64..ddfbbc9 100644
--- a/src/DPT19.ts
+++ b/src/DPT19.ts
@@ -102,7 +102,7 @@ export class DPT19 implements DPT {
    */
   decoder(buffer: Buffer): DPT19Result {
     if (buffer.length !== this.bufferLength)
-      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer} for DPT8.  Expected ${this.bufferLength}.`);
+      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer}.  Expected ${this.bufferLength}.`);
 
     const byte8 = buffer.readUInt8(0)
     const byte7 = buffer.readUInt8(1)
diff --git a/src/DPT20.ts b/src/DPT20.ts
index cde5a68..dc51439 100644
--- a/src/DPT20.ts
+++ b/src/DPT20.ts
@@ -29,7 +29,7 @@ export class DPT20 implements DPT {
    */
   decoder(buffer: Buffer): number {
     if (buffer.length !== this.bufferLength)
-      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer} for DPT8.  Expected ${this.bufferLength}.`);
+      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer}.  Expected ${this.bufferLength}.`);
 
     return buffer.readUInt8(0);
   };
diff --git a/src/DPT21.ts b/src/DPT21.ts
index f609e20..cf749a9 100644
--- a/src/DPT21.ts
+++ b/src/DPT21.ts
@@ -28,7 +28,7 @@ export class DPT21 implements DPT {
    */
   decoder(buffer: Buffer): boolean[] {
     if (buffer.length !== 2)
-      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer} for DPT8.  Expected 2.`);
+      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer}.  Expected 2.`);
 
     const result = [
       !!(buffer[0] & 0x80),
diff --git a/src/DPT237.ts b/src/DPT237.ts
index d0568a2..b251b6d 100644
--- a/src/DPT237.ts
+++ b/src/DPT237.ts
@@ -17,7 +17,7 @@ export class DPT237 implements DPT {
    */
   decoder(buffer: Buffer): number {
     if (buffer.length !== this.bufferLength)
-      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer} for DPT8.  Expected ${this.bufferLength}.`);
+      throw new BufferLengthError(`Invalid buffer length ${buffer.length}/${buffer}.  Expected ${this.bufferLength}.`);
 
     return value;
   };
diff --git a/tests/DPT1.test.ts b/tests/DPT001.test.ts
similarity index 97%
rename from tests/DPT1.test.ts
rename to tests/DPT001.test.ts
index 8d53d71..8b7ac1a 100644
--- a/tests/DPT1.test.ts
+++ b/tests/DPT001.test.ts
@@ -13,7 +13,7 @@ let bufferEmpty = Buffer.from([])
 let bufferBiggerSize = Buffer.from([1, 0])
 
 
-describe("Test DPT1", (): void => {
+describe("Test DPT001", (): void => {
 
   let dpt = new DPT1();
 
diff --git a/tests/DPT2.test.ts b/tests/DPT002.test.ts
similarity index 98%
rename from tests/DPT2.test.ts
rename to tests/DPT002.test.ts
index ea0fa91..b24c049 100644
--- a/tests/DPT2.test.ts
+++ b/tests/DPT002.test.ts
@@ -15,7 +15,7 @@ let bufferEmpty = Buffer.from([])
 let bufferBiggerSize = Buffer.from([1, 0])
 
 
-describe("Test DPT2", (): void => {
+describe("Test DPT002", (): void => {
 
   let dpt = new DPT2();
 
diff --git a/tests/DPT3.test.ts b/tests/DPT003.test.ts
similarity index 98%
rename from tests/DPT3.test.ts
rename to tests/DPT003.test.ts
index 71b35d6..08723e9 100644
--- a/tests/DPT3.test.ts
+++ b/tests/DPT003.test.ts
@@ -14,7 +14,7 @@ let bufferIncValue = Buffer.from([13])
 let bufferEmpty = Buffer.from([])
 let bufferBiggerSize = Buffer.from([1, 0])
 
-describe("Test DPT3", (): void => {
+describe("Test DPT003", (): void => {
 
   let dpt = new DPT3();
 
diff --git a/tests/DPT4.test.ts b/tests/DPT004.test.ts
similarity index 97%
rename from tests/DPT4.test.ts
rename to tests/DPT004.test.ts
index 5943b89..d5c76bc 100644
--- a/tests/DPT4.test.ts
+++ b/tests/DPT004.test.ts
@@ -11,7 +11,7 @@ let bufferA = Buffer.from([65])
 let bufferEmpty = Buffer.from([])
 let bufferBiggerSize = Buffer.from([1, 0])
 
-describe("Test DPT4", (): void => {
+describe("Test DPT004", (): void => {
 
   let dpt = new DPT4();
 
diff --git a/tests/DPT5.test.ts b/tests/DPT005.test.ts
similarity index 97%
rename from tests/DPT5.test.ts
rename to tests/DPT005.test.ts
index b1e2494..4a0040d 100644
--- a/tests/DPT5.test.ts
+++ b/tests/DPT005.test.ts
@@ -12,7 +12,7 @@ let bufferMax = Buffer.from([254])
 let bufferEmpty = Buffer.from([])
 let bufferBiggerSize = Buffer.from([1, 0])
 
-describe("Test DPT5", (): void => {
+describe("Test DPT005", (): void => {
 
   let dpt = new DPT5();
 
diff --git a/tests/DPT6.test.ts b/tests/DPT006.test.ts
similarity index 97%
rename from tests/DPT6.test.ts
rename to tests/DPT006.test.ts
index 61af954..720efdb 100644
--- a/tests/DPT6.test.ts
+++ b/tests/DPT006.test.ts
@@ -15,7 +15,7 @@ let bufferNegative = Buffer.from([-value])
 let bufferEmpty = Buffer.from([])
 let bufferBiggerSize = Buffer.from([1, 0])
 
-describe("Test DPT6", (): void => {
+describe("Test DPT006", (): void => {
 
   let dpt = new DPT6();
 
diff --git a/tests/DPT7.test.ts b/tests/DPT007.test.ts
similarity index 97%
rename from tests/DPT7.test.ts
rename to tests/DPT007.test.ts
index f3c9d02..b3537fc 100644
--- a/tests/DPT7.test.ts
+++ b/tests/DPT007.test.ts
@@ -12,7 +12,7 @@ let bufferMax = Buffer.from([255, 255])
 let bufferEmpty = Buffer.from([])
 let bufferBiggerSize = Buffer.from([1, 0, 2, 4])
 
-describe("Test DPT7", (): void => {
+describe("Test DPT007", (): void => {
 
   let dpt = new DPT7();
 
diff --git a/tests/DPT8.test.ts b/tests/DPT008.test.ts
similarity index 97%
rename from tests/DPT8.test.ts
rename to tests/DPT008.test.ts
index 62f55f2..048dcc1 100644
--- a/tests/DPT8.test.ts
+++ b/tests/DPT008.test.ts
@@ -15,7 +15,7 @@ let bufferNegative = Buffer.from([255, 0])
 let bufferEmpty = Buffer.from([])
 let bufferBiggerSize = Buffer.from([0xff, 0xff, 0x63, 0xc0])
 
-describe("Test DPT8", (): void => {
+describe("Test DPT008", (): void => {
 
   let dpt = new DPT8();
 
diff --git a/tests/DPT9.test.ts b/tests/DPT009.test.ts
similarity index 97%
rename from tests/DPT9.test.ts
rename to tests/DPT009.test.ts
index 598d31c..34ea52a 100644
--- a/tests/DPT9.test.ts
+++ b/tests/DPT009.test.ts
@@ -15,7 +15,7 @@ let bufferNegative = Buffer.from([0x8b, 0xe2])
 let bufferEmpty = Buffer.from([])
 let bufferBiggerSize = Buffer.from([0xff, 0xff, 0x63, 0xc0])
 
-describe("Test DPT9", (): void => {
+describe("Test DPT009", (): void => {
 
   let dpt = new DPT9();
 
diff --git a/tests/DPT10.test.ts b/tests/DPT010.test.ts
similarity index 98%
rename from tests/DPT10.test.ts
rename to tests/DPT010.test.ts
index b6048f4..208f7b0 100644
--- a/tests/DPT10.test.ts
+++ b/tests/DPT010.test.ts
@@ -25,7 +25,7 @@ let bufferEmpty = Buffer.from([])
 let bufferBiggerSize = Buffer.from([0xff, 0xff, 0x63, 0xc0])
 
 
-describe("Test DPT10", (): void => {
+describe("Test DPT010", (): void => {
 
   let dpt = new DPT10();
 
diff --git a/tests/DPT11.test.ts b/tests/DPT011.test.ts
similarity index 88%
rename from tests/DPT11.test.ts
rename to tests/DPT011.test.ts
index 887cb05..b2fcbfc 100644
--- a/tests/DPT11.test.ts
+++ b/tests/DPT011.test.ts
@@ -6,7 +6,7 @@ import { InvalidValueError } from "../src/errors/InvalidValueError";
 
 import { compareBuffers } from "./util"
 
-describe("Test DPT11", (): void => {
+describe("Test DPT011", (): void => {
 
   let dpt = new DPT11();
 
diff --git a/tests/DPT12.test.ts b/tests/DPT012.test.ts
similarity index 88%
rename from tests/DPT12.test.ts
rename to tests/DPT012.test.ts
index 6429ca0..c823114 100644
--- a/tests/DPT12.test.ts
+++ b/tests/DPT012.test.ts
@@ -6,7 +6,7 @@ import { InvalidValueError } from "../src/errors/InvalidValueError";
 
 import { compareBuffers } from "./util"
 
-describe("Test DPT12", (): void => {
+describe("Test DPT012", (): void => {
 
   let dpt = new DPT12();
 
diff --git a/tests/DPT13.test.ts b/tests/DPT013.test.ts
similarity index 88%
rename from tests/DPT13.test.ts
rename to tests/DPT013.test.ts
index 677b2f0..54118c0 100644
--- a/tests/DPT13.test.ts
+++ b/tests/DPT013.test.ts
@@ -6,7 +6,7 @@ import { InvalidValueError } from "../src/errors/InvalidValueError";
 
 import { compareBuffers } from "./util"
 
-describe("Test DPT13", (): void => {
+describe("Test DPT013", (): void => {
 
   let dpt = new DPT13();
 
diff --git a/tests/DPT14.test.ts b/tests/DPT014.test.ts
similarity index 88%
rename from tests/DPT14.test.ts
rename to tests/DPT014.test.ts
index 59c7e9a..b5c2c45 100644
--- a/tests/DPT14.test.ts
+++ b/tests/DPT014.test.ts
@@ -6,7 +6,7 @@ import { InvalidValueError } from "../src/errors/InvalidValueError";
 
 import { compareBuffers } from "./util"
 
-describe("Test DPT14", (): void => {
+describe("Test DPT014", (): void => {
 
   let dpt = new DPT14();
 
diff --git a/tests/DPT15.test.ts b/tests/DPT015.test.ts
similarity index 98%
rename from tests/DPT15.test.ts
rename to tests/DPT015.test.ts
index f8a5322..f9356e5 100644
--- a/tests/DPT15.test.ts
+++ b/tests/DPT015.test.ts
@@ -6,7 +6,7 @@ import { InvalidValueError } from "../src/errors/InvalidValueError";
 
 import { compareBuffers } from "./util"
 
-describe("Test DPT15", (): void => {
+describe("Test DPT015", (): void => {
 
   let dpt = new DPT15();
 
diff --git a/tests/DPT016.test.ts b/tests/DPT016.test.ts
new file mode 100644
index 0000000..5a5e0c8
--- /dev/null
+++ b/tests/DPT016.test.ts
@@ -0,0 +1,59 @@
+import { expect } from "chai";
+
+import { DPT16 } from "../src/DPT16"
+import { BufferLengthError } from "../src/errors/BufferLengthError";
+import { InvalidValueError } from "../src/errors/InvalidValueError";
+
+import { compareBuffers } from "./util"
+
+describe("Test DPT016", (): void => {
+
+  let dpt = new DPT16();
+
+  it("Decode buffer acceptable", async function () {
+    let str = 'A brown fox ju'
+    let buffer = Buffer.from([0x41, 0x20, 0x62, 0x72, 0x6f, 0x77, 0x6e, 0x20, 0x66, 0x6f, 0x78, 0x20, 0x6a, 0x75])
+    const decoded = dpt.decoder(buffer)
+    expect(decoded).is.equal(str);
+  });
+
+  it("Decode empty buffer", async function () {
+    let bufferEmpty = Buffer.from([])
+    var testFunction = function () {
+      const value = dpt.decoder(bufferEmpty)
+    }
+    expect(testFunction).to.throw(BufferLengthError);
+  });
+
+  it("Decode oversized buffer", async function () {
+    let bufferBiggerSize = Buffer.from([0xff, 0xff, 0x63, 0xc0, 0x00, 0xff, 0xff, 0x63, 0xc0, 0x00, 0xff, 0xff, 0x63, 0xc0, 0x00])
+
+    var testFunction = function () {
+      const value = dpt.decoder(bufferBiggerSize)
+    }
+    expect(testFunction).to.throw(BufferLengthError);
+  });
+
+  /* Encoder tests */
+  it("encode valid", async function () {
+    let str = 'A brown fox ju'
+    let buffer = Buffer.from([0x41, 0x20, 0x62, 0x72, 0x6f, 0x77, 0x6e, 0x20, 0x66, 0x6f, 0x78, 0x20, 0x6a, 0x75])
+
+    expect(compareBuffers(dpt.encoder(str), buffer)).is.true;
+  });
+
+  it("encode undefined", async function () {
+    var testFunction = function () {
+      const value = dpt.encoder(undefined)
+    }
+    expect(testFunction).to.throw(InvalidValueError);
+  });
+
+  it("encode longer text", async function () {
+    const str = "A brown fox jumps over the lazy dog."
+    let buffer = Buffer.from([0x41, 0x20, 0x62, 0x72, 0x6f, 0x77, 0x6e, 0x20, 0x66, 0x6f, 0x78, 0x20, 0x6a, 0x75])
+
+    expect(compareBuffers(dpt.encoder(str), buffer)).is.true;
+  });
+
+});
\ No newline at end of file
diff --git a/tests/DPT017.test.ts b/tests/DPT017.test.ts
new file mode 100644
index 0000000..060a5fc
--- /dev/null
+++ b/tests/DPT017.test.ts
@@ -0,0 +1,58 @@
+import { expect } from "chai";
+
+import { DPT17 } from "../src/DPT17"
+import { BufferLengthError } from "../src/errors/BufferLengthError";
+import { InvalidValueError } from "../src/errors/InvalidValueError";
+
+import { compareBuffers } from "./util"
+
+describe("Test DPT017", (): void => {
+
+  let dpt = new DPT17();
+  it("Decode buffer acceptable", async function () {
+    let value = 0x24
+    let buffer = Buffer.from([0x24])
+    const decoded = dpt.decoder(buffer)
+    expect(decoded).is.equal(value);
+  });
+
+  it("Decode empty buffer", async function () {
+    let bufferEmpty = Buffer.from([])
+    var testFunction = function () {
+      const value = dpt.decoder(bufferEmpty)
+    }
+    expect(testFunction).to.throw(BufferLengthError);
+  });
+
+  it("Decode oversized buffer", async function () {
+    let bufferBiggerSize = Buffer.from([0x20, 0x15])
+
+    var testFunction = function () {
+      const value = dpt.decoder(bufferBiggerSize)
+    }
+    expect(testFunction).to.throw(BufferLengthError);
+  });
+
+  /* Encoder tests */
+  it("encode valid", async function () {
+    let value = 0x15
+    let buffer = Buffer.from([0x15])
+
+    expect(compareBuffers(dpt.encoder(value), buffer)).is.true;
+  });
+
+  it("encode undefined", async function () {
+    var testFunction = function () {
+      const value = dpt.encoder(undefined)
+    }
+    expect(testFunction).to.throw(InvalidValueError);
+  });
+
+  it("encode invalid value", async function () {
+    const value = 0x80
+    var testFunction = function () {
+      const result = dpt.encoder(value)
+    }
+    expect(testFunction).to.throw(InvalidValueError);
+  });
+});
\ No newline at end of file
diff --git a/tests/DPT18.test.ts b/tests/DPT018.test.ts
similarity index 88%
rename from tests/DPT18.test.ts
rename to tests/DPT018.test.ts
index 126e86b..c24c07c 100644
--- a/tests/DPT18.test.ts
+++ b/tests/DPT018.test.ts
@@ -6,7 +6,7 @@ import { InvalidValueError } from "../src/errors/InvalidValueError";
 
 import { compareBuffers } from "./util"
 
-describe("Test DPT18", (): void => {
+describe("Test DPT018", (): void => {
 
   let dpt = new DPT18();
 
diff --git a/tests/DPT19.test.ts b/tests/DPT019.test.ts
similarity index 88%
rename from tests/DPT19.test.ts
rename to tests/DPT019.test.ts
index 1756a5d..dd21243 100644
--- a/tests/DPT19.test.ts
+++ b/tests/DPT019.test.ts
@@ -6,7 +6,7 @@ import { InvalidValueError } from "../src/errors/InvalidValueError";
 
 import { compareBuffers } from "./util"
 
-describe("Test DPT19", (): void => {
+describe("Test DPT019", (): void => {
 
   let dpt = new DPT19();
 
diff --git a/tests/DPT20.test.ts b/tests/DPT020.test.ts
similarity index 88%
rename from tests/DPT20.test.ts
rename to tests/DPT020.test.ts
index 4f9a811..3f664ee 100644
--- a/tests/DPT20.test.ts
+++ b/tests/DPT020.test.ts
@@ -6,7 +6,7 @@ import { InvalidValueError } from "../src/errors/InvalidValueError";
 
 import { compareBuffers } from "./util"
 
-describe("Test DPT20", (): void => {
+describe("Test DPT020", (): void => {
 
   let dpt = new DPT20();
 
diff --git a/tests/DPT21.test.ts b/tests/DPT021.test.ts
similarity index 88%
rename from tests/DPT21.test.ts
rename to tests/DPT021.test.ts
index 18f3427..c4e046d 100644
--- a/tests/DPT21.test.ts
+++ b/tests/DPT021.test.ts
@@ -6,7 +6,7 @@ import { InvalidValueError } from "../src/errors/InvalidValueError";
 
 import { compareBuffers } from "./util"
 
-describe("Test DPT21", (): void => {
+describe("Test DPT021", (): void => {
 
   let dpt = new DPT21();
 
diff --git a/tests/DPT16.test.ts b/tests/DPT16.test.ts
deleted file mode 100644
index 2c6b735..0000000
--- a/tests/DPT16.test.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { expect } from "chai";
-
-import { DPT16 } from "../src/DPT16"
-import { BufferLengthError } from "../src/errors/BufferLengthError";
-import { InvalidValueError } from "../src/errors/InvalidValueError";
-
-import { compareBuffers } from "./util"
-
-describe("Test DPT16", (): void => {
-
-  let dpt = new DPT16();
-
-});
\ No newline at end of file
diff --git a/tests/DPT17.test.ts b/tests/DPT17.test.ts
deleted file mode 100644
index 68066c3..0000000
--- a/tests/DPT17.test.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { expect } from "chai";
-
-import { DPT17 } from "../src/DPT17"
-import { BufferLengthError } from "../src/errors/BufferLengthError";
-import { InvalidValueError } from "../src/errors/InvalidValueError";
-
-import { compareBuffers } from "./util"
-
-describe("Test DPT17", (): void => {
-
-  let dpt = new DPT17();
-
-});
\ No newline at end of file