Move the alignment markers into their own files and add tests

Author: darkriszty

src/viewModelFactories/alignmentMarker.ts

@@ -0,0 +1,3 @@
+export interface IAlignmentMarker {
+    mark(padding: string): string;
+}

src/viewModelFactories/alignmentMarking/alignmentMarker.ts

@@ -0,0 +1,15 @@
+import { Alignment } from "../../models/alignment";
+import { IAlignmentMarker, LeftAlignmentMarker, RightAlignmentMarker, CenterAlignmentMarker, NotSetAlignmentMarker } from ".";
+
+
+export class AlignmentMarkerStrategy {
+
+    public marker(alignment: Alignment): IAlignmentMarker {
+        switch (alignment) {
+            case Alignment.Left: return new LeftAlignmentMarker();
+            case Alignment.Right: return new RightAlignmentMarker();
+            case Alignment.Center: return new CenterAlignmentMarker();
+            default: return new NotSetAlignmentMarker();
+        }
+    }
+}

src/viewModelFactories/alignmentMarking/alignmentMarkerStrategy.ts

@@ -0,0 +1,10 @@
+import { IAlignmentMarker } from ".";
+
+export class CenterAlignmentMarker implements IAlignmentMarker {
+    public mark(padding: string): string {
+        if (padding == null || padding.length < 2) 
+            return padding;
+
+        return ":" + padding.substring(1, padding.length - 1) + ":";
+    }
+}

src/viewModelFactories/alignmentMarking/centerAlignmentMarker.ts

@@ -0,0 +1,6 @@
+export * from "./alignmentMarker"
+export * from "./alignmentMarkerStrategy"
+export * from "./centerAlignmentMarker"
+export * from "./leftAlignmentMarker"
+export * from "./notSetAlignmentMarker"
+export * from "./rightAlignmentMarker"

src/viewModelFactories/alignmentMarking/index.ts

@@ -0,0 +1,11 @@
+import { IAlignmentMarker } from ".";
+
+export class LeftAlignmentMarker implements IAlignmentMarker {
+    constructor() {
+    }
+    public mark(padding: string): string {
+        if (padding == null || padding.length < 2)
+            return padding;
+        return ":" + padding.substr(1);
+    }
+}

src/viewModelFactories/alignmentMarking/leftAlignmentMarker.ts

@@ -0,0 +1,7 @@
+import { IAlignmentMarker } from "./alignmentMarker";
+
+export class NotSetAlignmentMarker implements IAlignmentMarker {
+    public mark(padding: string): string {
+        return padding;
+    }
+}

src/viewModelFactories/alignmentMarking/notSetAlignmentMarker.ts

@@ -0,0 +1,9 @@
+import { IAlignmentMarker } from ".";
+
+export class RightAlignmentMarker implements IAlignmentMarker {
+    public mark(padding: string): string {
+        if (padding == null || padding.length < 2)
+            return padding;
+        return padding.substring(0, padding.length - 1) + ":";
+    }
+}

src/viewModelFactories/alignmentMarking/rightAlignmentMarker.ts

@@ -2,7 +2,7 @@ import { RowViewModel } from "../viewModels/rowViewModel";
 import { PadCalculator } from "../padCalculation/padCalculator";
 import { Table } from "../models/table";
 import { Alignment } from "../models/alignment";
-import { AlignmentMarkerStrategy } from "./alignmentMarker";
+import { AlignmentMarkerStrategy } from "./alignmentMarking";
 
 export class RowViewModelFactory {
 
@@ -38,15 +38,4 @@ export class RowViewModelFactory {
 
         return new RowViewModel(resultRow);
     }
-/*
-    private withAlignmentMarkers(padding: string, alignment: Alignment): string {
-        if (alignment == Alignment.NotSet || padding == null)
-            return padding;
-        if (alignment == Alignment.Left)
-            return ":" + padding.substr(1);
-        if (alignment == Alignment.Right)
-            return padding.substring(0, padding.length - 1) + ":";
-
-        return ":" + padding.substring(1, padding.length - 1) + ":";
-    }*/
 }

src/viewModelFactories/rowViewModelFactory.ts

@@ -0,0 +1,18 @@
+import * as assert from 'assert';
+import { AlignmentMarkerStrategy, IAlignmentMarker } from '../../../../src/viewModelFactories/alignmentMarking';
+import { Alignment } from '../../../../src/models/alignment';
+
+suite("AlignmentMarkerStrategy tests", () => {
+
+    test("marker() returns a different marker strategy for the different alignemnts", () => {
+        const sut = new AlignmentMarkerStrategy();
+        const alignments = [ Alignment.NotSet, Alignment.Left, Alignment.Center, Alignment.Right ];
+
+        const markers: IAlignmentMarker[] = alignments.map(sut.marker);
+
+        const distinctMarkers = markers.filter((v, i, a) => a.indexOf(v) == i);
+
+        assert.equal(distinctMarkers.length, markers.length);
+    });
+
+});