[trafficcontrol] branch master updated: Fix Origins TO API tests

[ocket8888]

This is an automated email from the ASF dual-hosted git repository.

ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
     new ff216a8  Fix Origins TO API tests
ff216a8 is described below

commit ff216a808cf8dd52f25991e54d04b0d65cbb34d9
Author: Rawlin Peters <rawlin_pet...@comcast.com>
AuthorDate: Tue Aug 13 09:57:55 2019 -0600

    Fix Origins TO API tests
    
    The offset/limit/page query parameters should be paired with orderby for
    determinate results.
---
 traffic_ops/testing/api/v14/origins_test.go | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/traffic_ops/testing/api/v14/origins_test.go 
b/traffic_ops/testing/api/v14/origins_test.go
index 7f527eb..57fd0c3 100644
--- a/traffic_ops/testing/api/v14/origins_test.go
+++ b/traffic_ops/testing/api/v14/origins_test.go
@@ -154,34 +154,43 @@ func OriginTenancyTest(t *testing.T) {
 }
 
 func VerifyPaginationSupport(t *testing.T) {
-       origins, _, err := TOSession.GetOrigins()
+       origins, _, err := TOSession.GetOriginsByQueryParams("?orderby=id")
        if err != nil {
                t.Fatalf("cannot GET origins: %v\n", err)
        }
 
-       originsWithLimit, _, err := 
TOSession.GetOriginsByQueryParams("?limit=1")
+       originsWithLimit, _, err := 
TOSession.GetOriginsByQueryParams("?orderby=id&limit=1")
        if !reflect.DeepEqual(origins[:1], originsWithLimit) {
                t.Errorf("expected GET origins with limit = 1 to return first 
result")
        }
 
-       originsWithOffset, _, err := 
TOSession.GetOriginsByQueryParams("?limit=1&offset=1")
+       originsWithOffset, _, err := 
TOSession.GetOriginsByQueryParams("?orderby=id&limit=1&offset=1")
        if !reflect.DeepEqual(origins[1:2], originsWithOffset) {
                t.Errorf("expected GET origins with limit = 1, offset = 1 to 
return second result")
        }
 
-       originsWithPage, _, err := 
TOSession.GetOriginsByQueryParams("?limit=1&page=2")
+       originsWithPage, _, err := 
TOSession.GetOriginsByQueryParams("?orderby=id&limit=1&page=2")
        if !reflect.DeepEqual(origins[1:2], originsWithPage) {
                t.Errorf("expected GET origins with limit = 1, page = 2 to 
return second result")
        }
 
-       if _, _, err := TOSession.GetOriginsByQueryParams("?limit=0"); 
!strings.Contains(err.Error(), "must be a positive integer") {
-               t.Errorf("expected GET origins to return an error when limit is 
not a positive integer: " + err.Error())
+       _, _, err = TOSession.GetOriginsByQueryParams("?limit=0")
+       if err == nil {
+               t.Errorf("expected GET origins to return an error when limit is 
not a positive integer")
+       } else if !strings.Contains(err.Error(), "must be a positive integer") {
+               t.Errorf("expected GET origins to return an error for limit is 
not a positive integer, actual error: " + err.Error())
        }
-       if _, _, err := TOSession.GetOriginsByQueryParams("?limit=1&offset=0"); 
!strings.Contains(err.Error(), "must be a positive integer") {
-               t.Errorf("expected GET origins to return an error when offset 
is not a positive integer: " + err.Error())
+       _, _, err = TOSession.GetOriginsByQueryParams("?limit=1&offset=0")
+       if err == nil {
+               t.Errorf("expected GET origins to return an error when offset 
is not a positive integer")
+       } else if !strings.Contains(err.Error(), "must be a positive integer") {
+               t.Errorf("expected GET origins to return an error for offset is 
not a positive integer, actual error: " + err.Error())
        }
-       if _, _, err := TOSession.GetOriginsByQueryParams("?limit=1&page=0"); 
!strings.Contains(err.Error(), "must be a positive integer") {
-               t.Errorf("expected GET origins to return an error when page is 
not a positive integer: " + err.Error())
+       _, _, err = TOSession.GetOriginsByQueryParams("?limit=1&page=0")
+       if err == nil {
+               t.Errorf("expected GET origins to return an error when page is 
not a positive integer")
+       } else if !strings.Contains(err.Error(), "must be a positive integer") {
+               t.Errorf("expected GET origins to return an error for page is 
not a positive integer, actual error: " + err.Error())
        }
 }