provider/aws: Cleanup tests - have 1 checkFunc per attribute

hashicorp · Feb 25, 2016 · 7c9412c · 7c9412c
1 parent 6f37e27
commit 7c9412c
Showing 1 changed file with 4 additions and 18 deletions.
diff --git a/builtin/providers/aws/resource_aws_lambda_function_test.go b/builtin/providers/aws/resource_aws_lambda_function_test.go
@@ -27,7 +27,8 @@ func TestAccAWSLambdaFunction_basic(t *testing.T) {
 				Config: testAccAWSLambdaConfigBasic,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAwsLambdaFunctionExists("aws_lambda_function.lambda_function_test", "example_lambda_name", &conf),
-					testAccCheckAWSLambdaAttributes(&conf),
+					testAccCheckAwsLambdaFunctionName(&conf, "example_lambda_name"),
+					testAccCheckAwsLambdaFunctionArnHasSuffix(&conf, ":example_lambda_name"),
 				),
 			},
 		},
@@ -46,7 +47,8 @@ func TestAccAWSLambdaFunction_VPC(t *testing.T) {
 				Config: testAccAWSLambdaConfigWithVPC,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAwsLambdaFunctionExists("aws_lambda_function.lambda_function_test", "example_lambda_name", &conf),
-					testAccCheckAWSLambdaAttributes(&conf),
+					testAccCheckAwsLambdaFunctionName(&conf, "example_lambda_name"),
+					testAccCheckAwsLambdaFunctionArnHasSuffix(&conf, ":example_lambda_name"),
 				),
 			},
 		},
@@ -230,22 +232,6 @@ func testAccCheckAwsLambdaSourceCodeHash(function *lambda.GetFunctionOutput, exp
 	}
 }
 
-func testAccCheckAWSLambdaAttributes(function *lambda.GetFunctionOutput) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		c := function.Configuration
-		const expectedName = "example_lambda_name"
-		if *c.FunctionName != expectedName {
-			return fmt.Errorf("Expected function name %s, got %s", expectedName, *c.FunctionName)
-		}
-
-		if *c.FunctionArn == "" {
-			return fmt.Errorf("Could not read Lambda Function's ARN")
-		}
-
-		return nil
-	}
-}
-
 func testAccCreateZipFromFiles(files map[string]string, zipFile *os.File) error {
 	zipFile.Truncate(0)
 	zipFile.Seek(0, 0)