d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
74 lines
1.9 KiB
Go
74 lines
1.9 KiB
Go
package flagx_test
|
|
|
|
// The code in this file is adapted from github.com/m-lab/go and more
|
|
// specifically from <https://git.io/JJ8UA>. This file is licensed under
|
|
// version 2.0 of the Apache License <https://git.io/JJ8Ux>.
|
|
|
|
import (
|
|
"flag"
|
|
"testing"
|
|
|
|
"github.com/google/go-cmp/cmp"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/flagx"
|
|
)
|
|
|
|
func TestStringArray(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
args []string
|
|
expt flagx.StringArray
|
|
repr string
|
|
contains string
|
|
wantErr bool
|
|
}{
|
|
{
|
|
name: "okay",
|
|
args: []string{"a", "b"},
|
|
expt: flagx.StringArray{"a", "b"},
|
|
repr: `[]string{"a", "b"}`,
|
|
contains: "b",
|
|
},
|
|
{
|
|
name: "okay-split-commas",
|
|
args: []string{"a", "b", "c,d"},
|
|
expt: flagx.StringArray{"a", "b", "c", "d"},
|
|
repr: `[]string{"a", "b", "c", "d"}`,
|
|
contains: "d",
|
|
},
|
|
{
|
|
name: "empty",
|
|
args: []string{},
|
|
expt: flagx.StringArray{},
|
|
repr: `[]string{}`,
|
|
contains: "a",
|
|
wantErr: true,
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
sa := &flagx.StringArray{}
|
|
for i := range tt.args {
|
|
if err := sa.Set(tt.args[i]); err != nil {
|
|
t.Errorf("StringArray.Set() error = %v, want nil", err)
|
|
}
|
|
}
|
|
v := (sa.Get().(flagx.StringArray))
|
|
if diff := cmp.Diff(v, tt.expt); diff != "" {
|
|
t.Errorf("StringArray.Get() unexpected differences %v", diff)
|
|
}
|
|
if tt.repr != sa.String() {
|
|
t.Errorf("StringArray.String() want = %q, got %q", tt.repr, sa.String())
|
|
}
|
|
if sa.Contains(tt.contains) == tt.wantErr {
|
|
t.Errorf("StringArray.Contains() want = %q, got %t", tt.repr, sa.Contains(tt.contains))
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// Successful compilation of this function means that StringArray implements the
|
|
// flag.Getter interface. The function need not be called.
|
|
func assertFlagGetterStringArray(b flagx.StringArray) {
|
|
func(in flag.Getter) {}(&b)
|
|
}
|