Add Before method to Time

ribice · Jun 25, 2020 · c4e0118 · c4e0118
1 parent 86ef269
commit c4e0118
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 10 deletions.
diff --git a/time.go b/time.go
@@ -72,13 +72,18 @@ func (t Time) ToDate() time.Time {
 
 // After checks if instance of t is after tm
 func (t Time) After(tm Time) bool {
-	if t.Hour > tm.Hour {
-		return true
+	if t.Hour == tm.Hour{
+		return t.Minute > tm.Minute
 	}
-	if t.Hour < tm.Hour{
-		return false
+	return t.Hour > tm.Hour
+}
+
+// After checks if instance of t is before tm
+func (t Time) Before(tm Time) bool {
+	if t.Hour == tm.Hour{
+		return t.Minute < tm.Minute
 	}
-	return t.Minute > tm.Minute
+	return t.Hour < tm.Hour
 }
 
 // Subtract returns difference between t and t2 in minutes

diff --git a/time_test.go b/time_test.go
@@ -91,13 +91,13 @@ func TestAfter(t *testing.T) {
 		isAfter bool
 	}{
 		{
-			name:    "Hours after",
+			name:    "Hour after",
 			t1:      Time{23, 59, true},
 			t2:      Time{22, 59, true},
 			isAfter: true,
 		},
 		{
-			name:    "Minutes after",
+			name:    "Minute after",
 			t1:      Time{23, 59, true},
 			t2:      Time{23, 45, true},
 			isAfter: true,
@@ -109,13 +109,13 @@ func TestAfter(t *testing.T) {
 			isAfter: false,
 		},
 		{
-			name:    "Before",
-			t1:      Time{23, 59, true},
+			name:    "Hour before",
+			t1:      Time{22, 59, true},
 			t2:      Time{23, 59, true},
 			isAfter: false,
 		},
 		{
-			name:    "Before",
+			name:    "Minute before",
 			t1:      Time{11, 59, true},
 			t2:      Time{23, 59, true},
 			isAfter: false,
@@ -130,6 +130,52 @@ func TestAfter(t *testing.T) {
 	}
 }
 
+func TestBefore(t *testing.T) {
+	cases := []struct {
+		name    string
+		t1, t2  Time
+		isBefore bool
+	}{
+		{
+			name:    "Hour after",
+			t1:      Time{23, 59, true},
+			t2:      Time{22, 59, true},
+			isBefore: false,
+		},
+		{
+			name:    "Minute after",
+			t1:      Time{23, 59, true},
+			t2:      Time{23, 45, true},
+			isBefore: false,
+		},
+		{
+			name:    "Equal",
+			t1:      Time{23, 59, true},
+			t2:      Time{23, 59, true},
+			isBefore: false,
+		},
+		{
+			name:    "Hour before",
+			t1:      Time{22, 59, true},
+			t2:      Time{23, 59, true},
+			isBefore: true,
+		},
+		{
+			name:    "Minute before",
+			t1:      Time{11, 59, true},
+			t2:      Time{23, 59, true},
+			isBefore: true,
+		},
+	}
+	for _, tt := range cases {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.t1.Before(tt.t2) != tt.isBefore {
+				t.Errorf("expected isBefore %v, got %v", tt.isBefore, tt.t1.Before(tt.t2))
+			}
+		})
+	}
+}
+
 func TestSubtract(t *testing.T) {
 	cases := []struct {
 		name   string