Merge pull request #3 from pankona/2_some_time_not_appear

[#2] fix time comparison to judge the time is later or not

Author: sassy

main.go

@@ -26,7 +26,11 @@ func (time *Time) toString() string {
 	}
 }
 
-func departureTime(departure string) (int, int) {
+func (t1 *Time) isLaterThan(t2 Time) bool {
+	return t1.hour > t2.hour || (t1.hour == t2.hour && t1.minute > t2.minute)
+}
+
+func departureTime(departure string) Time {
 	ret, _ := regexp.MatchString("^[0-9]{1,2}:[0-9]{1,2}$", departure)
 	var hour int
 	var minute int
@@ -49,7 +53,7 @@ func departureTime(departure string) (int, int) {
 		hour = now.Hour()
 		minute = now.Minute()
 	}
-	return hour, minute
+	return Time{hour, minute}
 }
 
 func getTimeTableUrl() string {
@@ -101,7 +105,7 @@ func main() {
 		os.Exit(2)
 	}
 
-	hour, minute := departureTime(departure)
+	departureTime := departureTime(departure)
 	timetable := createTimetable()
 
 	if isLast {
@@ -113,7 +117,7 @@ func main() {
 	result := make([]string, 0, numOfResult)
 	for i := 0; i < len(timetable); i++ {
 		v := timetable[i]
-		if v.minute > minute && v.hour >= hour {
+		if v.isLaterThan(departureTime) {
 			timeStr := v.toString()
 			result = append(result, timeStr)
 			if len(result) >= numOfResult {

main_test.go

@@ -6,89 +6,61 @@ import (
 )
 
 func TestDepartureTime(t *testing.T) {
-	hour, minutes := departureTime("10:30")
-	expected_hour := 10
-	expected_minutes := 30
-	if hour != expected_hour {
-		t.Errorf("got %v\nwant %v", hour, expected_hour)
-	}
-	if minutes != expected_minutes {
-		t.Error("got %v\nwant %v", minutes, expected_minutes)
+	deptime := departureTime("10:30")
+	expected_time := Time{10, 30}
+	if deptime != expected_time {
+		t.Errorf("got %v\nwant %v", deptime, expected_time)
 	}
 }
 
 func TestDepartureTime2(t *testing.T) {
-	hour, minutes := departureTime("0:0")
-	expected_hour := 0
-	expected_minutes := 0
-	if hour != expected_hour {
-		t.Errorf("got %v\nwant %v", hour, expected_hour)
-	}
-	if minutes != expected_minutes {
-		t.Error("got %v\nwant %v", minutes, expected_minutes)
+	deptime := departureTime("0:0")
+	expected_time := Time{0, 0}
+	if deptime != expected_time {
+		t.Errorf("got %v\nwant %v", deptime, expected_time)
 	}
 }
 
 func TestDepartureTime3(t *testing.T) {
-	hour, minutes := departureTime("00:00")
-	expected_hour := 0
-	expected_minutes := 0
-	if hour != expected_hour {
-		t.Errorf("got %v\nwant %v", hour, expected_hour)
-	}
-	if minutes != expected_minutes {
-		t.Errorf("got %v\nwant %v", minutes, expected_minutes)
+	deptime := departureTime("00:00")
+	expected_time := Time{0, 0}
+	if deptime != expected_time {
+		t.Errorf("got %v\nwant %v", deptime, expected_time)
 	}
 }
 
 func TestDepartureTime4(t *testing.T) {
-	hour, minutes := departureTime("23:59")
-	expected_hour := 23
-	expected_minutes := 59
-	if hour != expected_hour {
-		t.Errorf("got %v\nwant %v", hour, expected_hour)
-	}
-	if minutes != expected_minutes {
-		t.Errorf("got %v\nwant %v", minutes, expected_minutes)
+	deptime := departureTime("23:59")
+	expected_time := Time{23, 59}
+	if deptime != expected_time {
+		t.Errorf("got %v\nwant %v", deptime, expected_time)
 	}
 }
 
 func TestDepartureTime5(t *testing.T) {
-	hour, minutes := departureTime("44:30")
+	deptime := departureTime("44:30")
 	now := time.Now()
-	expected_hour := now.Hour()
-	expected_minutes := now.Minute()
-	if hour != expected_hour {
-		t.Errorf("got %v\nwant %v", hour, expected_hour)
-	}
-	if minutes != expected_minutes {
-		t.Errorf("got %v\nwant %v", minutes, expected_minutes)
+	expected_time := Time{now.Hour(), now.Minute()}
+	if deptime != expected_time {
+		t.Errorf("got %v\nwant %v", deptime, expected_time)
 	}
 }
 
 func TestDepartureTime6(t *testing.T) {
-	hour, minutes := departureTime("24:30")
+	deptime := departureTime("24:30")
 	now := time.Now()
-	expected_hour := now.Hour()
-	expected_minutes := now.Minute()
-	if hour != expected_hour {
-		t.Errorf("got %v\nwant %v", hour, expected_hour)
-	}
-	if minutes != expected_minutes {
-		t.Errorf("got %v\nwant %v", minutes, expected_minutes)
+	expected_time := Time{now.Hour(), now.Minute()}
+	if deptime != expected_time {
+		t.Errorf("got %v\nwant %v", deptime, expected_time)
 	}
 }
 
 func TestDepartureTime7(t *testing.T) {
-	hour, minutes := departureTime("12:60")
+	deptime := departureTime("12:60")
 	now := time.Now()
-	expected_hour := now.Hour()
-	expected_minutes := now.Minute()
-	if hour != expected_hour {
-		t.Errorf("got %v\nwant %v", hour, expected_hour)
-	}
-	if minutes != expected_minutes {
-		t.Errorf("got %v\nwant %v", minutes, expected_minutes)
+	expected_time := Time{now.Hour(), now.Minute()}
+	if deptime != expected_time {
+		t.Errorf("got %v\nwant %v", deptime, expected_time)
 	}
 }