Merge pull request #11 from bacongobbler/check-parseerror

check for a time.ParseError, add unit tests

Author: Matthew Fisher

time/time.go

@@ -3,45 +3,46 @@ package time
 import "time"
 
 // DeisDatetimeFormat is the standard date/time representation used in Deis.
-const DeisDatetimeFormat  string = "2006-01-02T15:04:05MST"
+const DeisDatetimeFormat = "2006-01-02T15:04:05MST"
+
 // Different format to deal with the pyopenssl formatting
 // http://www.pyopenssl.org/en/stable/api/crypto.html#OpenSSL.crypto.X509.get_notAfter
-const PyOpenSSLTimeDateTimeFormat string = "2006-01-02T15:04:05"
+const PyOpenSSLTimeDateTimeFormat = "2006-01-02T15:04:05"
 
 // Time represents the standard datetime format used across the Deis Platform.
 type Time struct {
-	time.Time
+	*time.Time
 }
 
 func (t *Time) format() string {
-	return t.Time.Format(DeisDatetimeFormat)
+	return t.Format(DeisDatetimeFormat)
 }
 
 // MarshalJSON implements the json.Marshaler interface.
 // The time is a quoted string in Deis' datetime format.
 func (t *Time) MarshalJSON() ([]byte, error) {
-	return []byte(t.Time.Format(`"` + DeisDatetimeFormat + `"`)), nil
+	return []byte(t.Format(`"` + DeisDatetimeFormat + `"`)), nil
 }
 
 // UnmarshalText implements the encoding.TextUnmarshaler interface.
 // The time is expected to be in Deis' datetime format.
-func (t *Time) UnmarshalText(data []byte) (err error) {
+func (t *Time) UnmarshalText(data []byte) error {
 	tt, err := time.Parse(DeisDatetimeFormat, string(data))
-	if err != nil {
+	if _, ok := err.(*time.ParseError); ok {
 		tt, err = time.Parse(PyOpenSSLTimeDateTimeFormat, string(data))
 	}
-	*t = Time{tt}
-	return
+	*t = Time{&tt}
+	return err
 }
 
 // UnmarshalJSON implements the json.Unmarshaler interface.
 // The time is expected to be a quoted string in Deis' datetime format.
-func (t *Time) UnmarshalJSON(data []byte) (err error) {
+func (t *Time) UnmarshalJSON(data []byte) error {
 	// Fractional seconds are handled implicitly by Parse.
 	tt, err := time.Parse(`"`+DeisDatetimeFormat+`"`, string(data))
-	if err != nil {
+	if _, ok := err.(*time.ParseError); ok {
 		tt, err = time.Parse(`"`+PyOpenSSLTimeDateTimeFormat+`"`, string(data))
 	}
-	*t = Time{tt}
-	return
+	*t = Time{&tt}
+	return err
 }

time/time_test.go

@@ -0,0 +1,44 @@
+package time
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestUnMarshalText(t *testing.T) {
+	dummyTime := Time{}
+
+	standardTimeFormats := []string{
+		"2006-01-02T15:04:05MST",
+		"2006-01-02T15:04:05UTC",
+		"2006-01-02T15:04:05PST",
+	}
+	for _, goodTime := range standardTimeFormats {
+		if dummyTime.UnmarshalText([]byte(goodTime)) != nil {
+			t.Error("expected " + goodTime + " to be marshal-able.")
+		}
+		if dummyTime.Year() != 2006 {
+			t.Error(fmt.Sprintf("expected year to be 2006; got %d.", dummyTime.Year()))
+		}
+	}
+
+	alternateTimeFormats := []string{
+		"2007-01-02T15:04:05",
+		"2007-01-02T15:04:05",
+		"2007-01-02T15:04:05",
+	}
+
+	for _, goodTime := range alternateTimeFormats {
+		if dummyTime.UnmarshalText([]byte(goodTime)) != nil {
+			t.Error("expected " + goodTime + " to be marshal-able.")
+		}
+		if dummyTime.Year() != 2007 {
+			t.Error(fmt.Sprintf("expected year to be 2007; got %d.", dummyTime.Year()))
+		}
+	}
+
+	badTime := "this is a bad time, isn't it?"
+	if dummyTime.UnmarshalText([]byte(badTime)) == nil {
+		t.Error("expected " + badTime + "to be unmarshal-able.")
+	}
+}