Added unit tests for new code and fixed onSortChange emissions

Author: CALABRO Raphael (UA 2118)

src/DataTable.spec.ts

@@ -112,9 +112,16 @@ describe("DataTable directive tests", ()=> {
             datatable.ngOnChanges({rowsOnPage: new SimpleChange(2, 3, false)});
             datatable.ngDoCheck();
             expect(datatable.data).toEqual([{id: 3, name: 'banana'}, {id: 1, name: 'Duck'}, {id: 2, name: 'ącki'}]);
-
-
         });
+
+        it("should emit a dataLength of 0 when inputData is null or undefined", (done) => {
+            datatable.onPageChange.subscribe((pageOptions: PageEvent)=> {
+                expect(pageOptions.dataLength).toEqual(0);
+                done();
+            });
+            datatable.inputData = null;
+            datatable.setPage(2, 3);
+        })
     });
 
     describe("sorting", ()=> {
@@ -198,6 +205,20 @@ describe("DataTable directive tests", ()=> {
             ]);
         });
 
+        it("should set sortOrder to 'asc' if setSort is given something else than 'asc' or 'desc'", () => {
+            datatable.setSort("id", "bulb" as any);
+            expect(datatable.getSort()).toEqual({sortBy: "id", sortOrder: "asc"});
+            datatable.ngDoCheck();
+            expect(datatable.sortOrder).toEqual("asc");
+            expect(datatable.data).toEqual([
+                {id: 1, name: 'Duck'},
+                {id: 2, name: 'ącki'},
+                {id: 3, name: 'banana'},
+                {id: 4, name: 'Ananas'},
+                {id: 5, name: 'Ðrone'}
+            ]);
+        });
+
         it("shouldn't change order when only order provided", (done)=> {
             done();
             datatable.onSortChange.subscribe(()=> {
@@ -275,6 +296,7 @@ describe("DataTable directive tests", ()=> {
                 {name: 'Claire', age: 9},
                 {name: 'Anna', age: 34},
                 {name: 'Claire', age: 16},
+                {name: 'Anna', age: 12},
                 {name: 'Claire', age: 7},
                 {name: 'Anna', age: 12}
             ];
@@ -283,6 +305,7 @@ describe("DataTable directive tests", ()=> {
             datatable.ngDoCheck();
 
             expect(datatable.data).toEqual([
+                {name: 'Anna', age: 12},
                 {name: 'Anna', age: 12},
                 {name: 'Anna', age: 34},
                 {name: 'Claire', age: 7},

src/DataTable.ts

@@ -6,7 +6,7 @@ import { ReplaySubject } from "rxjs";
 
 export interface SortEvent {
     sortBy: string|string[];
-    sortOrder: string
+    sortOrder: SortOrder
 }
 
 export interface PageEvent {
@@ -58,7 +58,7 @@ export class DataTable implements OnChanges, DoCheck {
             this.sortBy = sortBy;
             this.sortOrder = ["asc","desc"].indexOf(sortOrder) >= 0 ? sortOrder : "asc";
             this.mustRecalculateData = true;
-            this.onSortChange.next({sortBy: sortBy, sortOrder: sortOrder});
+            this.onSortChange.next({sortBy: this.sortBy, sortOrder: this.sortOrder});
             this.sortByChange.emit(this.sortBy);
             this.sortOrderChange.emit(this.sortOrder);
         }
@@ -158,13 +158,7 @@ export class DataTable implements OnChanges, DoCheck {
     }
 
     private compare(left: any, right: any): number {
-        if (left === right) {
-            return 0;
-        }
-        if (left == null || left > right) {
-            return 1;
-        }
-        return -1;
+        return left === right ? 0 : left == null || left > right ? 1 : -1;
     }
 
     private sorter<T>(sortBy: string | string[], sortOrder: string): (left: T, right: T) => number {