From 49289f2237dafce5ad7fa96e3a7e2b68286e2895 Mon Sep 17 00:00:00 2001 From: kcrodgers24 Date: Mon, 22 Nov 2021 13:53:41 -0800 Subject: [PATCH] replace fmt.Print with t.Fatal, and improve date generator --- qa/simulacraData/simulacra_data.go | 28 +++++++------------------ qa/simulacraData/simulacra_data_test.go | 15 +++++++------ 2 files changed, 14 insertions(+), 29 deletions(-) diff --git a/qa/simulacraData/simulacra_data.go b/qa/simulacraData/simulacra_data.go index 656c02211..1e1656a95 100644 --- a/qa/simulacraData/simulacra_data.go +++ b/qa/simulacraData/simulacra_data.go @@ -25,6 +25,7 @@ import ( "math/rand" "os" "strconv" + "time" "github.com/pkg/errors" ) @@ -349,28 +350,13 @@ func countryField() error { } func generateDate() string { - // generates a random date in format YYYY-MM-DDT00:00 - // does not include leap days or populate the hour/minute time - year := strconv.Itoa(rand.Intn(20) + 2002) // year range 2002-2021 - month := rand.Intn(12) + 1 - day := rand.Intn(30) + 1 + // Nov 22, 2021 = 1637616960 + // twenty years = 631138520 + // date min = 1006478440 + date := rand.Int63n(631138520) + 1006478440 - if month == 2 && day >= 29 { - day = 28 - } - if month == 4 && day == 31 { - day = 30 - } - if month == 6 && day == 31 { - day = 30 - } - if month == 11 && day == 31 { - day = 30 - } - - monthFix := fmt.Sprintf("%02d", month) - dayFix := fmt.Sprintf("%02d", day) - YMDstring := year + "-" + monthFix + "-" + dayFix + "T00:00" + t := time.Unix(date, 0) + YMDstring := t.Format("2006-01-02T15:04") return YMDstring } diff --git a/qa/simulacraData/simulacra_data_test.go b/qa/simulacraData/simulacra_data_test.go index 0620e54bc..17dc8b623 100644 --- a/qa/simulacraData/simulacra_data_test.go +++ b/qa/simulacraData/simulacra_data_test.go @@ -14,55 +14,54 @@ package main import ( - "fmt" "testing" ) func TestAge(t *testing.T) { err := ageField() if err != nil { - fmt.Printf("%v", err) + t.Fatalf("%v", err) } } func TestIP(t *testing.T) { err := ipField() if err != nil { - fmt.Printf("%v", err) + t.Fatalf("%v", err) } } func TestIndentifer(t *testing.T) { err := arbIdField() if err != nil { - fmt.Printf("%v", err) + t.Fatalf("%v", err) } } func TestOptIn(t *testing.T) { err := optInField() if err != nil { - fmt.Printf("%v", err) + t.Fatalf("%v", err) } } func TestCountry(t *testing.T) { err := countryField() if err != nil { - fmt.Printf("%v", err) + t.Fatalf("%v", err) } } func TestTime(t *testing.T) { err := timeField() if err != nil { - fmt.Printf("%v", err) + t.Fatalf("%v", err) } } func TestGenerateDate(t *testing.T) { testDate := generateDate() if testDate == "" { - fmt.Printf("error generating date") + t.Fatalf("error generating date") } }