Merge pull request #381 from vmware/bangerar/fix-ns-test

Fix the namespace acceptance tests
vmware · Feb 22, 2024 · 7b21fe2 · 7b21fe2
2 parents ed4b47e + 19dc699
commit 7b21fe2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 22 deletions.
diff --git a/internal/resources/namespace/data_source_namespace_test.go b/internal/resources/namespace/data_source_namespace_test.go
@@ -38,8 +38,8 @@ func TestAcceptanceForNamespaceDataSource(t *testing.T) {
 	resourceName := fmt.Sprintf("%s.%s", namespaceResource, namespaceResourceVar)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          testPreCheck(t),
-		ProviderFactories: getTestProviderFactories(provider),
+		PreCheck:          testhelper.TestPreCheck(t),
+		ProviderFactories: testhelper.GetTestProviderFactories(provider),
 		CheckDestroy:      nil,
 		Steps: []resource.TestStep{
 			{

diff --git a/internal/resources/namespace/namespace_provider_test.go b/internal/resources/namespace/namespace_provider_test.go
@@ -6,7 +6,6 @@ SPDX-License-Identifier: MPL-2.0
 package namespace
 
 import (
-	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -16,8 +15,6 @@ import (
 	"github.com/vmware/terraform-provider-tanzu-mission-control/internal/resources/cluster"
 )
 
-const providerName = "tmc"
-
 func initTestProvider(t *testing.T) *schema.Provider {
 	testProvider := &schema.Provider{
 		Schema: authctx.ProviderAuthSchema(),
@@ -37,18 +34,3 @@ func initTestProvider(t *testing.T) *schema.Provider {
 
 	return testProvider
 }
-
-func testPreCheck(t *testing.T) func() {
-	return func() {
-		for _, env := range []string{authctx.ServerEndpointEnvVar, authctx.VMWCloudAPITokenEnvVar, authctx.VMWCloudEndpointEnvVar} {
-			require.NotEmpty(t, os.Getenv(env))
-		}
-	}
-}
-
-func getTestProviderFactories(provider *schema.Provider) map[string]func() (*schema.Provider, error) {
-	//nolint:unparam
-	return map[string]func() (*schema.Provider, error){
-		providerName: func() (*schema.Provider, error) { return provider, nil },
-	}
-}
diff --git a/internal/resources/namespace/resource_namepace_test.go b/internal/resources/namespace/resource_namepace_test.go
@@ -33,8 +33,8 @@ func TestAcceptanceForNamespaceResource(t *testing.T) {
 	clusterName := acctest.RandomWithPrefix("tf-cluster")
 
 	resource.Test(t, resource.TestCase{
-		PreCheck:          testPreCheck(t),
-		ProviderFactories: getTestProviderFactories(provider),
+		PreCheck:          testhelper.TestPreCheck(t),
+		ProviderFactories: testhelper.GetTestProviderFactories(provider),
 		CheckDestroy:      nil,
 		Steps: []resource.TestStep{
 			{