tests(etcdserver): refactor

Signed-off-by: wafuwafu13 <mariobaske@i.softbank.jp>
This commit is contained in:
wafuwafu13 2022-12-16 10:09:04 +09:00
parent 8dcfca0097
commit 2ffa9e7c91

View File

@ -1,4 +1,4 @@
// Copyright 2016 The etcd Authors // Copyright 2022 The etcd Authors
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License. // you may not use this file except in compliance with the License.
@ -14,7 +14,11 @@
package etcdserver package etcdserver
import "testing" import (
"testing"
"github.com/stretchr/testify/assert"
)
func TestOriginAllowed(t *testing.T) { func TestOriginAllowed(t *testing.T) {
tests := []struct { tests := []struct {
@ -59,16 +63,14 @@ func TestOriginAllowed(t *testing.T) {
}, },
} }
for i, tt := range tests { for _, tt := range tests {
allowed := tt.accessController.OriginAllowed(tt.origin) allowed := tt.accessController.OriginAllowed(tt.origin)
if allowed != tt.allowed { assert.Equal(t, allowed, tt.allowed)
t.Fatalf("#%d: allowd = %t, want %t", i, allowed, tt.allowed)
}
} }
} }
func TestIsHostWhitelisted(t *testing.T) { func TestIsHostWhitelisted(t *testing.T) {
tests := []struct{ tests := []struct {
accessController *AccessController accessController *AccessController
host string host string
whitelisted bool whitelisted bool
@ -110,10 +112,8 @@ func TestIsHostWhitelisted(t *testing.T) {
}, },
} }
for i, tt := range tests { for _, tt := range tests {
whitelisted := tt.accessController.IsHostWhitelisted(tt.host) whitelisted := tt.accessController.IsHostWhitelisted(tt.host)
if whitelisted != tt.whitelisted { assert.Equal(t, whitelisted, tt.whitelisted)
t.Fatalf("#%d:whitelisted = %t, want %t", i, whitelisted, tt.whitelisted)
}
} }
} }