From 89c6dc7f5c0bf99c973b7f1e5c86b3f215d6603c Mon Sep 17 00:00:00 2001
From: Ryn Daniels <ryn@hashicorp.com>
Date: Wed, 23 Oct 2019 15:37:12 +0200
Subject: [PATCH] Import test refactor for athena named queries

---
 aws/resource_aws_athena_named_query_test.go | 53 +++++++++------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/aws/resource_aws_athena_named_query_test.go b/aws/resource_aws_athena_named_query_test.go
index 49708022ca11..94d0ee2fd36b 100644
--- a/aws/resource_aws_athena_named_query_test.go
+++ b/aws/resource_aws_athena_named_query_test.go
@@ -12,6 +12,8 @@ import (
 )
 
 func TestAccAWSAthenaNamedQuery_basic(t *testing.T) {
+	resourceName := "aws_athena_named_query.test"
+
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
@@ -20,14 +22,21 @@ func TestAccAWSAthenaNamedQuery_basic(t *testing.T) {
 			{
 				Config: testAccAthenaNamedQueryConfig(acctest.RandInt(), acctest.RandString(5)),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckAWSAthenaNamedQueryExists("aws_athena_named_query.foo"),
+					testAccCheckAWSAthenaNamedQueryExists(resourceName),
 				),
 			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
 
 func TestAccAWSAthenaNamedQuery_withWorkGroup(t *testing.T) {
+	resourceName := "aws_athena_named_query.test"
+
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
@@ -36,25 +45,9 @@ func TestAccAWSAthenaNamedQuery_withWorkGroup(t *testing.T) {
 			{
 				Config: testAccAthenaNamedWorkGroupQueryConfig(acctest.RandInt(), acctest.RandString(5)),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckAWSAthenaNamedQueryExists("aws_athena_named_query.bar"),
+					testAccCheckAWSAthenaNamedQueryExists(resourceName),
 				),
 			},
-		},
-	})
-}
-
-func TestAccAWSAthenaNamedQuery_import(t *testing.T) {
-	resourceName := "aws_athena_named_query.foo"
-
-	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckAWSAthenaNamedQueryDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccAthenaNamedQueryConfig(acctest.RandInt(), acctest.RandString(5)),
-			},
-
 			{
 				ResourceName:      resourceName,
 				ImportState:       true,
@@ -109,20 +102,20 @@ func testAccCheckAWSAthenaNamedQueryExists(name string) resource.TestCheckFunc {
 
 func testAccAthenaNamedQueryConfig(rInt int, rName string) string {
 	return fmt.Sprintf(`
-resource "aws_s3_bucket" "hoge" {
+resource "aws_s3_bucket" "test" {
   bucket        = "tf-athena-db-%s-%d"
   force_destroy = true
 }
 
-resource "aws_athena_database" "hoge" {
+resource "aws_athena_database" "test" {
   name   = "%s"
-  bucket = "${aws_s3_bucket.hoge.bucket}"
+  bucket = "${aws_s3_bucket.test.bucket}"
 }
 
-resource "aws_athena_named_query" "foo" {
+resource "aws_athena_named_query" "test" {
   name        = "tf-athena-named-query-%s"
-  database    = "${aws_athena_database.hoge.name}"
-  query       = "SELECT * FROM ${aws_athena_database.hoge.name} limit 10;"
+  database    = "${aws_athena_database.test.name}"
+  query       = "SELECT * FROM ${aws_athena_database.test.name} limit 10;"
   description = "tf test"
 }
 `, rName, rInt, rName, rName)
@@ -130,7 +123,7 @@ resource "aws_athena_named_query" "foo" {
 
 func testAccAthenaNamedWorkGroupQueryConfig(rInt int, rName string) string {
 	return fmt.Sprintf(`
-resource "aws_s3_bucket" "hoge" {
+resource "aws_s3_bucket" "test" {
   bucket        = "tf-athena-db-%s-%d"
   force_destroy = true
 }
@@ -139,16 +132,16 @@ resource "aws_athena_workgroup" "test" {
   name = "tf-athena-workgroup-%s-%d"
 }
 
-resource "aws_athena_database" "hoge" {
+resource "aws_athena_database" "test" {
   name   = "%s"
-  bucket = "${aws_s3_bucket.hoge.bucket}"
+  bucket = "${aws_s3_bucket.test.bucket}"
 }
 
-resource "aws_athena_named_query" "bar" {
+resource "aws_athena_named_query" "test" {
   name        = "tf-athena-named-query-%s"
   workgroup   = "${aws_athena_workgroup.test.id}"
-  database    = "${aws_athena_database.hoge.name}"
-  query       = "SELECT * FROM ${aws_athena_database.hoge.name} limit 10;"
+  database    = "${aws_athena_database.test.name}"
+  query       = "SELECT * FROM ${aws_athena_database.test.name} limit 10;"
   description = "tf test"
 }
 `, rName, rInt, rName, rInt, rName, rName)