Remove Regexp/RegexpPattern

bryphe-coder · bryphe-coder · commit 09e844b11581 · 2022-02-14T18:56:03.000Z
diff --git a/expect/expect_opt.go b/expect/expect_opt.go
@@ -225,36 +225,6 @@ func String(strs ...string) Opt {
 	}
 }
 
-// Regexp adds an Expect condition to exit if the content read from Console's
-// tty matches the given Regexp.
-func Regexp(res ...*regexp.Regexp) Opt {
-	return func(opts *Opts) error {
-		for _, re := range res {
-			opts.Matchers = append(opts.Matchers, &regexpMatcher{
-				re: re,
-			})
-		}
-		return nil
-	}
-}
-
-// RegexpPattern adds an Expect condition to exit if the content read from
-// Console's tty matches the given Regexp patterns. Expect returns an error if
-// the patterns were unsuccessful in compiling the Regexp.
-func RegexpPattern(ps ...string) Opt {
-	return func(opts *Opts) error {
-		var res []*regexp.Regexp
-		for _, p := range ps {
-			re, err := regexp.Compile(p)
-			if err != nil {
-				return err
-			}
-			res = append(res, re)
-		}
-		return Regexp(res...)(opts)
-	}
-}
-
 // Error adds an Expect condition to exit if reading from Console's tty returns
 // one of the provided errors.
 func Error(errs ...error) Opt {
diff --git a/expect/expect_opt_test.go b/expect/expect_opt_test.go
@@ -17,7 +17,6 @@ package expect_test
 import (
 	"bytes"
 	"io"
-	"regexp"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -83,122 +82,6 @@ func TestExpectOptString(t *testing.T) {
 	}
 }
 
-func TestExpectOptRegexp(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		title    string
-		opt      Opt
-		data     string
-		expected bool
-	}{
-		{
-			"No args",
-			Regexp(),
-			"Hello world",
-			false,
-		},
-		{
-			"Single arg",
-			Regexp(regexp.MustCompile(`^Hello`)),
-			"Hello world",
-			true,
-		},
-		{
-			"Multiple arg",
-			Regexp(regexp.MustCompile(`^Hello$`), regexp.MustCompile(`world$`)),
-			"Hello world",
-			true,
-		},
-		{
-			"No matches",
-			Regexp(regexp.MustCompile(`^Hello$`)),
-			"Hello world",
-			false,
-		},
-	}
-
-	for _, test := range tests {
-		test := test
-		t.Run(test.title, func(t *testing.T) {
-			t.Parallel()
-
-			var options Opts
-			err := test.opt(&options)
-			require.Nil(t, err)
-
-			buf := new(bytes.Buffer)
-			_, err = buf.WriteString(test.data)
-			require.Nil(t, err)
-
-			matcher := options.Match(buf)
-			if test.expected {
-				require.NotNil(t, matcher)
-			} else {
-				require.Nil(t, matcher)
-			}
-		})
-	}
-}
-
-func TestExpectOptRegexpPattern(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		title    string
-		opt      Opt
-		data     string
-		expected bool
-	}{
-		{
-			"No args",
-			RegexpPattern(),
-			"Hello world",
-			false,
-		},
-		{
-			"Single arg",
-			RegexpPattern(`^Hello`),
-			"Hello world",
-			true,
-		},
-		{
-			"Multiple arg",
-			RegexpPattern(`^Hello$`, `world$`),
-			"Hello world",
-			true,
-		},
-		{
-			"No matches",
-			RegexpPattern(`^Hello$`),
-			"Hello world",
-			false,
-		},
-	}
-
-	for _, test := range tests {
-		test := test
-		t.Run(test.title, func(t *testing.T) {
-			t.Parallel()
-
-			var options Opts
-			err := test.opt(&options)
-			require.Nil(t, err)
-
-			buf := new(bytes.Buffer)
-			_, err = buf.WriteString(test.data)
-			require.Nil(t, err)
-
-			matcher := options.Match(buf)
-			if test.expected {
-				require.NotNil(t, matcher)
-			} else {
-				require.Nil(t, matcher)
-			}
-		})
-	}
-}
-
 func TestExpectOptError(t *testing.T) {
 	t.Parallel()
 
@@ -310,18 +193,6 @@ func TestExpectOptAll(t *testing.T) {
 			"Hello world",
 			true,
 		},
-		{
-			"Mixed opts match",
-			All(String("Hello"), RegexpPattern(`wo[a-z]{1}ld`)),
-			"Hello woxld",
-			true,
-		},
-		{
-			"Mixed opts no match",
-			All(String("Hello"), RegexpPattern(`wo[a-z]{1}ld`)),
-			"Hello wo4ld",
-			false,
-		},
 	}
 
 	for _, test := range tests {
