From: Aleksander Mistewicz <a.mistewicz@samsung.com>
Date: Fri, 17 Nov 2017 15:50:40 +0000 (+0100)
Subject: Implement List with table driven tests
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71c843dcef4de9689b977dc99d40b0ab36faee6f;p=tools%2Fweles.git

Implement List with table driven tests

Change-Id: Ifccf613b89cb6a21d4229b15affb533c0bb95de4
Signed-off-by: Aleksander Mistewicz <a.mistewicz@samsung.com>
---

diff --git a/manager/dryad_job_manager.go b/manager/dryad_job_manager.go
index 5786870..3e0dcdb 100644
--- a/manager/dryad_job_manager.go
+++ b/manager/dryad_job_manager.go
@@ -64,11 +64,31 @@ func (d *DryadJobs) Cancel(job JobID) error {
 	return nil
 }
 
+// createStatusMatcher creates a matcher for DryadJobStatus.
+// It is a helper function of List.
+func createStatusMatcher(statuses []DryadJobStatus) func(DryadJobStatus) bool {
+	if len(statuses) == 0 {
+		return func(s DryadJobStatus) bool {
+			return true
+		}
+	}
+	m := make(map[DryadJobStatus]interface{})
+	for _, status := range statuses {
+		m[status] = nil
+	}
+	return func(s DryadJobStatus) bool {
+		_, ok := m[s]
+		return ok
+	}
+}
+
 // List is part of DryadJobManager interface.
 func (d *DryadJobs) List(filter *DryadJobFilter) ([]DryadJobInfo, error) {
+	d.jobsMutex.RLock()
+	defer d.jobsMutex.RUnlock()
+
+	// Trivial case - return all.
 	if filter == nil {
-		d.jobsMutex.RLock()
-		defer d.jobsMutex.RUnlock()
 		ret := make([]DryadJobInfo, 0, len(d.jobs))
 		for _, job := range d.jobs {
 			info := job.GetJobInfo()
@@ -76,6 +96,31 @@ func (d *DryadJobs) List(filter *DryadJobFilter) ([]DryadJobInfo, error) {
 		}
 		return ret, nil
 	}
-	// TODO(amistewicz): implement.
-	panic("not implemented")
+
+	ret := make([]DryadJobInfo, 0)
+	statusMatcher := createStatusMatcher(filter.Statuses)
+
+	// References undefined - check only Status.
+	if filter.References == nil {
+		for _, job := range d.jobs {
+			info := job.GetJobInfo()
+			if statusMatcher(info.Status) {
+				ret = append(ret, info)
+			}
+		}
+		return ret, nil
+	}
+
+	// References defined - iterate only over requested keys.
+	for _, id := range filter.References {
+		job, ok := d.jobs[id]
+		if !ok {
+			continue
+		}
+		info := job.GetJobInfo()
+		if statusMatcher(info.Status) {
+			ret = append(ret, info)
+		}
+	}
+	return ret, nil
 }
diff --git a/manager/dryad_job_manager_test.go b/manager/dryad_job_manager_test.go
index a242fe8..a543289 100644
--- a/manager/dryad_job_manager_test.go
+++ b/manager/dryad_job_manager_test.go
@@ -14,13 +14,15 @@
  *  limitations under the License
  */
 
-package manager_test
+package manager
 
 import (
+	"sync"
+
 	. "git.tizen.org/tools/weles"
-	. "git.tizen.org/tools/weles/manager"
 
 	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
 )
 
@@ -58,11 +60,101 @@ var _ = Describe("DryadJobManager", func() {
 		Expect(err).To(Equal(ErrNotExist))
 	})
 
-	It("should list created jobs", func() {
-		create()
+	Describe("list", func() {
+		var list []DryadJobInfo
 
-		list, err := djm.List(nil)
-		Expect(err).ToNot(HaveOccurred())
-		Expect(list).To(HaveLen(1))
+		createN := func(start, end int, status DryadJobStatus) {
+			dj := djm.(*DryadJobs)
+			for i := start; i <= end; i++ {
+				id := JobID(i)
+				info := DryadJobInfo{
+					Job:    id,
+					Status: status,
+				}
+				dj.jobs[id] = &dryadJob{
+					mutex: new(sync.Mutex),
+					info:  info,
+				}
+				list = append(list, info)
+			}
+		}
+
+		BeforeEach(func() {
+			list = make([]DryadJobInfo, 0, 11)
+			createN(0, 2, DJ_NEW)
+			createN(3, 5, DJ_DEPLOY)
+			createN(6, 8, DJ_BOOT)
+			createN(9, 11, DJ_TEST)
+		})
+
+		It("should list created jobs", func() {
+			l, err := djm.List(nil)
+			Expect(err).ToNot(HaveOccurred())
+			Expect(l).To(HaveLen(len(list)))
+		})
+
+		DescribeTable("list of jobs with status",
+			func(start, end int, s []DryadJobStatus) {
+				l, err := djm.List(&DryadJobFilter{
+					Statuses: s,
+				})
+				Expect(err).ToNot(HaveOccurred())
+				Expect(l).To(HaveLen(end - start + 1))
+				for _, j := range l {
+					Expect(s).To(ContainElement(j.Status))
+					Expect(j.Job).To(BeNumerically(">=", start))
+					Expect(j.Job).To(BeNumerically("<=", end))
+				}
+			},
+			Entry("NEW", 0, 2, []DryadJobStatus{DJ_NEW}),
+			Entry("DEPLOY", 3, 5, []DryadJobStatus{DJ_DEPLOY}),
+			Entry("BOOT", 6, 8, []DryadJobStatus{DJ_BOOT}),
+			Entry("TEST", 9, 11, []DryadJobStatus{DJ_TEST}),
+			Entry("NEW and DEPLOY", 0, 5, []DryadJobStatus{DJ_NEW, DJ_DEPLOY}),
+		)
+
+		DescribeTable("list of jobs with id",
+			func(ids []JobID, exp []int) {
+				l, err := djm.List(&DryadJobFilter{
+					References: ids,
+				})
+				Expect(err).ToNot(HaveOccurred())
+				Expect(l).To(HaveLen(len(exp)))
+				expected := make([]DryadJobInfo, 0)
+				for _, i := range exp {
+					expected = append(expected, list[i])
+				}
+				for _, j := range l {
+					Expect(expected).To(ContainElement(Equal(j)))
+				}
+			},
+			Entry("any - 0", []JobID{0}, []int{0}),
+			Entry("any - 10", []JobID{10}, []int{10}),
+			Entry("out of bounds - 128", []JobID{128}, []int{}),
+			Entry("many - 1 and 8", []JobID{1, 8}, []int{1, 8}),
+		)
+
+		DescribeTable("list of jobs with status and id",
+			func(filter DryadJobFilter, exp []int) {
+				l, err := djm.List(&filter)
+				Expect(err).ToNot(HaveOccurred())
+				Expect(l).To(HaveLen(len(exp)))
+				expected := make([]DryadJobInfo, 0)
+				for _, i := range exp {
+					expected = append(expected, list[i])
+				}
+				for _, j := range l {
+					Expect(expected).To(ContainElement(Equal(j)))
+				}
+			},
+			Entry("NEW - 2, 3", DryadJobFilter{
+				References: []JobID{2, 3},
+				Statuses:   []DryadJobStatus{DJ_NEW},
+			}, []int{2}),
+			Entry("NEW, TEST - 0, 6, 8, 10, 11", DryadJobFilter{
+				References: []JobID{0, 6, 8, 10, 11},
+				Statuses:   []DryadJobStatus{DJ_NEW, DJ_TEST},
+			}, []int{0, 10, 11}),
+		)
 	})
 })