Skip to content

Commit 3eb59a2

Browse files
committed
Some working example acceptance tests
1 parent 7322cb1 commit 3eb59a2

5 files changed

+30
-28
lines changed

data_source_obmcs_core_console_history_data_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ type CoreConsoleHistoryDataDatasourceTestSuite struct {
2525
}
2626

2727
func (s *CoreConsoleHistoryDataDatasourceTestSuite) SetupTest() {
28-
if IsAccTest() {
29-
s.T().Skip()
30-
}
3128
s.Client = GetTestProvider()
3229
s.Provider = Provider(func(d *schema.ResourceData) (interface{}, error) {
3330
return s.Client, nil
@@ -37,8 +34,12 @@ func (s *CoreConsoleHistoryDataDatasourceTestSuite) SetupTest() {
3734
"baremetal": s.Provider,
3835
}
3936
s.Config = `
37+
38+
resource "baremetal_core_console_history" "t" {
39+
instance_id = "instance_id"
40+
}
4041
data "baremetal_core_console_history_data" "s" {
41-
console_history_id = "ichid"
42+
console_history_id = "${baremetal_core_console_history.t.id}"
4243
length = 1
4344
offset = 1
4445
}

data_source_obmcs_core_image_test.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ func (s *ResourceCoreImagesTestSuite) SetupTest() {
4040
data "baremetal_core_images" "t" {
4141
compartment_id = "${var.compartment_id}"
4242
limit = 1
43-
page = "page"
4443
}
4544
`
4645
s.Config += testProviderConfig()
@@ -69,7 +68,6 @@ func (s *ResourceCoreImagesTestSuite) SetupTest() {
6968
func (s *ResourceCoreImagesTestSuite) TestReadImages() {
7069
opts := &baremetal.ListImagesOptions{}
7170
opts.Limit = 1
72-
opts.Page = "page"
7371

7472
s.Client.On("ListImages", "compartment_id", opts).Return(s.List, nil)
7573

@@ -82,12 +80,9 @@ func (s *ResourceCoreImagesTestSuite) TestReadImages() {
8280
ImportStateVerify: true,
8381
Config: s.Config,
8482
Check: resource.ComposeTestCheckFunc(
85-
resource.TestCheckResourceAttr(s.ResourceName, "compartment_id", "compartment_id"),
86-
resource.TestCheckResourceAttr(s.ResourceName, "limit", "1"),
87-
resource.TestCheckResourceAttr(s.ResourceName, "page", "page"),
88-
resource.TestCheckResourceAttr(s.ResourceName, "images.0.id", "id1"),
89-
resource.TestCheckResourceAttr(s.ResourceName, "images.1.id", "id2"),
90-
resource.TestCheckResourceAttr(s.ResourceName, "images.#", "2"),
83+
resource.TestCheckResourceAttrSet(s.ResourceName, "images.0.id"),
84+
resource.TestCheckResourceAttrSet(s.ResourceName, "images.1.id"),
85+
resource.TestCheckResourceAttrSet(s.ResourceName, "images.#"),
9186
),
9287
},
9388
},
@@ -98,6 +93,9 @@ func (s *ResourceCoreImagesTestSuite) TestReadImages() {
9893
}
9994

10095
func (s *ResourceCoreImagesTestSuite) TestReadImagesWithPagination() {
96+
if IsAccTest() {
97+
s.T().Skip()
98+
}
10199
opts := &baremetal.ListImagesOptions{}
102100
opts.Limit = 1
103101
opts.Page = "page"

data_source_obmcs_core_shape_test.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@ func (s *ResourceCoreShapeTestSuite) SetupTest() {
3535
"baremetal": s.Provider,
3636
}
3737
s.Config = `
38+
data "baremetal_identity_availability_domains" "t" {
39+
compartment_id = "${var.compartment_id}"
40+
}
3841
data "baremetal_core_shape" "s" {
3942
compartment_id = "${var.compartment_id}"
40-
availability_domain = "availability_domain"
41-
image_id = "imageid"
43+
availability_domain = "${data.baremetal_identity_availability_domains.t.availability_domains.0.name}"
4244
}
4345
`
4446
s.Config += testProviderConfig()
@@ -78,12 +80,11 @@ func (s *ResourceCoreShapeTestSuite) TestResourceReadCoreShape() {
7880
ImportStateVerify: true,
7981
Config: s.Config,
8082
Check: resource.ComposeTestCheckFunc(
81-
resource.TestCheckResourceAttr(s.ResourceName, "compartment_id", "compartmentid"),
82-
resource.TestCheckResourceAttr(s.ResourceName, "availability_domain", "availability_domain"),
83-
resource.TestCheckResourceAttr(s.ResourceName, "image_id", "imageid"),
84-
resource.TestCheckResourceAttr(s.ResourceName, "shapes.0.name", "shape1"),
85-
resource.TestCheckResourceAttr(s.ResourceName, "shapes.1.name", "shape2"),
86-
resource.TestCheckResourceAttr(s.ResourceName, "shapes.#", "2"),
83+
84+
resource.TestCheckResourceAttrSet(s.ResourceName, "availability_domain"),
85+
resource.TestCheckResourceAttrSet(s.ResourceName, "shapes.0.name"),
86+
resource.TestCheckResourceAttrSet(s.ResourceName, "shapes.1.name"),
87+
resource.TestCheckResourceAttrSet(s.ResourceName, "shapes.#"),
8788
),
8889
},
8990
},
@@ -95,6 +96,9 @@ func (s *ResourceCoreShapeTestSuite) TestResourceReadCoreShape() {
9596
}
9697

9798
func (s *ResourceCoreShapeTestSuite) TestResourceReadCoreShapeWithPagination() {
99+
if IsAccTest() {
100+
s.T().Skip()
101+
}
98102
opts := &baremetal.ListShapesOptions{}
99103
opts.AvailabilityDomain = "availability_domain"
100104
opts.ImageID = "imageid"
@@ -130,7 +134,7 @@ func (s *ResourceCoreShapeTestSuite) TestResourceReadCoreShapeWithPagination() {
130134
ImportStateVerify: true,
131135
Config: s.Config,
132136
Check: resource.ComposeTestCheckFunc(
133-
resource.TestCheckResourceAttr(s.ResourceName, "compartment_id", "compartmentid"),
137+
134138
resource.TestCheckResourceAttr(s.ResourceName, "availability_domain", "availability_domain"),
135139
resource.TestCheckResourceAttr(s.ResourceName, "image_id", "imageid"),
136140
resource.TestCheckResourceAttr(s.ResourceName, "shapes.0.name", "shape1"),

data_source_obmcs_identity_availability_domain_test.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (s *ResourceIdentityAvailabilityDomainsTestSuite) SetupTest() {
5555
}
5656
}
5757

58-
func (s *ResourceIdentityAvailabilityDomainsTestSuite) TestReadAPIKeys() {
58+
func (s *ResourceIdentityAvailabilityDomainsTestSuite) TestReadAvailabilityDomains() {
5959
s.Client.On("ListAvailabilityDomains", "compartmentID").Return(s.List, nil)
6060

6161
resource.UnitTest(s.T(), resource.TestCase{
@@ -67,18 +67,17 @@ func (s *ResourceIdentityAvailabilityDomainsTestSuite) TestReadAPIKeys() {
6767
ImportStateVerify: true,
6868
Config: s.Config,
6969
Check: resource.ComposeTestCheckFunc(
70-
resource.TestCheckResourceAttr(s.ResourceName, "compartment_id", "CompartmentID"),
71-
resource.TestCheckResourceAttr(s.ResourceName, "availability_domains.0.name", "AD1"),
72-
resource.TestCheckResourceAttr(s.ResourceName, "availability_domains.1.name", "AD2"),
70+
resource.TestCheckResourceAttrSet(s.ResourceName, "availability_domains.0.name"),
71+
resource.TestCheckResourceAttrSet(s.ResourceName, "availability_domains.1.name"),
7372
),
7473
},
7574
},
7675
},
7776
)
7877

79-
s.Client.AssertCalled(s.T(), "ListAPIKeys", "user_id")
78+
s.Client.AssertCalled(s.T(), "ListAvailabilityDomains", "user_id")
8079
}
8180

8281
func TestResourceIdentityAvailabilityDomainsTestSuite(t *testing.T) {
83-
suite.Run(t, new(ResourceIdentityAPIKeysTestSuite))
82+
suite.Run(t, new(ResourceIdentityAvailabilityDomainsTestSuite))
8483
}

data_source_obmcs_objectstorage_bucketsummary_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func (s *ObjectstorageBucketSummaryTestSuite) TestReadBucketSummaries() {
111111
ImportStateVerify: true,
112112
Config: s.Config,
113113
Check: resource.ComposeTestCheckFunc(
114-
resource.TestCheckResourceAttr(s.ResourceName, "compartment_id", "compartmentid"),
114+
115115
resource.TestCheckResourceAttr(s.ResourceName, "namespace", "namespace"),
116116
resource.TestCheckResourceAttr(s.ResourceName, "limit", "2"),
117117
resource.TestCheckResourceAttr(s.ResourceName, "bucket_summaries.0.name", "name0"),

0 commit comments

Comments
 (0)