From bb2afcb38e6f15d6e335afda8a703a292fdc9639 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 10 Apr 2017 12:22:16 +0100 Subject: [PATCH] Refactoring the Complete test / identifying Update as Update --- .../opc/import_security_protocol_test.go | 4 +-- .../opc/resource_security_protocol_test.go | 30 +++++++++++++++++-- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/builtin/providers/opc/import_security_protocol_test.go b/builtin/providers/opc/import_security_protocol_test.go index da1df11763..109d5d3fe0 100644 --- a/builtin/providers/opc/import_security_protocol_test.go +++ b/builtin/providers/opc/import_security_protocol_test.go @@ -32,11 +32,11 @@ func TestAccOPCSecurityProtocol_importBasic(t *testing.T) { }, }) } -func TestAccOPCSecurityProtocol_importDisabled(t *testing.T) { +func TestAccOPCSecurityProtocol_importComplete(t *testing.T) { resourceName := "opc_compute_security_protocol.test" ri := acctest.RandInt() - config := fmt.Sprintf(testAccOPCSecurityProtocolFull, ri) + config := fmt.Sprintf(testAccOPCSecurityProtocolComplete, ri) resource.Test(t, resource.TestCase{ PreCheck: func() { diff --git a/builtin/providers/opc/resource_security_protocol_test.go b/builtin/providers/opc/resource_security_protocol_test.go index 77efeef1ed..c1a9c76d47 100644 --- a/builtin/providers/opc/resource_security_protocol_test.go +++ b/builtin/providers/opc/resource_security_protocol_test.go @@ -29,10 +29,34 @@ func TestAccOPCSecurityProtocol_Basic(t *testing.T) { }) } -func TestAccOPCSecurityProtocol_Full(t *testing.T) { +func TestAccOPCSecurityProtocol_Complete(t *testing.T) { protocolResourceName := "opc_compute_security_protocol.test" ri := acctest.RandInt() - config := fmt.Sprintf(testAccOPCSecurityProtocolFull, ri) + config := fmt.Sprintf(testAccOPCSecurityProtocolComplete, ri) + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckSecurityProtocolDestroy, + Steps: []resource.TestStep{ + { + Config: config, + Check: resource.ComposeTestCheckFunc( + testAccCheckSecurityProtocolExists, + resource.TestCheckResourceAttr(protocolResourceName, "description", "Terraform Acceptance Test"), + resource.TestCheckResourceAttr(protocolResourceName, "dst_ports.0", "2025-2030"), + resource.TestCheckResourceAttr(protocolResourceName, "src_ports.0", "3025-3030"), + resource.TestCheckResourceAttr(protocolResourceName, "ip_protocol", "tcp"), + ), + }, + }, + }) +} + +func TestAccOPCSecurityProtocol_Update(t *testing.T) { + protocolResourceName := "opc_compute_security_protocol.test" + ri := acctest.RandInt() + config := fmt.Sprintf(testAccOPCSecurityProtocolComplete, ri) config2 := fmt.Sprintf(testAccOPCSecurityProtocolUpdated, ri) resource.Test(t, resource.TestCase{ @@ -109,7 +133,7 @@ resource "opc_compute_security_protocol" "test" { } ` -const testAccOPCSecurityProtocolFull = ` +const testAccOPCSecurityProtocolComplete = ` resource "opc_compute_security_protocol" "test" { name = "acc-security-protocol-%d" description = "Terraform Acceptance Test"