Skip to content

Update dependencies, use stdlib for testing #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jhebden-gl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update dependencies, use stdlib for testing #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 61 additions & 42 deletions dag_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,76 @@
package dag

import (
"reflect"
"testing"

"github.com/docker/docker/pkg/testutil/assert"
)

func TestConnectedComponentRoots(t *testing.T) {
assert.DeepEqual(t,
&Graph{
Nodes: []Node{0, 1, 2, 3},
Edges: []Edge{
{Depender: 2, Dependee: 0},
{Depender: 3, Dependee: 1},
},
}.ConnectedComponentRoots(), []Node{0, 1})
assert.DeepEqual(t,
&Graph{
Nodes: []Node{0, 1, 2, 3, 4, 5, 6},
Edges: []Edge{
{Depender: 2, Dependee: 0},
{Depender: 3, Dependee: 1},
{Depender: 4, Dependee: 2},
{Depender: 5, Dependee: 2},
{Depender: 6, Dependee: 5},
testConnectedComponentRoots1 := Graph{
Nodes: []Node{0, 1, 2, 3},
Edges: []Edge{
{Depender: 2, Dependee: 0},
{Depender: 3, Dependee: 1},
},
}
want1 := testConnectedComponentRoots1.ConnectedComponentRoots()
got1 := []Node{0, 1}
if !reflect.DeepEqual(
want1, got1) {
t.Errorf("testConnectedComponentRoots1: wanted: %v, got: %v", want1, got1)
}
testConnectedComponentRoots2 := Graph{
Nodes: []Node{0, 1, 2, 3, 4, 5, 6},
Edges: []Edge{
{Depender: 2, Dependee: 0},
{Depender: 3, Dependee: 1},
{Depender: 4, Dependee: 2},
{Depender: 5, Dependee: 2},
{Depender: 6, Dependee: 5},
},
}.ConnectedComponentRoots(), []Node{0, 1})
}
want2 := testConnectedComponentRoots2.ConnectedComponentRoots()
got2 := []Node{0, 1}
if !reflect.DeepEqual(
want2, got2) {
t.Errorf("testConnectedComponentRoots2: wanted: %v, got: %v", want2, got2)
}
}

func TestDirectDependers(t *testing.T) {
assert.DeepEqual(t,
&Graph{
Nodes: []Node{0, 1, 2, 3, 4, 5, 6},
Edges: []Edge{
{Depender: 2, Dependee: 0},
{Depender: 3, Dependee: 1},
{Depender: 4, Dependee: 2},
{Depender: 5, Dependee: 2},
{Depender: 6, Dependee: 5},
},
}.DirectDependers(2), []Node{4, 5})
testDirectDependers1 := Graph{
Nodes: []Node{0, 1, 2, 3, 4, 5, 6},
Edges: []Edge{
{Depender: 2, Dependee: 0},
{Depender: 3, Dependee: 1},
{Depender: 4, Dependee: 2},
{Depender: 5, Dependee: 2},
{Depender: 6, Dependee: 5},
},
}
want1 := testDirectDependers1.DirectDependers(2)
got1 := []Node{4, 5}
if !reflect.DeepEqual(
want1, got1) {
t.Errorf("testDirectDependers1: wanted: %v, got: %v", want1, got1)
}
}

func TestDirectDependees(t *testing.T) {
assert.DeepEqual(t,
&Graph{
Nodes: []Node{0, 1, 2, 3, 4, 5, 6},
Edges: []Edge{
{Depender: 2, Dependee: 0},
{Depender: 3, Dependee: 1},
{Depender: 4, Dependee: 2},
{Depender: 5, Dependee: 2},
{Depender: 6, Dependee: 5},
},
}.DirectDependees(2), []Node{0})
testDirectDependees := Graph{
Nodes: []Node{0, 1, 2, 3, 4, 5, 6},
Edges: []Edge{
{Depender: 2, Dependee: 0},
{Depender: 3, Dependee: 1},
{Depender: 4, Dependee: 2},
{Depender: 5, Dependee: 2},
{Depender: 6, Dependee: 5},
},
}
want1 := testDirectDependees.DirectDependees(2)
got1 := []Node{0}
if !reflect.DeepEqual(
want1, got1) {
t.Errorf("testDirectDependees1: wanted: %v, got: %v", want1, got1)
}
}
5 changes: 5 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module github.com/jhebden-gl/go-dag

go 1.23.3

require golang.org/x/sync v0.10.0
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
2 changes: 1 addition & 1 deletion scheduler/scheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"golang.org/x/sync/errgroup"

"github.com/AkihiroSuda/go-dag"
"github.com/jhebden-gl/go-dag"
)

// Callback is used for Execute
Expand Down
63 changes: 46 additions & 17 deletions scheduler/scheduler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import (
"testing"
"time"

"github.com/AkihiroSuda/go-dag"
"github.com/docker/docker/pkg/testutil/assert"
"github.com/jhebden-gl/go-dag"
)

const (
Expand Down Expand Up @@ -63,11 +62,21 @@ func testExecute0(t *testing.T, concurrency uint) {
took := time.Now().Sub(begun)
t.Logf("Took: %v (%2.2f%% of ideal)", took, 100*float64(took)/float64(ideal))

assert.Equal(t, len(got), 6)
assert.Equal(t, indexOf(got, 0) < indexOf(got, 2), true)
assert.Equal(t, indexOf(got, 2) < indexOf(got, 4), true)
assert.Equal(t, indexOf(got, 2) < indexOf(got, 5), true)
assert.Equal(t, indexOf(got, 1) < indexOf(got, 3), true)
if len(got) != 6 {
t.Errorf("testExecute0: length of results was not correct: %d", len(got))
}
if indexOf(got, 0) >= indexOf(got, 2) {
t.Errorf("testExecute0: indexOf node 0 not less than node 2: %d, %d", indexOf(got, 0), indexOf(got, 2))
}
if indexOf(got, 2) >= indexOf(got, 4) {
t.Errorf("testExecute0: indexOf node 2 not less than node 4: %d, %d", indexOf(got, 2), indexOf(got, 4))
}
if indexOf(got, 2) >= indexOf(got, 5) {
t.Errorf("testExecute0: indexOf node 2 not less than node 5: %d, %d", indexOf(got, 2), indexOf(got, 5))
}
if indexOf(got, 1) >= indexOf(got, 3) {
t.Errorf("testExecute0: indexOf node 1 not less than node 3: %d, %d", indexOf(got, 1), indexOf(got, 3))
}
}

func TestExecute1_0(t *testing.T) {
Expand Down Expand Up @@ -127,12 +136,24 @@ func testExecute1(t *testing.T, concurrency uint) {
took := time.Now().Sub(begun)
t.Logf("Took: %v (%2.2f%% of ideal)", took, 100*float64(took)/float64(ideal))

assert.Equal(t, len(got), 7)
assert.Equal(t, indexOf(got, 0) < indexOf(got, 2), true)
assert.Equal(t, indexOf(got, 2) < indexOf(got, 4), true)
assert.Equal(t, indexOf(got, 2) < indexOf(got, 5) && indexOf(got, 3) < indexOf(got, 5), true)
assert.Equal(t, indexOf(got, 1) < indexOf(got, 3), true)
assert.Equal(t, indexOf(got, 4) < indexOf(got, 6) && indexOf(got, 3) < indexOf(got, 6), true)
if len(got) != 7 {
t.Errorf("testExecute1: length of results was not correct: %d", len(got))
}
if indexOf(got, 0) >= indexOf(got, 2) {
t.Errorf("testExecute1: indexOf node 0 not less than node 2: %d, %d", indexOf(got, 0), indexOf(got, 2))
}
if indexOf(got, 2) >= indexOf(got, 4) {
t.Errorf("testExecute1: indexOf node 2 not less than node 4: %d, %d", indexOf(got, 2), indexOf(got, 4))
}
if indexOf(got, 2) >= indexOf(got, 5) || indexOf(got, 3) >= indexOf(got, 5) {
t.Errorf("testExecute1: indexOf node 2 not less than node 5 or indexOf node 3 not less than node 5: %d, %d + %d, %d", indexOf(got, 2), indexOf(got, 5), indexOf(got, 3), indexOf(got, 5))
}
if indexOf(got, 1) >= indexOf(got, 3) {
t.Errorf("testExecute1: indexOf node 1 not less than node 3: %d, %d", indexOf(got, 1), indexOf(got, 3))
}
if indexOf(got, 4) >= indexOf(got, 6) || indexOf(got, 3) >= indexOf(got, 6) {
t.Errorf("testExecute1: indexOf node 4 not less than node 6 or indexOf node 3 not less than node 6: %d, %d + %d, %d", indexOf(got, 4), indexOf(got, 5), indexOf(got, 3), indexOf(got, 6))
}
}

func TestExecute2_0(t *testing.T) {
Expand Down Expand Up @@ -188,8 +209,16 @@ func testExecute2(t *testing.T, concurrency uint) {
took := time.Now().Sub(begun)
t.Logf("Took: %v (%2.2f%% of ideal)", took, 100*float64(took)/float64(ideal))

assert.Equal(t, len(got), 5)
assert.Equal(t, indexOf(got, 42) < indexOf(got, 100) && indexOf(got, 42) < indexOf(got, 200), true)
assert.Equal(t, indexOf(got, 100) < indexOf(got, 101) && indexOf(got, 200) < indexOf(got, 101), true)
assert.Equal(t, indexOf(got, 101) < indexOf(got, 102) && indexOf(got, 200) < indexOf(got, 102), true)
if len(got) != 5 {
t.Errorf("testExecute2: length of results was not correct: %d", len(got))
}
if indexOf(got, 42) >= indexOf(got, 100) || indexOf(got, 42) >= indexOf(got, 200) {
t.Errorf("testExecute2: indexOf node 42 not less than node 100 or indexOf node 42 not less than node 200: %d, %d + %d, %d", indexOf(got, 42), indexOf(got, 100), indexOf(got, 42), indexOf(got, 200))
}
if indexOf(got, 100) >= indexOf(got, 101) || indexOf(got, 200) >= indexOf(got, 101) {
t.Errorf("testExecute2: indexOf node 100 not less than node 101 or indexOf node 200 not less than node 101: %d, %d + %d, %d", indexOf(got, 100), indexOf(got, 101), indexOf(got, 200), indexOf(got, 101))
}
if indexOf(got, 101) >= indexOf(got, 102) || indexOf(got, 200) >= indexOf(got, 102) {
t.Errorf("testExecute2: indexOf node 101 not less than node 102 or indexOf node 200 not less than node 102: %d, %d + %d, %d", indexOf(got, 101), indexOf(got, 102), indexOf(got, 200), indexOf(got, 101))
}
}
7 changes: 4 additions & 3 deletions scheduler/testutil_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import (
"testing"
"time"

"github.com/AkihiroSuda/go-dag"
"github.com/docker/docker/pkg/testutil/assert"
"github.com/jhebden-gl/go-dag"
)

func determineFakeWorkload(g *dag.Graph, maxSleep time.Duration, seed int64) map[dag.Node]time.Duration {
Expand Down Expand Up @@ -47,7 +46,9 @@ func testExecute(t *testing.T, g *dag.Graph, concurrency uint, workload map[dag.
c <- n
return nil
})
assert.NilError(t, err)
if err != nil {
t.Errorf("testExecute: returned error %v", err)
}
var got []dag.Node
for i := 0; i < len(g.Nodes); i++ {
n := <-c
Expand Down