test: add assert for test cases (#613)

Co-authored-by: lixingwang <lixingwang@yiche.com>
apache · Aug 4, 2021 · 915a5d1 · 915a5d1
1 parent d12a900
commit 915a5d1
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 10 deletions.
diff --git a/pkg/apisix/resource_test.go b/pkg/apisix/resource_test.go
@@ -40,6 +40,7 @@ func TestItemUnmarshalJSON(t *testing.T) {
 }
 `
 	err = json.Unmarshal([]byte(emptyData), &items)
+	assert.NotNil(t, err)
 	assert.Equal(t, err.Error(), "unexpected non-empty object")
 
 	emptyArray := `
@@ -84,6 +85,7 @@ func TestRouteVarsUnmarshalJSONCompatibility(t *testing.T) {
 
 	data = `{"vars":{"a":"b"}}`
 	err = json.Unmarshal([]byte(data), &route)
+	assert.NotNil(t, err)
 	assert.Equal(t, err.Error(), "unexpected non-empty object")
 
 	data = `{"vars":[]}`

diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -136,6 +136,7 @@ func TestConfigInvalidation(t *testing.T) {
 	newCfg, err := NewConfigFromFile(tmpYAML.Name())
 	assert.Nil(t, err, "failed to new config from file: ", err)
 	err = newCfg.Validate()
+	assert.NotNil(t, err)
 	assert.Equal(t, err.Error(), "apisix base url is required", "bad error: ", err)
 
 	yamlData = `
@@ -155,5 +156,6 @@ apisix:
 	newCfg, err = NewConfigFromFile(tmpYAML.Name())
 	assert.Nil(t, err, "failed to new config from file: ", err)
 	err = newCfg.Validate()
+	assert.NotNil(t, err)
 	assert.Equal(t, err.Error(), "controller resync interval too small", "bad error: ", err)
 }
diff --git a/pkg/kube/translation/apisix_route_test.go b/pkg/kube/translation/apisix_route_test.go
@@ -320,6 +320,7 @@ func TestTranslateApisixRouteV2alpha1WithDuplicatedName(t *testing.T) {
 	}
 
 	_, err = tr.TranslateRouteV2alpha1(ar)
+	assert.NotNil(t, err)
 	assert.Equal(t, err.Error(), "duplicated route rule name")
 }
 

diff --git a/pkg/kube/translation/ingress_test.go b/pkg/kube/translation/ingress_test.go
@@ -118,9 +118,9 @@ func TestTranslateIngressV1NoBackend(t *testing.T) {
 	}
 	tr := &translator{}
 	ctx, err := tr.translateIngressV1(ing)
+	assert.Nil(t, err)
 	assert.Len(t, ctx.Routes, 1)
 	assert.Len(t, ctx.Upstreams, 0)
-	assert.Nil(t, err)
 	assert.Equal(t, ctx.Routes[0].UpstreamId, "")
 	assert.Equal(t, ctx.Routes[0].Uris, []string{"/foo", "/foo/*"})
 }
@@ -285,9 +285,9 @@ func TestTranslateIngressV1(t *testing.T) {
 	<-processCh
 	<-processCh
 	ctx, err := tr.translateIngressV1(ing)
+	assert.Nil(t, err)
 	assert.Len(t, ctx.Routes, 2)
 	assert.Len(t, ctx.Upstreams, 2)
-	assert.Nil(t, err)
 
 	assert.Equal(t, ctx.Routes[0].Uris, []string{"/foo", "/foo/*"})
 	assert.Equal(t, ctx.Routes[0].UpstreamId, ctx.Upstreams[0].ID)
@@ -341,9 +341,9 @@ func TestTranslateIngressV1beta1NoBackend(t *testing.T) {
 	}
 	tr := &translator{}
 	ctx, err := tr.translateIngressV1beta1(ing)
+	assert.Nil(t, err)
 	assert.Len(t, ctx.Routes, 1)
 	assert.Len(t, ctx.Upstreams, 0)
-	assert.Nil(t, err)
 	assert.Equal(t, ctx.Routes[0].UpstreamId, "")
 	assert.Equal(t, ctx.Routes[0].Uris, []string{"/foo", "/foo/*"})
 }
@@ -505,9 +505,9 @@ func TestTranslateIngressV1beta1(t *testing.T) {
 	<-processCh
 	<-processCh
 	ctx, err := tr.translateIngressV1beta1(ing)
+	assert.Nil(t, err)
 	assert.Len(t, ctx.Routes, 2)
 	assert.Len(t, ctx.Upstreams, 2)
-	assert.Nil(t, err)
 
 	assert.Equal(t, ctx.Routes[0].Uris, []string{"/foo", "/foo/*"})
 	assert.Equal(t, ctx.Routes[0].UpstreamId, ctx.Upstreams[0].ID)
@@ -617,9 +617,9 @@ func TestTranslateIngressExtensionsV1beta1(t *testing.T) {
 	<-processCh
 	<-processCh
 	ctx, err := tr.translateIngressExtensionsV1beta1(ing)
+	assert.Nil(t, err)
 	assert.Len(t, ctx.Routes, 2)
 	assert.Len(t, ctx.Upstreams, 2)
-	assert.Nil(t, err)
 
 	assert.Equal(t, ctx.Routes[0].Uris, []string{"/foo", "/foo/*"})
 	assert.Equal(t, ctx.Routes[0].UpstreamId, ctx.Upstreams[0].ID)

diff --git a/pkg/kube/translation/plugin_test.go b/pkg/kube/translation/plugin_test.go
@@ -514,20 +514,23 @@ func TestTranslateTrafficSplitPluginBadCases(t *testing.T) {
 	cfg, err := tr.translateTrafficSplitPlugin(ctx, ar1.Namespace, 30, backends)
 	assert.Nil(t, cfg)
 	assert.Len(t, ctx.Upstreams, 0)
+	assert.NotNil(t, err)
 	assert.Equal(t, err.Error(), "service \"svc-2\" not found")
 
 	backends[0].ServiceName = "svc-1"
 	backends[1].ServicePort.StrVal = "port-not-found"
 	ctx = &TranslateContext{upstreamMap: make(map[string]struct{})}
 	cfg, err = tr.translateTrafficSplitPlugin(ctx, ar1.Namespace, 30, backends)
 	assert.Nil(t, cfg)
+	assert.NotNil(t, err)
 	assert.Equal(t, err.Error(), "service.spec.ports: port not defined")
 
 	backends[1].ServicePort.StrVal = "port2"
 	backends[1].ResolveGranularity = "service"
 	ctx = &TranslateContext{upstreamMap: make(map[string]struct{})}
 	cfg, err = tr.translateTrafficSplitPlugin(ctx, ar1.Namespace, 30, backends)
 	assert.Nil(t, cfg)
+	assert.NotNil(t, err)
 	assert.Equal(t, err.Error(), "conflict headless service and backend resolve granularity")
 }
 
@@ -584,6 +587,7 @@ func TestTranslateConsumerKeyAuthWithSecretRef(t *testing.T) {
 
 	cfg, err = tr.translateConsumerKeyAuthPlugin("default2", keyAuth)
 	assert.Nil(t, cfg)
+	assert.NotNil(t, err)
 	assert.Contains(t, err.Error(), "not found")
 
 	delete(sec.Data, "key")
@@ -658,6 +662,7 @@ func TestTranslateConsumerBasicAuthWithSecretRef(t *testing.T) {
 
 	cfg, err = tr.translateConsumerBasicAuthPlugin("default2", basicAuth)
 	assert.Nil(t, cfg)
+	assert.NotNil(t, err)
 	assert.Contains(t, err.Error(), "not found")
 
 	delete(sec.Data, "password")

diff --git a/test/e2e/ingress/resourcepushing.go b/test/e2e/ingress/resourcepushing.go
@@ -216,7 +216,7 @@ spec:
 		s.NewAPISIXClient().GET("/ip").WithHeader("Host", "httpbin.com").Expect().Status(http.StatusNotFound)
 		s.NewAPISIXClient().GET("/ip").WithHeader("Host", "httpbin.com").WithHeader("X-Foo", "barbaz").Expect().Status(http.StatusOK)
 		// remove k8s service first
-		s.DeleteHTTPBINService()
+		assert.Nil(ginkgo.GinkgoT(), s.DeleteHTTPBINService())
 		// remove
 		assert.Nil(ginkgo.GinkgoT(), s.RemoveResourceByString(apisixRoute))
 		// TODO When ingress controller can feedback the lifecycle of CRDs to the

diff --git a/test/e2e/scaffold/httpbin.go b/test/e2e/scaffold/httpbin.go
@@ -118,10 +118,7 @@ func (s *Scaffold) ScaleHTTPBIN(desired int) error {
 
 // DeleteHTTPBINService deletes the HTTPBIN service object.
 func (s *Scaffold) DeleteHTTPBINService() error {
-	if err := k8s.KubectlDeleteFromStringE(s.t, s.kubectlOptions, _httpService); err != nil {
-		return err
-	}
-	return nil
+	return k8s.KubectlDeleteFromStringE(s.t, s.kubectlOptions, _httpService)
 }
 
 // WaitAllHTTPBINPodsAvailable waits until all httpbin pods ready.
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	_, err = tr.TranslateRouteV2alpha1(ar)
+    	assert.NotNil(t, err)
     	assert.Equal(t, err.Error(), "duplicated route rule name")
     }
@@ Expand Down @@