This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 35e53f3c9e2af3f9e3c62126fbb5bb1dd0ff08ef Author: Antonin Stefanutti <[email protected]> AuthorDate: Fri Oct 25 15:12:35 2019 +0200 chore(test): Remove redundant type conversions --- pkg/trait/builder_test.go | 8 ++++---- pkg/trait/container_test.go | 8 ++++---- pkg/trait/knative_service_test.go | 6 +++--- pkg/trait/owner_test.go | 2 +- pkg/trait/route_test.go | 12 ++++++------ pkg/trait/service_test.go | 18 +++++++++--------- pkg/trait/trait_test.go | 40 +++++++++++++++++++-------------------- 7 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pkg/trait/builder_test.go b/pkg/trait/builder_test.go index 651d522..9fa42bf 100644 --- a/pkg/trait/builder_test.go +++ b/pkg/trait/builder_test.go @@ -51,7 +51,7 @@ func TestBuilderTraitNotAppliedBecauseOfNilKit(t *testing.T) { assert.Nil(t, err) assert.NotEmpty(t, e.ExecutedTraits) - assert.Nil(t, e.GetTrait(ID("builder"))) + assert.Nil(t, e.GetTrait("builder")) assert.Empty(t, e.Steps) }) } @@ -72,7 +72,7 @@ func TestBuilderTraitNotAppliedBecauseOfNilPhase(t *testing.T) { assert.Nil(t, err) assert.NotEmpty(t, e.ExecutedTraits) - assert.Nil(t, e.GetTrait(ID("builder"))) + assert.Nil(t, e.GetTrait("builder")) assert.Empty(t, e.Steps) }) } @@ -84,7 +84,7 @@ func TestS2IBuilderTrait(t *testing.T) { assert.Nil(t, err) assert.NotEmpty(t, env.ExecutedTraits) - assert.NotNil(t, env.GetTrait(ID("builder"))) + assert.NotNil(t, env.GetTrait("builder")) assert.NotEmpty(t, env.Steps) assert.Len(t, env.Steps, 8) assert.Condition(t, func() bool { @@ -104,7 +104,7 @@ func TestKanikoBuilderTrait(t *testing.T) { assert.Nil(t, err) assert.NotEmpty(t, env.ExecutedTraits) - assert.NotNil(t, env.GetTrait(ID("builder"))) + assert.NotNil(t, env.GetTrait("builder")) assert.NotEmpty(t, env.Steps) assert.Len(t, env.Steps, 8) assert.Condition(t, func() bool { diff --git a/pkg/trait/container_test.go b/pkg/trait/container_test.go index 10e8787..90b9613 100644 --- a/pkg/trait/container_test.go +++ b/pkg/trait/container_test.go @@ -77,8 +77,8 @@ func TestContainerWithDefaults(t *testing.T) { assert.Nil(t, err) assert.NotEmpty(t, environment.ExecutedTraits) - assert.NotNil(t, environment.GetTrait(ID("deployment"))) - assert.NotNil(t, environment.GetTrait(ID("container"))) + assert.NotNil(t, environment.GetTrait("deployment")) + assert.NotNil(t, environment.GetTrait("container")) d := environment.Resources.GetDeploymentForIntegration(environment.Integration) @@ -139,8 +139,8 @@ func TestContainerWithCustomName(t *testing.T) { assert.Nil(t, err) assert.NotEmpty(t, environment.ExecutedTraits) - assert.NotNil(t, environment.GetTrait(ID("deployment"))) - assert.NotNil(t, environment.GetTrait(ID("container"))) + assert.NotNil(t, environment.GetTrait("deployment")) + assert.NotNil(t, environment.GetTrait("container")) d := environment.Resources.GetDeploymentForIntegration(environment.Integration) diff --git a/pkg/trait/knative_service_test.go b/pkg/trait/knative_service_test.go index da9708d..661afb4 100644 --- a/pkg/trait/knative_service_test.go +++ b/pkg/trait/knative_service_test.go @@ -120,7 +120,7 @@ func TestKnativeService(t *testing.T) { assert.Nil(t, err) assert.NotEmpty(t, environment.ExecutedTraits) - assert.NotNil(t, environment.GetTrait(ID("knative"))) + assert.NotNil(t, environment.GetTrait("knative")) assert.NotNil(t, envvar.Get(environment.EnvVars, "CAMEL_KNATIVE_CONFIGURATION")) assert.Equal(t, 4, environment.Resources.Size()) @@ -249,8 +249,8 @@ func TestKnativeServiceWithCustomContainerName(t *testing.T) { assert.Nil(t, err) assert.NotEmpty(t, environment.ExecutedTraits) - assert.NotNil(t, environment.GetTrait(ID("knative-service"))) - assert.NotNil(t, environment.GetTrait(ID("container"))) + assert.NotNil(t, environment.GetTrait("knative-service")) + assert.NotNil(t, environment.GetTrait("container")) s := environment.Resources.GetKnativeService(func(service *serving.Service) bool { return service.Name == KnativeServiceTestName diff --git a/pkg/trait/owner_test.go b/pkg/trait/owner_test.go index 8b57c0e..22206af 100644 --- a/pkg/trait/owner_test.go +++ b/pkg/trait/owner_test.go @@ -34,7 +34,7 @@ func TestOwner(t *testing.T) { processTestEnv(t, env) assert.NotEmpty(t, env.ExecutedTraits) - assert.NotNil(t, env.GetTrait(ID("owner"))) + assert.NotNil(t, env.GetTrait("owner")) ValidateOwnerResources(t, env, true) } diff --git a/pkg/trait/route_test.go b/pkg/trait/route_test.go index 6e7e74b..24f4895 100644 --- a/pkg/trait/route_test.go +++ b/pkg/trait/route_test.go @@ -103,8 +103,8 @@ func TestRoute_Default(t *testing.T) { assert.Nil(t, err) assert.NotEmpty(t, environment.ExecutedTraits) - assert.NotNil(t, environment.GetTrait(ID("container"))) - assert.NotNil(t, environment.GetTrait(ID("route"))) + assert.NotNil(t, environment.GetTrait("container")) + assert.NotNil(t, environment.GetTrait("route")) route := environment.Resources.GetRoute(func(r *routev1.Route) bool { return r.ObjectMeta.Name == name @@ -132,7 +132,7 @@ func TestRoute_Disabled(t *testing.T) { assert.Nil(t, err) assert.NotEmpty(t, environment.ExecutedTraits) - assert.Nil(t, environment.GetTrait(ID("route"))) + assert.Nil(t, environment.GetTrait("route")) route := environment.Resources.GetRoute(func(r *routev1.Route) bool { return r.ObjectMeta.Name == name @@ -158,7 +158,7 @@ func TestRoute_TLS(t *testing.T) { assert.Nil(t, err) assert.NotEmpty(t, environment.ExecutedTraits) - assert.NotNil(t, environment.GetTrait(ID("route"))) + assert.NotNil(t, environment.GetTrait("route")) route := environment.Resources.GetRoute(func(r *routev1.Route) bool { return r.ObjectMeta.Name == name @@ -185,8 +185,8 @@ func TestRoute_WithCustomServicePort(t *testing.T) { assert.Nil(t, err) assert.NotEmpty(t, environment.ExecutedTraits) - assert.NotNil(t, environment.GetTrait(ID("container"))) - assert.NotNil(t, environment.GetTrait(ID("route"))) + assert.NotNil(t, environment.GetTrait("container")) + assert.NotNil(t, environment.GetTrait("route")) route := environment.Resources.GetRoute(func(r *routev1.Route) bool { return r.ObjectMeta.Name == name diff --git a/pkg/trait/service_test.go b/pkg/trait/service_test.go index 095ab00..5505de0 100644 --- a/pkg/trait/service_test.go +++ b/pkg/trait/service_test.go @@ -101,9 +101,9 @@ func TestServiceWithDefaults(t *testing.T) { assert.Nil(t, err) assert.NotEmpty(t, environment.ExecutedTraits) - assert.NotNil(t, environment.GetTrait(ID("deployment"))) - assert.NotNil(t, environment.GetTrait(ID("service"))) - assert.NotNil(t, environment.GetTrait(ID("container"))) + assert.NotNil(t, environment.GetTrait("deployment")) + assert.NotNil(t, environment.GetTrait("service")) + assert.NotNil(t, environment.GetTrait("container")) s := environment.Resources.GetService(func(service *corev1.Service) bool { return service.Name == ServiceTestName @@ -199,9 +199,9 @@ func TestService(t *testing.T) { assert.Nil(t, err) assert.NotEmpty(t, environment.ExecutedTraits) - assert.NotNil(t, environment.GetTrait(ID("deployment"))) - assert.NotNil(t, environment.GetTrait(ID("service"))) - assert.NotNil(t, environment.GetTrait(ID("container"))) + assert.NotNil(t, environment.GetTrait("deployment")) + assert.NotNil(t, environment.GetTrait("service")) + assert.NotNil(t, environment.GetTrait("container")) s := environment.Resources.GetService(func(service *corev1.Service) bool { return service.Name == ServiceTestName @@ -282,9 +282,9 @@ func TestServiceWithCustomContainerName(t *testing.T) { assert.Nil(t, err) assert.NotEmpty(t, environment.ExecutedTraits) - assert.NotNil(t, environment.GetTrait(ID("deployment"))) - assert.NotNil(t, environment.GetTrait(ID("service"))) - assert.NotNil(t, environment.GetTrait(ID("container"))) + assert.NotNil(t, environment.GetTrait("deployment")) + assert.NotNil(t, environment.GetTrait("service")) + assert.NotNil(t, environment.GetTrait("container")) d := environment.Resources.GetDeploymentForIntegration(environment.Integration) assert.NotNil(t, d) diff --git a/pkg/trait/trait_test.go b/pkg/trait/trait_test.go index 3729e0d..16d0e6c 100644 --- a/pkg/trait/trait_test.go +++ b/pkg/trait/trait_test.go @@ -45,10 +45,10 @@ func TestOpenShiftTraits(t *testing.T) { res := processTestEnv(t, env) assert.NotEmpty(t, env.ExecutedTraits) - assert.NotNil(t, env.GetTrait(ID("deployment"))) - assert.Nil(t, env.GetTrait(ID("service"))) - assert.Nil(t, env.GetTrait(ID("route"))) - assert.NotNil(t, env.GetTrait(ID("owner"))) + assert.NotNil(t, env.GetTrait("deployment")) + assert.Nil(t, env.GetTrait("service")) + assert.Nil(t, env.GetTrait("route")) + assert.NotNil(t, env.GetTrait("owner")) assert.NotNil(t, res.GetConfigMap(func(cm *corev1.ConfigMap) bool { return cm.Name == TestProperties })) @@ -60,10 +60,10 @@ func TestOpenShiftTraits(t *testing.T) { func TestOpenShiftTraitsWithWeb(t *testing.T) { env := createTestEnv(t, v1alpha1.IntegrationPlatformClusterOpenShift, "from('undertow:http').to('log:info')") res := processTestEnv(t, env) - assert.NotNil(t, env.GetTrait(ID("deployment"))) - assert.NotNil(t, env.GetTrait(ID("service"))) - assert.NotNil(t, env.GetTrait(ID("route"))) - assert.NotNil(t, env.GetTrait(ID("owner"))) + assert.NotNil(t, env.GetTrait("deployment")) + assert.NotNil(t, env.GetTrait("service")) + assert.NotNil(t, env.GetTrait("route")) + assert.NotNil(t, env.GetTrait("owner")) assert.NotNil(t, res.GetConfigMap(func(cm *corev1.ConfigMap) bool { return cm.Name == TestProperties })) @@ -87,8 +87,8 @@ func TestOpenShiftTraitsWithWebAndConfig(t *testing.T) { }, } res := processTestEnv(t, env) - assert.NotNil(t, env.GetTrait(ID("service"))) - assert.NotNil(t, env.GetTrait(ID("route"))) + assert.NotNil(t, env.GetTrait("service")) + assert.NotNil(t, env.GetTrait("route")) assert.NotNil(t, res.GetService(func(svc *corev1.Service) bool { return svc.Name == TestDeploymentName && svc.Spec.Ports[0].TargetPort.StrVal == "http" })) @@ -104,8 +104,8 @@ func TestOpenShiftTraitsWithWebAndDisabledTrait(t *testing.T) { }, } res := processTestEnv(t, env) - assert.Nil(t, env.GetTrait(ID("service"))) - assert.Nil(t, env.GetTrait(ID("route"))) // No route without service + assert.Nil(t, env.GetTrait("service")) + assert.Nil(t, env.GetTrait("route")) // No route without service assert.Nil(t, res.GetService(func(svc *corev1.Service) bool { return true })) @@ -114,10 +114,10 @@ func TestOpenShiftTraitsWithWebAndDisabledTrait(t *testing.T) { func TestKubernetesTraits(t *testing.T) { env := createTestEnv(t, v1alpha1.IntegrationPlatformClusterKubernetes, "from('timer:tick').to('log:info')") res := processTestEnv(t, env) - assert.NotNil(t, env.GetTrait(ID("deployment"))) - assert.Nil(t, env.GetTrait(ID("service"))) - assert.Nil(t, env.GetTrait(ID("route"))) - assert.NotNil(t, env.GetTrait(ID("owner"))) + assert.NotNil(t, env.GetTrait("deployment")) + assert.Nil(t, env.GetTrait("service")) + assert.Nil(t, env.GetTrait("route")) + assert.NotNil(t, env.GetTrait("owner")) assert.NotNil(t, res.GetConfigMap(func(cm *corev1.ConfigMap) bool { return cm.Name == TestProperties })) @@ -129,10 +129,10 @@ func TestKubernetesTraits(t *testing.T) { func TestKubernetesTraitsWithWeb(t *testing.T) { env := createTestEnv(t, v1alpha1.IntegrationPlatformClusterKubernetes, "from('servlet:http').to('log:info')") res := processTestEnv(t, env) - assert.NotNil(t, env.GetTrait(ID("deployment"))) - assert.NotNil(t, env.GetTrait(ID("service"))) - assert.Nil(t, env.GetTrait(ID("route"))) - assert.NotNil(t, env.GetTrait(ID("owner"))) + assert.NotNil(t, env.GetTrait("deployment")) + assert.NotNil(t, env.GetTrait("service")) + assert.Nil(t, env.GetTrait("route")) + assert.NotNil(t, env.GetTrait("owner")) assert.NotNil(t, res.GetConfigMap(func(cm *corev1.ConfigMap) bool { return cm.Name == TestProperties }))
