Skip to content

Commit d869833

Browse files
planner: move planner unit tests to planner package
Move the file and fix up the tests to match the names in the new package. Signed-off-by: John Mulligan <[email protected]>
1 parent 4c1db4e commit d869833

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

internal/resources/planner_test.go renamed to internal/planner/planner_test.go

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
1313
limitations under the License.
1414
*/
1515

16-
package resources
16+
package planner
1717

1818
import (
1919
"testing"
@@ -26,12 +26,12 @@ import (
2626

2727
func TestPlannerDNSRegister(t *testing.T) {
2828
var (
29-
d dnsRegister
30-
planner *sharePlanner
29+
d DNSRegister
30+
planner *Planner
3131
)
3232

3333
// no dns register specified
34-
planner = newSharePlanner(
34+
planner = New(
3535
InstanceConfiguration{
3636
SecurityConfig: &sambaoperatorv1alpha1.SmbSecurityConfig{
3737
Spec: sambaoperatorv1alpha1.SmbSecurityConfigSpec{
@@ -40,11 +40,11 @@ func TestPlannerDNSRegister(t *testing.T) {
4040
},
4141
},
4242
&smbcc.SambaContainerConfig{})
43-
d = planner.dnsRegister()
44-
assert.Equal(t, dnsRegisterNever, d)
43+
d = planner.DNSRegister()
44+
assert.Equal(t, DNSRegisterNever, d)
4545

4646
// external-ip
47-
planner = newSharePlanner(
47+
planner = New(
4848
InstanceConfiguration{
4949
SecurityConfig: &sambaoperatorv1alpha1.SmbSecurityConfig{
5050
Spec: sambaoperatorv1alpha1.SmbSecurityConfigSpec{
@@ -56,11 +56,11 @@ func TestPlannerDNSRegister(t *testing.T) {
5656
},
5757
},
5858
&smbcc.SambaContainerConfig{})
59-
d = planner.dnsRegister()
60-
assert.Equal(t, dnsRegisterExternalIP, d)
59+
d = planner.DNSRegister()
60+
assert.Equal(t, DNSRegisterExternalIP, d)
6161

6262
// cluster-ip
63-
planner = newSharePlanner(
63+
planner = New(
6464
InstanceConfiguration{
6565
SecurityConfig: &sambaoperatorv1alpha1.SmbSecurityConfig{
6666
Spec: sambaoperatorv1alpha1.SmbSecurityConfigSpec{
@@ -72,11 +72,11 @@ func TestPlannerDNSRegister(t *testing.T) {
7272
},
7373
},
7474
&smbcc.SambaContainerConfig{})
75-
d = planner.dnsRegister()
76-
assert.Equal(t, dnsRegisterClusterIP, d)
75+
d = planner.DNSRegister()
76+
assert.Equal(t, DNSRegisterClusterIP, d)
7777

7878
// invalid string for register
79-
planner = newSharePlanner(
79+
planner = New(
8080
InstanceConfiguration{
8181
SecurityConfig: &sambaoperatorv1alpha1.SmbSecurityConfig{
8282
Spec: sambaoperatorv1alpha1.SmbSecurityConfigSpec{
@@ -88,11 +88,11 @@ func TestPlannerDNSRegister(t *testing.T) {
8888
},
8989
},
9090
&smbcc.SambaContainerConfig{})
91-
d = planner.dnsRegister()
92-
assert.Equal(t, dnsRegisterNever, d)
91+
d = planner.DNSRegister()
92+
assert.Equal(t, DNSRegisterNever, d)
9393

9494
// not AD. ignore specified value
95-
planner = newSharePlanner(
95+
planner = New(
9696
InstanceConfiguration{
9797
SecurityConfig: &sambaoperatorv1alpha1.SmbSecurityConfig{
9898
Spec: sambaoperatorv1alpha1.SmbSecurityConfigSpec{
@@ -104,18 +104,18 @@ func TestPlannerDNSRegister(t *testing.T) {
104104
},
105105
},
106106
&smbcc.SambaContainerConfig{})
107-
d = planner.dnsRegister()
108-
assert.Equal(t, dnsRegisterNever, d)
107+
d = planner.DNSRegister()
108+
assert.Equal(t, DNSRegisterNever, d)
109109
}
110110

111111
func TestPlannerDNSRegisterArgs(t *testing.T) {
112112
var (
113113
v []string
114-
planner *sharePlanner
114+
planner *Planner
115115
)
116116

117117
// external-ip
118-
planner = newSharePlanner(
118+
planner = New(
119119
InstanceConfiguration{
120120
SecurityConfig: &sambaoperatorv1alpha1.SmbSecurityConfig{
121121
Spec: sambaoperatorv1alpha1.SmbSecurityConfigSpec{
@@ -127,13 +127,13 @@ func TestPlannerDNSRegisterArgs(t *testing.T) {
127127
},
128128
},
129129
&smbcc.SambaContainerConfig{})
130-
v = planner.dnsRegisterArgs()
130+
v = planner.Args().DNSRegister()
131131
assert.Equal(t,
132132
[]string{"dns-register", "--watch", "/var/lib/svcwatch/status.json"},
133133
v)
134134

135135
// cluster-ip
136-
planner = newSharePlanner(
136+
planner = New(
137137
InstanceConfiguration{
138138
SecurityConfig: &sambaoperatorv1alpha1.SmbSecurityConfig{
139139
Spec: sambaoperatorv1alpha1.SmbSecurityConfigSpec{
@@ -145,7 +145,7 @@ func TestPlannerDNSRegisterArgs(t *testing.T) {
145145
},
146146
},
147147
&smbcc.SambaContainerConfig{})
148-
v = planner.dnsRegisterArgs()
148+
v = planner.Args().DNSRegister()
149149
assert.Equal(t,
150150
[]string{
151151
"dns-register",

0 commit comments

Comments
 (0)