Test consistency pass / general clean up (#303)

* More general subnet compartment_id assertion
* Fix inconsistent test related naming
* Convert resource.UnitTest to resource.Test in some missed locations
* Remove cruft files
* Add missing copywrites
* Remove duplicate log statement

Author: codycushing

circle.yml

@@ -41,9 +41,6 @@ func (s *DatasourceCoreIPSecStatusTestSuite) SetupTest() {
 		drg_id = "${oci_core_drg.t.id}"
 		display_name = "-tf-ipsec"
 		static_routes = ["10.0.0.0/16"]
-	}
-	data "oci_core_ipsec_status" "s" {
-		ipsec_id = "${oci_core_ipsec.t.id}"
 	}`
 	s.ResourceName = "data.oci_core_ipsec_status.s"
 }
@@ -56,7 +53,10 @@ func (s *DatasourceCoreIPSecStatusTestSuite) TestAccDatasourceCoreIPSecStatus_ba
 			{
 				ImportState:       true,
 				ImportStateVerify: true,
-				Config:            s.Config,
+				Config: s.Config + `
+				data "oci_core_ipsec_status" "s" {
+					ipsec_id = "${oci_core_ipsec.t.id}"
+				}`,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(s.ResourceName, "id"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "tunnels.#"),

data_source_obmcs_core_ipsec_status_test.go renamed to data_source_obmcs_core_ipsec_connection_status_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/suite"
 )
 
-type DataSourceCoreVnicTestSuite struct {
+type DatasourceCoreVnicTestSuite struct {
 	suite.Suite
 	Client       *baremetal.Client
 	Config       string
@@ -20,28 +20,27 @@ type DataSourceCoreVnicTestSuite struct {
 	ResourceName string
 }
 
-func (s *DataSourceCoreVnicTestSuite) SetupTest() {
+func (s *DatasourceCoreVnicTestSuite) SetupTest() {
 	s.Client = testAccClient
 	s.Provider = testAccProvider
 	s.Providers = testAccProviders
 	s.Config = testProviderConfig() + instanceDnsConfig
-	s.ResourceName = "data.oci_core_vnic.v"
+	s.ResourceName = "data.oci_core_vnic.t"
 }
 
-func (s *DataSourceCoreVnicTestSuite) TestAccDatasrouceCoreAttachVnic() {
-
+func (s *DatasourceCoreVnicTestSuite) TestAccDatasourceCoreAttachVnic_basic() {
 	resource.Test(s.T(), resource.TestCase{
 		Providers: s.Providers,
 		Steps: []resource.TestStep{
 			{
 				ImportState:       true,
 				ImportStateVerify: true,
 				Config: s.Config + `
-				data "oci_core_vnic_attachments" "va" {
+				data "oci_core_vnic_attachments" "t" {
 					compartment_id = "${var.compartment_id}"
 					instance_id = "${oci_core_instance.t.id}"
 				}
-				data "oci_core_vnic" "v" {
+				data "oci_core_vnic" "t" {
 					vnic_id = "${lookup(data.oci_core_vnic_attachments.va.vnic_attachments[0],"vnic_id")}"
 				}`,
 				Check: resource.ComposeTestCheckFunc(
@@ -64,6 +63,6 @@ func (s *DataSourceCoreVnicTestSuite) TestAccDatasrouceCoreAttachVnic() {
 	})
 }
 
-func TestDataSourceCoreVnicTestSuite(t *testing.T) {
-	suite.Run(t, new(DataSourceCoreVnicTestSuite))
+func TestDatasourceCoreVnicTestSuite(t *testing.T) {
+	suite.Run(t, new(DatasourceCoreVnicTestSuite))
 }

data_source_obmcs_core_vnic_test.go

@@ -17,7 +17,7 @@ func TestAccDatasourceLoadBalancerPolicies_basic(t *testing.T) {
 
 	resourceName := "data.oci_load_balancer_policies.t"
 
-	resource.UnitTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		PreventPostDestroyRefresh: true,
 		Providers:                 providers,
 		Steps: []resource.TestStep{

data_source_obmcs_loadbalancer_loadbalancer_policies_test.go

@@ -17,7 +17,7 @@ func TestAccDatasourceLoadBalancerProtocols_basic(t *testing.T) {
 
 	resourceName := "data.oci_load_balancer_protocols.t"
 
-	resource.UnitTest(t, resource.TestCase{
+	resource.Test(t, resource.TestCase{
 		PreventPostDestroyRefresh: true,
 		Providers:                 providers,
 		Steps: []resource.TestStep{

data_source_obmcs_loadbalancer_loadbalancer_protocols_test.go

@@ -241,7 +241,6 @@ func providerConfig(d *schema.ResourceData) (clients interface{}, err error) {
 		func(o *baremetal.NewClientOptions) {
 			o.UserAgent = fmt.Sprintf("Oracle-GoSDK/%s (go/%s; %s/%s; terraform/%s) Oracle-TerraformProvider/%s",
 				baremetal.SDKVersion, runtime.Version(), runtime.GOOS, runtime.GOARCH, terraform.VersionString(), Version)
-			log.Println(fmt.Sprintf("User Agent: %s", o.UserAgent))
 		},
 	}
 

provider.go

@@ -57,7 +57,7 @@ func TestAccResourceCoreSubnetCreate_basic(t *testing.T) {
 					resource.TestCheckResourceAttrSet(resourceName, "time_created"),
 					resource.TestCheckResourceAttrSet(resourceName, "virtual_router_ip"),
 					resource.TestCheckResourceAttrSet(resourceName, "virtual_router_mac"),
-					resource.TestMatchResourceAttr(resourceName, "compartment_id", regexp.MustCompile("ocid1\\.compartment\\.oc1\\..*")),
+					resource.TestCheckResourceAttrSet(resourceName, "compartment_id"),
 					resource.TestMatchResourceAttr(resourceName, "vcn_id", regexp.MustCompile("ocid1\\.vcn\\.oc1\\..*")),
 					resource.TestMatchResourceAttr(resourceName, "dhcp_options_id", regexp.MustCompile("ocid1\\.dhcpoptions\\.oc1\\..*")),
 					resource.TestMatchResourceAttr(resourceName, "route_table_id", regexp.MustCompile("ocid1\\.routetable\\.oc1\\..*")),

resource_obmcs_core_subnet_test.go

@@ -1,3 +1,5 @@
+// Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+
 package main
 
 import (

resource_obmcs_loadbalancer_backend_set_test.go

@@ -1,3 +1,5 @@
+// Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+
 package main
 
 import (

resource_obmcs_loadbalancer_backend_test.go

@@ -1,3 +1,5 @@
+// Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+
 package main
 
 import (