Skip to content

Commit 176d515

Browse files
rubenhoenlerubenhoenle
committed
stage 2
1 parent 287574d commit 176d515

File tree

41 files changed

+82
-2010
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+82
-2010
lines changed

‎internal/cmd/beta/sqlserverflex/user/delete/delete_test.go‎

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
87
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
9-
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
8+
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
109

1110
"github.com/google/go-cmp/cmp"
1211
"github.com/google/go-cmp/cmp/cmpopts"
@@ -154,54 +153,7 @@ func TestParseInput(t *testing.T) {
154153

155154
for _, tt := range tests {
156155
t.Run(tt.description, func(t *testing.T) {
157-
p := print.NewPrinter()
158-
cmd := NewCmd(&params.CmdParams{Printer: p})
159-
err := globalflags.Configure(cmd.Flags())
160-
if err != nil {
161-
t.Fatalf("configure global flags: %v", err)
162-
}
163-
164-
for flag, value := range tt.flagValues {
165-
err := cmd.Flags().Set(flag, value)
166-
if err != nil {
167-
if !tt.isValid {
168-
return
169-
}
170-
t.Fatalf("setting flag --%s=%s: %v", flag, value, err)
171-
}
172-
}
173-
174-
err = cmd.ValidateArgs(tt.argValues)
175-
if err != nil {
176-
if !tt.isValid {
177-
return
178-
}
179-
t.Fatalf("error validating args: %v", err)
180-
}
181-
182-
err = cmd.ValidateRequiredFlags()
183-
if err != nil {
184-
if !tt.isValid {
185-
return
186-
}
187-
t.Fatalf("error validating flags: %v", err)
188-
}
189-
190-
model, err := parseInput(p, cmd, tt.argValues)
191-
if err != nil {
192-
if !tt.isValid {
193-
return
194-
}
195-
t.Fatalf("error parsing flags: %v", err)
196-
}
197-
198-
if !tt.isValid {
199-
t.Fatalf("did not fail on invalid input")
200-
}
201-
diff := cmp.Diff(model, tt.expectedModel)
202-
if diff != "" {
203-
t.Fatalf("Data does not match: %s", diff)
204-
}
156+
testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid)
205157
})
206158
}
207159
}

‎internal/cmd/beta/sqlserverflex/user/describe/describe_test.go‎

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
1111
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1212
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
13+
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
1314
"github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex"
1415
)
1516

@@ -153,54 +154,7 @@ func TestParseInput(t *testing.T) {
153154

154155
for _, tt := range tests {
155156
t.Run(tt.description, func(t *testing.T) {
156-
p := print.NewPrinter()
157-
cmd := NewCmd(&params.CmdParams{Printer: p})
158-
err := globalflags.Configure(cmd.Flags())
159-
if err != nil {
160-
t.Fatalf("configure global flags: %v", err)
161-
}
162-
163-
for flag, value := range tt.flagValues {
164-
err := cmd.Flags().Set(flag, value)
165-
if err != nil {
166-
if !tt.isValid {
167-
return
168-
}
169-
t.Fatalf("setting flag --%s=%s: %v", flag, value, err)
170-
}
171-
}
172-
173-
err = cmd.ValidateArgs(tt.argValues)
174-
if err != nil {
175-
if !tt.isValid {
176-
return
177-
}
178-
t.Fatalf("error validating args: %v", err)
179-
}
180-
181-
err = cmd.ValidateRequiredFlags()
182-
if err != nil {
183-
if !tt.isValid {
184-
return
185-
}
186-
t.Fatalf("error validating flags: %v", err)
187-
}
188-
189-
model, err := parseInput(p, cmd, tt.argValues)
190-
if err != nil {
191-
if !tt.isValid {
192-
return
193-
}
194-
t.Fatalf("error parsing flags: %v", err)
195-
}
196-
197-
if !tt.isValid {
198-
t.Fatalf("did not fail on invalid input")
199-
}
200-
diff := cmp.Diff(model, tt.expectedModel)
201-
if diff != "" {
202-
t.Fatalf("Data does not match: %s", diff)
203-
}
157+
testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid)
204158
})
205159
}
206160
}

‎internal/cmd/beta/sqlserverflex/user/reset-password/reset_password_test.go‎

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
1111
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1212
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
13+
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
1314
"github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex"
1415
)
1516

@@ -153,54 +154,7 @@ func TestParseInput(t *testing.T) {
153154

154155
for _, tt := range tests {
155156
t.Run(tt.description, func(t *testing.T) {
156-
p := print.NewPrinter()
157-
cmd := NewCmd(&params.CmdParams{Printer: p})
158-
err := globalflags.Configure(cmd.Flags())
159-
if err != nil {
160-
t.Fatalf("configure global flags: %v", err)
161-
}
162-
163-
for flag, value := range tt.flagValues {
164-
err := cmd.Flags().Set(flag, value)
165-
if err != nil {
166-
if !tt.isValid {
167-
return
168-
}
169-
t.Fatalf("setting flag --%s=%s: %v", flag, value, err)
170-
}
171-
}
172-
173-
err = cmd.ValidateArgs(tt.argValues)
174-
if err != nil {
175-
if !tt.isValid {
176-
return
177-
}
178-
t.Fatalf("error validating args: %v", err)
179-
}
180-
181-
err = cmd.ValidateRequiredFlags()
182-
if err != nil {
183-
if !tt.isValid {
184-
return
185-
}
186-
t.Fatalf("error validating flags: %v", err)
187-
}
188-
189-
model, err := parseInput(p, cmd, tt.argValues)
190-
if err != nil {
191-
if !tt.isValid {
192-
return
193-
}
194-
t.Fatalf("error parsing flags: %v", err)
195-
}
196-
197-
if !tt.isValid {
198-
t.Fatalf("did not fail on invalid input")
199-
}
200-
diff := cmp.Diff(model, tt.expectedModel)
201-
if diff != "" {
202-
t.Fatalf("Data does not match: %s", diff)
203-
}
157+
testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid)
204158
})
205159
}
206160
}

‎internal/cmd/dns/zone/clone/clone_test.go‎

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
1111
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1212
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
13+
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
1314
"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
1415
"github.com/stackitcloud/stackit-sdk-go/services/dns"
1516
)
@@ -169,54 +170,7 @@ func TestParseInput(t *testing.T) {
169170

170171
for _, tt := range tests {
171172
t.Run(tt.description, func(t *testing.T) {
172-
p := print.NewPrinter()
173-
cmd := NewCmd(&params.CmdParams{Printer: p})
174-
err := globalflags.Configure(cmd.Flags())
175-
if err != nil {
176-
t.Fatalf("configure global flags: %v", err)
177-
}
178-
179-
for flag, value := range tt.flagValues {
180-
err := cmd.Flags().Set(flag, value)
181-
if err != nil {
182-
if !tt.isValid {
183-
return
184-
}
185-
t.Fatalf("setting flag --%s=%s: %v", flag, value, err)
186-
}
187-
}
188-
189-
err = cmd.ValidateArgs(tt.argValues)
190-
if err != nil {
191-
if !tt.isValid {
192-
return
193-
}
194-
t.Fatalf("error validating args: %v", err)
195-
}
196-
197-
err = cmd.ValidateRequiredFlags()
198-
if err != nil {
199-
if !tt.isValid {
200-
return
201-
}
202-
t.Fatalf("error validating flags: %v", err)
203-
}
204-
205-
model, err := parseInput(p, cmd, tt.argValues)
206-
if err != nil {
207-
if !tt.isValid {
208-
return
209-
}
210-
t.Fatalf("error parsing flags: %v", err)
211-
}
212-
213-
if !tt.isValid {
214-
t.Fatalf("did not fail on invalid input")
215-
}
216-
diff := cmp.Diff(model, tt.expectedModel)
217-
if diff != "" {
218-
t.Fatalf("Data does not match: %s", diff)
219-
}
173+
testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid)
220174
})
221175
}
222176
}

‎internal/cmd/load-balancer/delete/delete_test.go‎

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
87
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
9-
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
8+
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
109

1110
"github.com/google/go-cmp/cmp"
1211
"github.com/google/go-cmp/cmp/cmpopts"
@@ -130,54 +129,7 @@ func TestParseInput(t *testing.T) {
130129

131130
for _, tt := range tests {
132131
t.Run(tt.description, func(t *testing.T) {
133-
p := print.NewPrinter()
134-
cmd := NewCmd(&params.CmdParams{Printer: p})
135-
err := globalflags.Configure(cmd.Flags())
136-
if err != nil {
137-
t.Fatalf("configure global flags: %v", err)
138-
}
139-
140-
for flag, value := range tt.flagValues {
141-
err := cmd.Flags().Set(flag, value)
142-
if err != nil {
143-
if !tt.isValid {
144-
return
145-
}
146-
t.Fatalf("setting flag --%s=%s: %v", flag, value, err)
147-
}
148-
}
149-
150-
err = cmd.ValidateArgs(tt.argValues)
151-
if err != nil {
152-
if !tt.isValid {
153-
return
154-
}
155-
t.Fatalf("error validating args: %v", err)
156-
}
157-
158-
err = cmd.ValidateRequiredFlags()
159-
if err != nil {
160-
if !tt.isValid {
161-
return
162-
}
163-
t.Fatalf("error validating flags: %v", err)
164-
}
165-
166-
model, err := parseInput(p, cmd, tt.argValues)
167-
if err != nil {
168-
if !tt.isValid {
169-
return
170-
}
171-
t.Fatalf("error parsing flags: %v", err)
172-
}
173-
174-
if !tt.isValid {
175-
t.Fatalf("did not fail on invalid input")
176-
}
177-
diff := cmp.Diff(model, tt.expectedModel)
178-
if diff != "" {
179-
t.Fatalf("Data does not match: %s", diff)
180-
}
132+
testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid)
181133
})
182134
}
183135
}

‎internal/cmd/load-balancer/describe/describe_test.go‎

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/stackitcloud/stackit-cli/internal/cmd/params"
1111
"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
1212
"github.com/stackitcloud/stackit-cli/internal/pkg/print"
13+
"github.com/stackitcloud/stackit-cli/internal/pkg/testutils"
1314
"github.com/stackitcloud/stackit-sdk-go/services/loadbalancer"
1415
)
1516

@@ -129,54 +130,7 @@ func TestParseInput(t *testing.T) {
129130

130131
for _, tt := range tests {
131132
t.Run(tt.description, func(t *testing.T) {
132-
p := print.NewPrinter()
133-
cmd := NewCmd(&params.CmdParams{Printer: p})
134-
err := globalflags.Configure(cmd.Flags())
135-
if err != nil {
136-
t.Fatalf("configure global flags: %v", err)
137-
}
138-
139-
for flag, value := range tt.flagValues {
140-
err := cmd.Flags().Set(flag, value)
141-
if err != nil {
142-
if !tt.isValid {
143-
return
144-
}
145-
t.Fatalf("setting flag --%s=%s: %v", flag, value, err)
146-
}
147-
}
148-
149-
err = cmd.ValidateArgs(tt.argValues)
150-
if err != nil {
151-
if !tt.isValid {
152-
return
153-
}
154-
t.Fatalf("error validating args: %v", err)
155-
}
156-
157-
err = cmd.ValidateRequiredFlags()
158-
if err != nil {
159-
if !tt.isValid {
160-
return
161-
}
162-
t.Fatalf("error validating flags: %v", err)
163-
}
164-
165-
model, err := parseInput(p, cmd, tt.argValues)
166-
if err != nil {
167-
if !tt.isValid {
168-
return
169-
}
170-
t.Fatalf("error parsing flags: %v", err)
171-
}
172-
173-
if !tt.isValid {
174-
t.Fatalf("did not fail on invalid input")
175-
}
176-
diff := cmp.Diff(model, tt.expectedModel)
177-
if diff != "" {
178-
t.Fatalf("Data does not match: %s", diff)
179-
}
133+
testutils.TestParseInput(t, NewCmd, parseInput, tt.expectedModel, tt.argValues, tt.flagValues, tt.isValid)
180134
})
181135
}
182136
}

0 commit comments

Comments
 (0)