From 22fc0e3bf8bcd651609cfac385ded4799c334ea1 Mon Sep 17 00:00:00 2001 From: Brad Rydzewski Date: Wed, 21 Oct 2015 17:17:29 -0700 Subject: [PATCH] improved database coverage, including feed coverage --- store/datastore/nodes_test.go | 17 ++++++++ store/datastore/repos.go | 2 +- store/datastore/repos_test.go | 77 ++++++++++++++++++++++++----------- 3 files changed, 71 insertions(+), 25 deletions(-) diff --git a/store/datastore/nodes_test.go b/store/datastore/nodes_test.go index 76fae1d03..622bf9c7f 100644 --- a/store/datastore/nodes_test.go +++ b/store/datastore/nodes_test.go @@ -84,6 +84,23 @@ func Test_nodestore(t *testing.T) { g.Assert(len(nodes)).Equal(2) }) + g.It("Should count nodes", func() { + node1 := model.Node{ + Addr: "unix:///var/run/docker/docker.sock", + Arch: "linux_amd64", + } + node2 := model.Node{ + Addr: "unix:///var/run/docker.sock", + Arch: "linux_386", + } + s.Nodes().Create(&node1) + s.Nodes().Create(&node2) + + count, err := s.Nodes().Count() + g.Assert(err == nil).IsTrue() + g.Assert(count).Equal(2) + }) + g.It("Should delete a node", func() { node := model.Node{ Addr: "unix:///var/run/docker/docker.sock", diff --git a/store/datastore/repos.go b/store/datastore/repos.go index f71bfe5e7..85312bdad 100644 --- a/store/datastore/repos.go +++ b/store/datastore/repos.go @@ -82,7 +82,7 @@ ORDER BY repo_full_name const repoListOfQuery = ` SELECT * FROM repos -WHERE repo_full_name IN (" + stmt + ") +WHERE repo_full_name IN (%s) ORDER BY repo_name ` diff --git a/store/datastore/repos_test.go b/store/datastore/repos_test.go index 95c431cef..e1a2b94e7 100644 --- a/store/datastore/repos_test.go +++ b/store/datastore/repos_test.go @@ -87,30 +87,59 @@ func Test_repostore(t *testing.T) { g.Assert(repo.Name).Equal(getrepo.Name) }) - // g.It("Should Get a Repo List by User", func() { - // repo1 := model.Repo{ - // UserID: 1, - // FullName: "bradrydzewski/drone", - // Owner: "bradrydzewski", - // Name: "drone", - // } - // repo2 := model.Repo{ - // UserID: 1, - // FullName: "bradrydzewski/drone-dart", - // Owner: "bradrydzewski", - // Name: "drone-dart", - // } - // s.Repos().Create(&repo1) - // s.Repos().Create(&repo2) - // CreateBuild(db, &Build{RepoID: repo1.ID, Author: "bradrydzewski"}) - // CreateBuild(db, &Build{RepoID: repo1.ID, Author: "johnsmith"}) - // repos, err := GetRepoList(db, &User{ID: 1, Login: "bradrydzewski"}) - // g.Assert(err == nil).IsTrue() - // g.Assert(len(repos)).Equal(1) - // g.Assert(repos[0].UserID).Equal(repo1.UserID) - // g.Assert(repos[0].Owner).Equal(repo1.Owner) - // g.Assert(repos[0].Name).Equal(repo1.Name) - // }) + g.It("Should Get a Repo List", func() { + repo1 := &model.Repo{ + UserID: 1, + Owner: "bradrydzewski", + Name: "drone", + FullName: "bradrydzewski/drone", + } + repo2 := &model.Repo{ + UserID: 2, + Owner: "drone", + Name: "drone", + FullName: "drone/drone", + } + repo3 := &model.Repo{ + UserID: 2, + Owner: "octocat", + Name: "hello-world", + FullName: "octocat/hello-world", + } + s.Repos().Create(repo1) + s.Repos().Create(repo2) + s.Repos().Create(repo3) + + repos, err := s.Repos().GetListOf([]*model.RepoLite{ + {FullName: "bradrydzewski/drone"}, + {FullName: "drone/drone"}, + }) + g.Assert(err == nil).IsTrue() + g.Assert(len(repos)).Equal(2) + g.Assert(repos[0].ID).Equal(repo1.ID) + g.Assert(repos[1].ID).Equal(repo2.ID) + }) + + g.It("Should Get a Repo List", func() { + repo1 := &model.Repo{ + UserID: 1, + Owner: "bradrydzewski", + Name: "drone", + FullName: "bradrydzewski/drone", + } + repo2 := &model.Repo{ + UserID: 2, + Owner: "drone", + Name: "drone", + FullName: "drone/drone", + } + s.Repos().Create(repo1) + s.Repos().Create(repo2) + + count, err := s.Repos().Count() + g.Assert(err == nil).IsTrue() + g.Assert(count).Equal(2) + }) g.It("Should Delete a Repo", func() { repo := model.Repo{