Split go.mod for test

winebarrel · Nov 9, 2024 · ae67d39 · ae67d39
1 parent dd6c384
commit ae67d39
Show file tree

Hide file tree

Showing 28 changed files with 53 additions and 27 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ lint:
 
 .PHONY: test
 test:
-	go test ./...
+	cd test && go test -v ./...
 
 .PHONY: clean
 clean:

diff --git a/cmd/crongrep/go.mod b/cmd/crongrep/go.mod
@@ -1,6 +1,8 @@
 module github.com/winebarrel/cronplan/cmd/crongrep
 
-go 1.23.0
+go 1.21
+
+toolchain go1.21.1
 
 replace github.com/winebarrel/cronplan => ../..
 

diff --git a/cmd/cronmatch/go.mod b/cmd/cronmatch/go.mod
@@ -1,6 +1,8 @@
 module github.com/winebarrel/cronplan/cmd/cronmatch
 
-go 1.23.0
+go 1.21
+
+toolchain go1.21.1
 
 replace github.com/winebarrel/cronplan => ../..
 

diff --git a/cmd/cronplan/go.mod b/cmd/cronplan/go.mod
@@ -1,6 +1,8 @@
 module github.com/winebarrel/cronplan/cmd/cronplan
 
-go 1.23.0
+go 1.21
+
+toolchain go1.21.1
 
 replace github.com/winebarrel/cronplan => ../..
 

diff --git a/cmd/cronviz/go.mod b/cmd/cronviz/go.mod
@@ -1,6 +1,8 @@
 module github.com/winebarrel/cronplan/cmd/cronviz
 
-go 1.23.0
+go 1.21
+
+toolchain go1.21.1
 
 replace github.com/winebarrel/cronplan => ../..
 

diff --git a/go.mod b/go.mod
@@ -4,13 +4,4 @@ go 1.21
 
 toolchain go1.21.1
 
-require (
-	github.com/alecthomas/participle/v2 v2.1.1
-	github.com/stretchr/testify v1.9.0
-)
-
-require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)
+require github.com/alecthomas/participle/v2 v2.1.1
diff --git a/go.sum b/go.sum
@@ -4,15 +4,5 @@ github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6i
 github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c=
 github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
 github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/between_test.go → test/cronplan/between_test.go b/between_test.go → test/cronplan/between_test.go
diff --git a/match_day_of_month_test.go → test/cronplan/match_day_of_month_test.go b/match_day_of_month_test.go → test/cronplan/match_day_of_month_test.go
diff --git a/match_day_of_week_test.go → test/cronplan/match_day_of_week_test.go b/match_day_of_week_test.go → test/cronplan/match_day_of_week_test.go
diff --git a/match_hour_test.go → test/cronplan/match_hour_test.go b/match_hour_test.go → test/cronplan/match_hour_test.go
diff --git a/match_intg_test.go → test/cronplan/match_intg_test.go b/match_intg_test.go → test/cronplan/match_intg_test.go
diff --git a/match_minute_test.go → test/cronplan/match_minute_test.go b/match_minute_test.go → test/cronplan/match_minute_test.go
diff --git a/match_month_test.go → test/cronplan/match_month_test.go b/match_month_test.go → test/cronplan/match_month_test.go
diff --git a/match_year_test.go → test/cronplan/match_year_test.go b/match_year_test.go → test/cronplan/match_year_test.go
diff --git a/next_test.go → test/cronplan/next_test.go b/next_test.go → test/cronplan/next_test.go
diff --git a/parse_day_of_month_test.go → test/cronplan/parse_day_of_month_test.go b/parse_day_of_month_test.go → test/cronplan/parse_day_of_month_test.go
diff --git a/parse_day_of_week_test.go → test/cronplan/parse_day_of_week_test.go b/parse_day_of_week_test.go → test/cronplan/parse_day_of_week_test.go
diff --git a/parse_hours_test.go → test/cronplan/parse_hours_test.go b/parse_hours_test.go → test/cronplan/parse_hours_test.go
diff --git a/parse_intg_test.go → test/cronplan/parse_intg_test.go b/parse_intg_test.go → test/cronplan/parse_intg_test.go
@@ -53,7 +53,7 @@ func nwday(i int) *cronplan.NearestWeekday {
 }
 
 func lastw(i time.Weekday) *cronplan.LastDayOfWeek {
-	v := cronplan.LastDayOfWeek{wday(i)}
+	v := cronplan.LastDayOfWeek{Wday: wday(i)}
 	return &v
 }
 

diff --git a/parse_minutes_test.go → test/cronplan/parse_minutes_test.go b/parse_minutes_test.go → test/cronplan/parse_minutes_test.go
diff --git a/parse_month_test.go → test/cronplan/parse_month_test.go b/parse_month_test.go → test/cronplan/parse_month_test.go
diff --git a/parse_year_test.go → test/cronplan/parse_year_test.go b/parse_year_test.go → test/cronplan/parse_year_test.go
diff --git a/string_test.go → test/cronplan/string_test.go b/string_test.go → test/cronplan/string_test.go
@@ -224,7 +224,7 @@ func TestLastOfWeekToString(t *testing.T) {
 	assert := assert.New(t)
 
 	for w, s := range tt {
-		x := cronplan.LastDayOfWeek{wday(w)}
+		x := cronplan.LastDayOfWeek{Wday: wday(w)}
 		assert.Equal(s+"L", x.String())
 	}
 }

diff --git a/test/go.mod b/test/go.mod
@@ -0,0 +1,19 @@
+module github.com/winebarrel/cronplan/test
+
+go 1.21
+
+toolchain go1.21.1
+
+replace github.com/winebarrel/cronplan => ..
+
+require (
+	github.com/stretchr/testify v1.9.0
+	github.com/winebarrel/cronplan v0.0.0-00010101000000-000000000000
+)
+
+require (
+	github.com/alecthomas/participle/v2 v2.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
diff --git a/test/go.sum b/test/go.sum
@@ -0,0 +1,18 @@
+github.com/alecthomas/assert/v2 v2.3.0 h1:mAsH2wmvjsuvyBvAmCtm7zFsBlb8mIHx5ySLVdDZXL0=
+github.com/alecthomas/assert/v2 v2.3.0/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
+github.com/alecthomas/participle/v2 v2.1.1 h1:hrjKESvSqGHzRb4yW1ciisFJ4p3MGYih6icjJvbsmV8=
+github.com/alecthomas/participle/v2 v2.1.1/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c=
+github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
+github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
+github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/internal/util/date_test.go → test/util/date_test.go b/internal/util/date_test.go → test/util/date_test.go
diff --git a/internal/util/list_test.go → test/util/list_test.go b/internal/util/list_test.go → test/util/list_test.go