mirror of
https://github.com/rclone/rclone.git
synced 2024-11-07 09:04:52 +01:00
fs: make Flagger and FlaggerNP interfaces public so we can test flags elsewhere
This commit is contained in:
parent
e79273f9c9
commit
2e653f8128
@ -31,8 +31,8 @@ func (bitsChoices) Choices() []BitsChoicesInfo {
|
||||
|
||||
// Check it satisfies the interfaces
|
||||
var (
|
||||
_ flagger = (*bits)(nil)
|
||||
_ flaggerNP = bits(0)
|
||||
_ Flagger = (*bits)(nil)
|
||||
_ FlaggerNP = bits(0)
|
||||
)
|
||||
|
||||
func TestBitsString(t *testing.T) {
|
||||
|
@ -11,8 +11,8 @@ import (
|
||||
|
||||
// Check it satisfies the interfaces
|
||||
var (
|
||||
_ flagger = (*BwTimetable)(nil)
|
||||
_ flaggerNP = BwTimetable{}
|
||||
_ Flagger = (*BwTimetable)(nil)
|
||||
_ FlaggerNP = BwTimetable{}
|
||||
)
|
||||
|
||||
func TestBwTimetableSet(t *testing.T) {
|
||||
|
@ -11,8 +11,8 @@ import (
|
||||
|
||||
// Check it satisfies the interfaces
|
||||
var (
|
||||
_ flagger = (*CountSuffix)(nil)
|
||||
_ flaggerNP = CountSuffix(0)
|
||||
_ Flagger = (*CountSuffix)(nil)
|
||||
_ FlaggerNP = CountSuffix(0)
|
||||
)
|
||||
|
||||
func TestCountSuffixString(t *testing.T) {
|
||||
|
@ -11,8 +11,8 @@ import (
|
||||
|
||||
// Check it satisfies the interfaces
|
||||
var (
|
||||
_ flagger = (*CutoffMode)(nil)
|
||||
_ flaggerNP = CutoffMode(0)
|
||||
_ Flagger = (*CutoffMode)(nil)
|
||||
_ FlaggerNP = CutoffMode(0)
|
||||
)
|
||||
|
||||
func TestCutoffModeString(t *testing.T) {
|
||||
|
@ -10,8 +10,8 @@ import (
|
||||
|
||||
// Check it satisfies the interfaces
|
||||
var (
|
||||
_ flagger = (*DumpFlags)(nil)
|
||||
_ flaggerNP = DumpFlags(0)
|
||||
_ Flagger = (*DumpFlags)(nil)
|
||||
_ FlaggerNP = DumpFlags(0)
|
||||
)
|
||||
|
||||
func TestDumpFlagsString(t *testing.T) {
|
||||
|
@ -29,8 +29,8 @@ const (
|
||||
|
||||
// Check it satisfies the interfaces
|
||||
var (
|
||||
_ flagger = (*choice)(nil)
|
||||
_ flaggerNP = choice(0)
|
||||
_ Flagger = (*choice)(nil)
|
||||
_ FlaggerNP = choice(0)
|
||||
)
|
||||
|
||||
func TestEnumString(t *testing.T) {
|
||||
|
@ -12,8 +12,8 @@ import (
|
||||
|
||||
// Check it satisfies the interfaces
|
||||
var (
|
||||
_ flagger = (*LogLevel)(nil)
|
||||
_ flaggerNP = LogLevel(0)
|
||||
_ Flagger = (*LogLevel)(nil)
|
||||
_ FlaggerNP = LogLevel(0)
|
||||
_ fmt.Stringer = LogValueItem{}
|
||||
)
|
||||
|
||||
|
@ -13,8 +13,8 @@ import (
|
||||
|
||||
// Check it satisfies the interfaces
|
||||
var (
|
||||
_ flagger = (*Duration)(nil)
|
||||
_ flaggerNP = Duration(0)
|
||||
_ Flagger = (*Duration)(nil)
|
||||
_ FlaggerNP = Duration(0)
|
||||
)
|
||||
|
||||
func TestParseDuration(t *testing.T) {
|
||||
|
@ -12,8 +12,8 @@ import (
|
||||
|
||||
// Check it satisfies the interfaces
|
||||
var (
|
||||
_ flagger = (*Time)(nil)
|
||||
_ flaggerNP = Time{}
|
||||
_ Flagger = (*Time)(nil)
|
||||
_ FlaggerNP = Time{}
|
||||
)
|
||||
|
||||
func TestParseTime(t *testing.T) {
|
||||
|
@ -5,31 +5,14 @@ import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/spf13/pflag"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
// Interface which flags must satisfy - only defined for _test.go
|
||||
// since we don't want to pull in pflag here
|
||||
type flagger interface {
|
||||
pflag.Value
|
||||
json.Unmarshaler
|
||||
}
|
||||
|
||||
// Interface which non-pointer flags must satisfy
|
||||
//
|
||||
// These are from pflag.Value and need to be non-pointer due the the
|
||||
// way the backend flags are inserted into the flags.
|
||||
type flaggerNP interface {
|
||||
String() string
|
||||
Type() string
|
||||
}
|
||||
|
||||
// Check it satisfies the interfaces
|
||||
var (
|
||||
_ flagger = (*SizeSuffix)(nil)
|
||||
_ flaggerNP = SizeSuffix(0)
|
||||
_ Flagger = (*SizeSuffix)(nil)
|
||||
_ FlaggerNP = SizeSuffix(0)
|
||||
)
|
||||
|
||||
func TestSizeSuffixString(t *testing.T) {
|
||||
|
@ -11,8 +11,8 @@ import (
|
||||
|
||||
// Check it satisfies the interfaces
|
||||
var (
|
||||
_ flagger = (*Tristate)(nil)
|
||||
_ flaggerNP = Tristate{}
|
||||
_ Flagger = (*Tristate)(nil)
|
||||
_ FlaggerNP = Tristate{}
|
||||
)
|
||||
|
||||
func TestTristateString(t *testing.T) {
|
||||
|
21
fs/types.go
21
fs/types.go
@ -5,6 +5,7 @@ package fs
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"io"
|
||||
"time"
|
||||
|
||||
@ -312,6 +313,26 @@ type ListRCallback func(entries DirEntries) error
|
||||
// ListRFn is defines the call used to recursively list a directory
|
||||
type ListRFn func(ctx context.Context, dir string, callback ListRCallback) error
|
||||
|
||||
// Flagger describes the interface rclone config types flags must satisfy
|
||||
type Flagger interface {
|
||||
// These are from pflag.Value which we don't want to pull in here
|
||||
String() string
|
||||
Set(string) error
|
||||
Type() string
|
||||
json.Unmarshaler
|
||||
}
|
||||
|
||||
// FlaggerNP describes the interface rclone config types flags must
|
||||
// satisfy as non-pointers
|
||||
//
|
||||
// These are from pflag.Value and need to be tested against
|
||||
// non-pointer value due the the way the backend flags are inserted
|
||||
// into the flags.
|
||||
type FlaggerNP interface {
|
||||
String() string
|
||||
Type() string
|
||||
}
|
||||
|
||||
// NewUsageValue makes a valid value
|
||||
func NewUsageValue(value int64) *int64 {
|
||||
p := new(int64)
|
||||
|
Loading…
Reference in New Issue
Block a user