Merge pull request #10433 from terraform-providers/rfd-at002-dynamodb

Acceptance test import refactor for dynamodb resources
hashicorp · Oct 10, 2019 · 8f487f2 · 8f487f2
2 parents 3bd0318 + 3239296
commit 8f487f2
Show file tree

Hide file tree

Showing 2 changed files with 161 additions and 133 deletions.
diff --git a/aws/resource_aws_dynamodb_global_table_test.go b/aws/resource_aws_dynamodb_global_table_test.go
@@ -43,6 +43,11 @@ func TestAccAWSDynamoDbGlobalTable_basic(t *testing.T) {
 						regexp.MustCompile("^arn:aws:dynamodb::[0-9]{12}:global-table/[a-z0-9-]+$")),
 				),
 			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -67,6 +72,11 @@ func TestAccAWSDynamoDbGlobalTable_multipleRegions(t *testing.T) {
 						regexp.MustCompile("^arn:aws:dynamodb::[0-9]{12}:global-table/[a-z0-9-]+$")),
 				),
 			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			{
 				Config: testAccDynamoDbGlobalTableConfig_multipleRegions2(tableName),
 				Check: resource.ComposeTestCheckFunc(
@@ -89,28 +99,6 @@ func TestAccAWSDynamoDbGlobalTable_multipleRegions(t *testing.T) {
 	})
 }
 
-func TestAccAWSDynamoDbGlobalTable_import(t *testing.T) {
-	resourceName := "aws_dynamodb_global_table.test"
-	tableName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5))
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t); testAccPreCheckAWSDynamodbGlobalTable(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckSesTemplateDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccDynamoDbGlobalTableConfig_basic(tableName),
-			},
-
-			{
-				ResourceName:      resourceName,
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
 func testAccCheckAwsDynamoDbGlobalTableDestroy(s *terraform.State) error {
 	conn := testAccProvider.Meta().(*AWSClient).dynamodbconn