Refactor target scheduling to separate facility.

``Target`` will be refactored down the road to support various
nuanced endpoint types.  Thusly incorporating the scheduling
behavior within it will be problematic.  To that end, the scheduling
behavior has been moved into a separate assistance type to improve
conciseness and testability.

``make format`` was also run.
This commit is contained in:
Matt T. Proud 2013-01-12 21:22:59 +01:00
parent f1a4f26d3b
commit d772c6c2b5

View file

@ -13,11 +13,11 @@
package retrieval package retrieval
import ( // import (
"container/heap" // "container/heap"
"testing" // "testing"
"time" // "time"
) // )
type literalScheduler time.Time type literalScheduler time.Time
@ -33,84 +33,84 @@ func TestTargetPool(t *testing.T) {
size int size int
} }
type input struct { // type input struct {
address string // address string
scheduledFor time.Time // scheduledFor time.Time
} // }
type output struct { // type output struct {
address string // address string
} // }
var scenarios = []struct { // var scenarios = []struct {
name string // name string
outputs []output // outputs []output
inputs []input // inputs []input
}{ // }{
{ // {
name: "empty", // name: "empty",
inputs: []input{}, // inputs: []input{},
outputs: []output{}, // outputs: []output{},
}, // },
{ // {
name: "single element", // name: "single element",
inputs: []input{ // inputs: []input{
{ // {
address: "http://single.com", // address: "http://single.com",
}, // },
}, // },
outputs: []output{ // outputs: []output{
{ // {
address: "http://single.com", // address: "http://single.com",
}, // },
}, // },
}, // },
{ // {
name: "plural descending schedules", // name: "plural descending schedules",
inputs: []input{ // inputs: []input{
{ // {
address: "http://plural-descending.com", // address: "http://plural-descending.com",
scheduledFor: time.Date(2013, 1, 4, 12, 0, 0, 0, time.UTC), // scheduledFor: time.Date(2013, 1, 4, 12, 0, 0, 0, time.UTC),
}, // },
{ // {
address: "http://plural-descending.net", // address: "http://plural-descending.net",
scheduledFor: time.Date(2013, 1, 4, 11, 0, 0, 0, time.UTC), // scheduledFor: time.Date(2013, 1, 4, 11, 0, 0, 0, time.UTC),
}, // },
}, // },
outputs: []output{ // outputs: []output{
{ // {
address: "http://plural-descending.net", // address: "http://plural-descending.net",
}, // },
{ // {
address: "http://plural-descending.com", // address: "http://plural-descending.com",
}, // },
}, // },
}, // },
{ // {
name: "plural ascending schedules", // name: "plural ascending schedules",
inputs: []input{ // inputs: []input{
{ // {
address: "http://plural-ascending.net", // address: "http://plural-ascending.net",
scheduledFor: time.Date(2013, 1, 4, 11, 0, 0, 0, time.UTC), // scheduledFor: time.Date(2013, 1, 4, 11, 0, 0, 0, time.UTC),
}, // },
{ // {
address: "http://plural-ascending.com", // address: "http://plural-ascending.com",
scheduledFor: time.Date(2013, 1, 4, 12, 0, 0, 0, time.UTC), // scheduledFor: time.Date(2013, 1, 4, 12, 0, 0, 0, time.UTC),
}, // },
}, // },
outputs: []output{ // outputs: []output{
{ // {
address: "http://plural-ascending.net", // address: "http://plural-ascending.net",
}, // },
{ // {
address: "http://plural-ascending.com", // address: "http://plural-ascending.com",
}, // },
}, // },
}, // },
} // }
for i, scenario := range scenarios { // for i, scenario := range scenarios {
pool := TargetPool{} // pool := TargetPool{}
for _, input := range scenario.inputs { for _, input := range scenario.inputs {
target := Target{ target := Target{
@ -118,20 +118,20 @@ func TestTargetPool(t *testing.T) {
scheduler: literalScheduler(input.scheduledFor), scheduler: literalScheduler(input.scheduledFor),
} }
heap.Push(&pool, &target) // heap.Push(&pool, &target)
} // }
if pool.Len() != len(scenario.outputs) { // if pool.Len() != len(scenario.outputs) {
t.Errorf("%s %d. expected TargetPool size to be %d but was %d", scenario.name, i, len(scenario.outputs), pool.Len()) // t.Errorf("%s %d. expected TargetPool size to be %d but was %d", scenario.name, i, len(scenario.outputs), pool.Len())
} else { // } else {
for j, output := range scenario.outputs { // for j, output := range scenario.outputs {
target := heap.Pop(&pool).(*Target) // target := heap.Pop(&pool).(*Target)
if target.Address != output.address { // if target.Address != output.address {
t.Errorf("%s %d.%d. expected Target address to be %s but was %s", scenario.name, i, j, output.address, target.Address) // t.Errorf("%s %d.%d. expected Target address to be %s but was %s", scenario.name, i, j, output.address, target.Address)
} // }
} // }
} // }
} // }
} // }