grim/resticide

move run_tests to runner.go
develop
2015-11-05, Gary Kramlich
defe8693fb86
Parents 1972afe4841c
Children 9cd48c27c0ef
move run_tests to runner.go
3 files changed, 43 insertions(+), 38 deletions(-)
  • +1 -1
    main.go
  • +42 -0
    runner.go
  • +0 -37
    test.go
    • --- a/main.go Thu Nov 05 23:17:14 2015 -0600
    +++ b/main.go Thu Nov 05 23:31:25 2015 -0600
    @@ -20,5 +20,5 @@
    reporters := []Reporter{ConsoleReporter{*verbose}}
    - run_tests(tests, reporters)
    + RunTests(tests, reporters)
    }
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/runner.go Thu Nov 05 23:31:25 2015 -0600
    @@ -0,0 +1,42 @@
    +package main
    +
    +import (
    + "time"
    +)
    +
    +func RunTests(tests []Test, reporters []Reporter) error {
    + n_tests := len(tests)
    + passed := 0
    + failed := 0
    +
    + for _, reporter := range reporters {
    + reporter.Start(n_tests)
    + }
    +
    + for _, test := range tests {
    + for _, reporter := range reporters {
    + reporter.TestStart(test)
    + }
    +
    + test.Start = time.Now()
    + res := test.Run()
    + test.End = time.Now()
    + test.Duration = test.End.Sub(test.Start)
    +
    + if res.Passed {
    + passed++
    + } else {
    + failed++
    + }
    +
    + for _, reporter := range reporters {
    + reporter.TestFinish(test, res)
    + }
    + }
    +
    + for _, reporter := range reporters {
    + reporter.Finish(n_tests, passed, failed)
    + }
    +
    + return nil
    +}
    --- a/test.go Thu Nov 05 23:17:14 2015 -0600
    +++ b/test.go Thu Nov 05 23:31:25 2015 -0600
    @@ -119,40 +119,3 @@
    return test.Requests[0].compareResponse(resp)
    }
    -
    -func run_tests(tests []Test, reporters []Reporter) error {
    - n_tests := len(tests)
    - passed := 0
    - failed := 0
    -
    - for _, reporter := range reporters {
    - reporter.Start(n_tests)
    - }
    -
    - for _, test := range tests {
    - for _, reporter := range reporters {
    - reporter.TestStart(test)
    - }
    -
    - test.Start = time.Now()
    - res := test.Run()
    - test.End = time.Now()
    - test.Duration = test.End.Sub(test.Start)
    -
    - if res.Passed {
    - passed++
    - } else {
    - failed++
    - }
    -
    - for _, reporter := range reporters {
    - reporter.TestFinish(test, res)
    - }
    - }
    -
    - for _, reporter := range reporters {
    - reporter.Finish(n_tests, passed, failed)
    - }
    -
    - return nil
    -}