From 047c90466df19c7bda7643dfe16c01fc289df0bc Mon Sep 17 00:00:00 2001
From: John Guo <john@johng.cn>
Date: Mon, 4 Jul 2022 21:18:20 +0800
Subject: [PATCH] improve UT for package gcron (#1966)

---
 .github/workflows/gf.yml      |  4 +++-
 internal/utils/utils_debug.go |  5 +++++
 os/gcron/gcron_schedule.go    | 41 +++++++++++++++++------------------
 os/gcron/gcron_z_unit_test.go | 14 +++++++++---
 4 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/gf.yml b/.github/workflows/gf.yml
index 6079e1f49..72ba148de 100644
--- a/.github/workflows/gf.yml
+++ b/.github/workflows/gf.yml
@@ -6,6 +6,7 @@ on:
     branches:
     - master
     - develop
+    - personal/**
     - feature/**
     - fix/**
 
@@ -13,11 +14,12 @@ on:
     branches:
     - master
     - develop
+    - personal/**
     - feature/**
     - fix/**
 
 env:
-  GF_DEBUG: 0
+  TZ: "Asia/Shanghai"
 
 
 jobs:
diff --git a/internal/utils/utils_debug.go b/internal/utils/utils_debug.go
index 0b2fc17e6..c5c36e2ab 100644
--- a/internal/utils/utils_debug.go
+++ b/internal/utils/utils_debug.go
@@ -39,3 +39,8 @@ func init() {
 func IsDebugEnabled() bool {
 	return isDebugEnabled
 }
+
+// SetDebugEnabled enables/disables the internal debug info.
+func SetDebugEnabled(enabled bool) {
+	isDebugEnabled = enabled
+}
diff --git a/os/gcron/gcron_schedule.go b/os/gcron/gcron_schedule.go
index 5121602b8..231472920 100644
--- a/os/gcron/gcron_schedule.go
+++ b/os/gcron/gcron_schedule.go
@@ -275,28 +275,27 @@ func (s *cronSchedule) checkMeetAndUpdateLastSeconds(t time.Time) bool {
 			return diff%s.every == 0
 		}
 		return false
-	} else {
-		// It checks using normal cron pattern.
-		if _, ok := s.second[s.getFixedSecond(t)]; !ok {
-			return false
-		}
-		if _, ok := s.minute[t.Minute()]; !ok {
-			return false
-		}
-		if _, ok := s.hour[t.Hour()]; !ok {
-			return false
-		}
-		if _, ok := s.day[t.Day()]; !ok {
-			return false
-		}
-		if _, ok := s.month[int(t.Month())]; !ok {
-			return false
-		}
-		if _, ok := s.week[int(t.Weekday())]; !ok {
-			return false
-		}
-		return true
 	}
+	// It checks using normal cron pattern.
+	if _, ok := s.second[s.getFixedSecond(t)]; !ok {
+		return false
+	}
+	if _, ok := s.minute[t.Minute()]; !ok {
+		return false
+	}
+	if _, ok := s.hour[t.Hour()]; !ok {
+		return false
+	}
+	if _, ok := s.day[t.Day()]; !ok {
+		return false
+	}
+	if _, ok := s.month[int(t.Month())]; !ok {
+		return false
+	}
+	if _, ok := s.week[int(t.Weekday())]; !ok {
+		return false
+	}
+	return true
 }
 
 // getFixedSecond checks, fixes and returns the seconds that have delay in some seconds.
diff --git a/os/gcron/gcron_z_unit_test.go b/os/gcron/gcron_z_unit_test.go
index a4b234f7c..54e90f44d 100644
--- a/os/gcron/gcron_z_unit_test.go
+++ b/os/gcron/gcron_z_unit_test.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/internal/utils"
 	"github.com/gogf/gf/v2/os/gcron"
-	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/test/gtest"
 )
 
@@ -89,9 +89,15 @@ func TestCron_Remove(t *testing.T) {
 }
 
 func TestCron_Add_FixedPattern(t *testing.T) {
+	debug := utils.IsDebugEnabled()
+	utils.SetDebugEnabled(true)
+	defer func() {
+		utils.SetDebugEnabled(debug)
+	}()
+
 	gtest.C(t, func(t *gtest.T) {
 		var (
-			now     = gtime.Now()
+			now     = time.Now()
 			cron    = gcron.New()
 			array   = garray.New(true)
 			seconds = (now.Second() + 2) % 60
@@ -100,11 +106,13 @@ func TestCron_Add_FixedPattern(t *testing.T) {
 				seconds, now.Minute(), now.Hour(), now.Day(), now.Month(), now.Weekday().String(),
 			)
 		)
+		cron.SetLogger(g.Log())
+		g.Log().Debugf(ctx, `pattern: %s`, pattern)
 		_, err := cron.Add(ctx, pattern, func(ctx context.Context) {
 			array.Append(1)
 		})
 		t.AssertNil(err)
-		time.Sleep(2500 * time.Millisecond)
+		time.Sleep(2800 * time.Millisecond)
 		t.Assert(array.Len(), 1)
 	})
 }