From 9f7d5056c0fb1cfe8910fdcb00dcbb68c2718ace Mon Sep 17 00:00:00 2001
From: Nedyalko Nikolov <nedyalko.nikolov@telerik.com>
Date: Tue, 27 Dec 2016 11:10:40 +0200
Subject: [PATCH] Fixed tests for time and date pickers.

---
 tests/app/testRunner.ts                        |  4 ++--
 .../ui/date-picker/date-picker.ios.ts          | 14 ++++++++++----
 .../ui/time-picker/time-picker.ios.ts          | 18 ++++++++++--------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/tests/app/testRunner.ts b/tests/app/testRunner.ts
index 6c55643f1..30d1ac675 100644
--- a/tests/app/testRunner.ts
+++ b/tests/app/testRunner.ts
@@ -87,8 +87,8 @@ allTests["SCROLL-VIEW"] = require("./ui/scroll-view/scroll-view-tests");
 // allTests["TEXT-FIELD"] = require("./ui/text-field/text-field-tests");
 // allTests["TEXT-VIEW"] = require("./ui/text-view/text-view-tests");
 // allTests["LIST-PICKER"] = require("./ui/list-picker/list-picker-tests");
-// allTests["DATE-PICKER"] = require("./ui/date-picker/date-picker-tests");
-// allTests["TIME-PICKER"] = require("./ui/time-picker/time-picker-tests");
+allTests["DATE-PICKER"] = require("./ui/date-picker/date-picker-tests");
+allTests["TIME-PICKER"] = require("./ui/time-picker/time-picker-tests");
 // allTests["WEB-VIEW"] = require("./ui/web-view/web-view-tests");
 // allTests["HTML-VIEW"] = require("./ui/html-view/html-view-tests");
 // allTests["REPEATER"] = require("./ui/repeater/repeater-tests");
diff --git a/tns-core-modules/ui/date-picker/date-picker.ios.ts b/tns-core-modules/ui/date-picker/date-picker.ios.ts
index c8b11b183..43aa1e749 100644
--- a/tns-core-modules/ui/date-picker/date-picker.ios.ts
+++ b/tns-core-modules/ui/date-picker/date-picker.ios.ts
@@ -3,6 +3,8 @@
     dateProperty, maxDateProperty, minDateProperty, colorProperty
 } from "./date-picker-common";
 
+import { Color } from "color";
+
 import { ios } from "utils/utils";
 
 export * from "./date-picker-common";
@@ -21,6 +23,10 @@ export class DatePicker extends DatePickerBase {
         this.nativeView.addTargetActionForControlEvents(this._changeHandler, "valueChanged", UIControlEvents.ValueChanged);
     }
 
+    get ios(): UIDatePicker {
+        return this.nativeView;
+    }
+
     get [yearProperty.native](): number {
         return this.nativeView.date.getFullYear();
     }
@@ -81,12 +87,12 @@ export class DatePicker extends DatePickerBase {
         picker.minimumDate = <any>nsDate;
     }
 
-    get [colorProperty.native](): UIColor {
-        return this.nativeView.valueForKey("textColor");
+    get [colorProperty.native](): Color {
+        return ios.getColor(this.nativeView.valueForKey("textColor"));
     }
-    set [minDateProperty.native](value: UIColor) {
+    set [colorProperty.native](value: Color) {
         let picker = this.nativeView;
-        picker.setValueForKey(value, "textColor");
+        picker.setValueForKey(value.ios, "textColor");
     }
 }
 
diff --git a/tns-core-modules/ui/time-picker/time-picker.ios.ts b/tns-core-modules/ui/time-picker/time-picker.ios.ts
index 2dfdb2536..1b6370a28 100644
--- a/tns-core-modules/ui/time-picker/time-picker.ios.ts
+++ b/tns-core-modules/ui/time-picker/time-picker.ios.ts
@@ -1,6 +1,7 @@
 import { TimePickerBase, timeProperty, 
     minuteProperty, minMinuteProperty, maxMinuteProperty,
     hourProperty, minHourProperty, maxHourProperty, colorProperty } from "./time-picker-common";
+import { Color } from "color";
 
 import { ios } from "utils/utils";
 import getter = ios.getter;
@@ -35,6 +36,7 @@ export class TimePicker extends TimePickerBase {
         let components = getComponents(NSDate.date());
         this.hour = components.hour;
         this.minute = components.minute;
+        this.nativeView = this._ios;
     }
 
     get ios(): UIDatePicker {
@@ -63,28 +65,28 @@ export class TimePicker extends TimePickerBase {
     }
 
     get [minHourProperty.native](): number {
-        return this.nativeView.minimumDate.getHours();
+        return this.nativeView.minimumDate ? this.nativeView.minimumDate.getHours() : 0;
     }
     set [minHourProperty.native](value: number) {
         this.nativeView.minimumDate = getDate(value, this.minute);
     }
 
     get [maxHourProperty.native](): number {
-        return this.nativeView.maximumDate.getHours();
+        return this.nativeView.maximumDate ? this.nativeView.maximumDate.getHours() : 24;
     }
     set [maxHourProperty.native](value: number) {
         this.nativeView.maximumDate = getDate(value, this.minute);
     }
 
     get [minMinuteProperty.native](): number {
-        return this.nativeView.minimumDate.getMinutes();
+        return this.nativeView.minimumDate ? this.nativeView.minimumDate.getMinutes() : 0;
     }
     set [minMinuteProperty.native](value: number) {
         this.nativeView.minimumDate = getDate(this.hour, value);
     }
 
     get [maxMinuteProperty.native](): number {
-        return this.nativeView.maximumDate.getMinutes();
+        return this.nativeView.maximumDate ? this.nativeView.maximumDate.getMinutes() : 60;
     }
     set [maxMinuteProperty.native](value: number) {
         this.nativeView.maximumDate = getDate(this.hour, value);
@@ -97,11 +99,11 @@ export class TimePicker extends TimePickerBase {
         this.nativeView.minuteInterval = value;
     }
 
-    get [colorProperty.native](): UIColor {
-        return this.nativeView.valueForKey("textColor");
+    get [colorProperty.native](): Color {
+        return ios.getColor(this.nativeView.valueForKey("textColor"));
     }
-    set [colorProperty.native](value: UIColor) {
-        this.nativeView.setValueForKey(value, "textColor");
+    set [colorProperty.native](value: Color) {
+        this.nativeView.setValueForKey(value.ios, "textColor");
     }
 }