14287: Propagate "distinct" param.

[arvados.git] / lib / controller / router / router_test.go

diff --git a/lib/controller/router/router_test.go b/lib/controller/router/router_test.go
index b3d5c9add6331e6800f707afa08866cc4be34696..f4617595397534fc5b9c661975fc09ff55076ccd 100644 (file)
--- a/lib/controller/router/router_test.go
+++ b/lib/controller/router/router_test.go
@@ -11,6 +11,7 @@ import (
        "net/http"
        "net/http/httptest"
        "os"
+       "strings"
        "testing"
        "time"
 
@@ -58,24 +59,53 @@ func (s *RouterSuite) doRequest(c *check.C, token, method, path string, hdrs htt
        return req, rw, jresp
 }
 
-func (s *RouterSuite) TestCollectionParams(c *check.C) {
+func (s *RouterSuite) TestCollectionResponses(c *check.C) {
        token := arvadostest.ActiveTokenV2
 
-       _, rw, jresp := s.doRequest(c, token, "GET", `/arvados/v1/collections?include_trash=true`, nil, nil)
-       c.Check(rw.Code, check.Equals, http.StatusOK)
-       c.Check(jresp["items_available"], check.FitsTypeOf, float64(0))
-
-       _, rw, jresp = s.doRequest(c, token, "GET", `/arvados/v1/collections`, nil, bytes.NewBufferString(`{"include_trash":true}`))
+       // Check "get collection" response has "kind" key
+       _, rw, jresp := s.doRequest(c, token, "GET", `/arvados/v1/collections`, nil, bytes.NewBufferString(`{"include_trash":true}`))
        c.Check(rw.Code, check.Equals, http.StatusOK)
        c.Check(jresp["items"], check.FitsTypeOf, []interface{}{})
+       c.Check(jresp["kind"], check.Equals, "arvados#collectionList")
+       c.Check(jresp["items"].([]interface{})[0].(map[string]interface{})["kind"], check.Equals, "arvados#collection")
+
+       // Check items in list response have a "kind" key regardless
+       // of whether a uuid/pdh is selected.
+       for _, selectj := range []string{
+               ``,
+               `,"select":["portable_data_hash"]`,
+               `,"select":["name"]`,
+               `,"select":["uuid"]`,
+       } {
+               _, rw, jresp = s.doRequest(c, token, "GET", `/arvados/v1/collections`, nil, bytes.NewBufferString(`{"where":{"uuid":["`+arvadostest.FooCollection+`"]}`+selectj+`}`))
+               c.Check(rw.Code, check.Equals, http.StatusOK)
+               c.Check(jresp["items"], check.FitsTypeOf, []interface{}{})
+               c.Check(jresp["items_available"], check.FitsTypeOf, float64(0))
+               c.Check(jresp["kind"], check.Equals, "arvados#collectionList")
+               item0 := jresp["items"].([]interface{})[0].(map[string]interface{})
+               c.Check(item0["kind"], check.Equals, "arvados#collection")
+               if selectj == "" || strings.Contains(selectj, "portable_data_hash") {
+                       c.Check(item0["portable_data_hash"], check.Equals, arvadostest.FooCollectionPDH)
+               } else {
+                       c.Check(item0["portable_data_hash"], check.IsNil)
+               }
+               if selectj == "" || strings.Contains(selectj, "name") {
+                       c.Check(item0["name"], check.FitsTypeOf, "")
+               } else {
+                       c.Check(item0["name"], check.IsNil)
+               }
+               if selectj == "" || strings.Contains(selectj, "uuid") {
+                       c.Check(item0["uuid"], check.Equals, arvadostest.FooCollection)
+               } else {
+                       c.Check(item0["uuid"], check.IsNil)
+               }
+       }
 
+       // Check "create collection" response has "kind" key
        _, rw, jresp = s.doRequest(c, token, "POST", `/arvados/v1/collections`, http.Header{"Content-Type": {"application/x-www-form-urlencoded"}}, bytes.NewBufferString(`ensure_unique_name=true`))
        c.Check(rw.Code, check.Equals, http.StatusOK)
        c.Check(jresp["uuid"], check.FitsTypeOf, "")
-
-       _, rw, jresp = s.doRequest(c, token, "POST", `/arvados/v1/collections?ensure_unique_name=true`, nil, nil)
-       c.Check(rw.Code, check.Equals, http.StatusOK)
-       c.Check(jresp["uuid"], check.FitsTypeOf, "")
+       c.Check(jresp["kind"], check.Equals, "arvados#collection")
 }
 
 func (s *RouterSuite) TestContainerList(c *check.C) {
@@ -165,6 +195,7 @@ func (s *RouterSuite) TestSelectParam(c *check.C) {
                _, rw, resp := s.doRequest(c, token, "GET", "/arvados/v1/containers/"+uuid+"?select="+string(j), nil, nil)
                c.Check(rw.Code, check.Equals, http.StatusOK)
 
+               c.Check(resp["kind"], check.Equals, "arvados#container")
                c.Check(resp["uuid"], check.HasLen, 27)
                c.Check(resp["command"], check.HasLen, 2)
                c.Check(resp["mounts"], check.IsNil)