Renamed Result.Succeeded to Status and removed Failed

This commit is contained in:
2024-09-24 13:16:30 -06:00
parent f8bc7582a5
commit 9375b51a70
7 changed files with 114 additions and 113 deletions

View File

@ -30,9 +30,8 @@ func TestRegexp(t *testing.T) {
t.Run("basically works", func(t *testing.T) {
result, err := pbytes.Regexp("a")(gigaparsec.MakeState(cursor.NewSlice([]byte("a"))))
must.NoError(t, err)
must.False(t, result.Failed(), must.Sprint(result.Message()))
succeeded, value, _ := result.Succeeded()
test.True(t, succeeded)
success, value, _ := result.Status()
test.True(t, success, test.Sprint(result.Message()))
test.EqOp(t, "a", value)
test.True(t, result.Consumed())
})
@ -58,7 +57,8 @@ func TestMatchString(t *testing.T) {
readErr := pgen.Error().Draw(t, "readErr")
result, err := pbytes.MatchString(s)(gigaparsec.MakeState(cursor.NewReaderAt(ptest.ErrReaderAt(readErr))))
test.ErrorIs(t, err, readErr)
test.True(t, result.Failed())
success, _, _ := result.Status()
test.False(t, success)
test.False(t, result.Consumed())
}))
t.Run("does not succeed or consume on mismatch", rapid.MakeCheck(func(t *rapid.T) {
@ -68,8 +68,9 @@ func TestMatchString(t *testing.T) {
s := string(bgen.Filter(notPrefix).Draw(t, "s"))
result, err := pbytes.MatchString(s)(gigaparsec.MakeState(cursor.NewSlice(input)))
must.NoError(t, err)
must.True(t, result.Failed())
test.NoError(t, err)
success, _, _ := result.Status()
test.False(t, success)
test.False(t, result.Consumed())
}))
t.Run("succeeds with correct value, consumption, and position", rapid.MakeCheck(func(t *rapid.T) {
@ -78,8 +79,8 @@ func TestMatchString(t *testing.T) {
s := string(input[:slen])
result, err := pbytes.MatchString(s)(gigaparsec.MakeState(cursor.NewSlice(input)))
must.NoError(t, err)
succeeded, value, next := result.Succeeded()
must.True(t, succeeded)
success, value, next := result.Status()
must.True(t, success)
test.True(t, result.Consumed())
test.EqOp(t, s, value)
ptest.StateIsAt(t, next, uint64(slen))