switch to plain test framework

Author: Dmitriy Kalinin

go.mod

@@ -5,20 +5,16 @@ go 1.17
 require (
 	github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835
 	github.com/mattn/go-isatty v0.0.11
-	github.com/onsi/ginkgo v1.13.0
-	github.com/onsi/gomega v1.10.1
+	github.com/stretchr/testify v1.7.1
 	github.com/vito/go-interact v1.0.1
 	gopkg.in/yaml.v2 v2.3.0
 )
 
 require (
-	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/davecgh/go-spew v1.1.0 // indirect
 	github.com/mattn/go-colorable v0.1.4 // indirect
-	github.com/nxadm/tail v1.4.4 // indirect
-	golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
 	golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
-	golang.org/x/text v0.3.2 // indirect
-	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
 )

go.sum

@@ -2,6 +2,8 @@ github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835 h1:mYQweUIBD+TB
 github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835/go.mod h1:dYeVsKp1vvK8XjdTPR1gF+uk+9doxKeO3hqQTOCr7T4=
 github.com/creack/pty v1.1.7 h1:6pwm8kMQKCmgUg0ZHTm5+/YvRK0s3THD/28+T6/kk4A=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
@@ -11,7 +13,6 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -33,7 +34,12 @@ github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1ls
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/vito/go-interact v1.0.1 h1:O8xi8c93bRUv2Tb/v6HdiuGc+WnWt+AQzF74MOOdlBs=
 github.com/vito/go-interact v1.0.1/go.mod h1:HrdHSJXD2yn1MhlTwSIMeFgQ5WftiIorszVGd3S/DAA=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -65,7 +71,6 @@ google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -75,3 +80,5 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

ui/combo_writer_test.go

@@ -3,59 +3,46 @@ package ui_test
 import (
 	"bytes"
 	"fmt"
-	"io"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"testing"
 
 	. "github.com/cppforlife/go-cli-ui/ui"
+	"github.com/stretchr/testify/assert"
 )
 
-var _ = Describe("ComboWriter", func() {
-	var (
-		outBuffer *bytes.Buffer
-		errBuffer *bytes.Buffer
-		ui        UI
-		w         io.Writer
-	)
-
-	BeforeEach(func() {
-		outBuffer = bytes.NewBufferString("")
-		errBuffer = bytes.NewBufferString("")
-		logger := NewRecordingLogger()
-		ui = NewWriterUI(outBuffer, errBuffer, logger)
-		w = NewComboWriter(ui).Writer("prefix: ")
-	})
-
-	Describe("Writer.Write", func() {
-		type Example struct {
-			Ins []string
-			Out string
-		}
-
-		examples := []Example{
-			{Ins: []string{""}, Out: ""},
-			{Ins: []string{"", ""}, Out: ""},
-			{Ins: []string{"\n"}, Out: "prefix: \n"},
-			{Ins: []string{"", "\n"}, Out: "prefix: \n"},
-			{Ins: []string{"\n\n", "\n"}, Out: "prefix: \nprefix: \nprefix: \n"},
-			{Ins: []string{"piece1"}, Out: "prefix: piece1"},
-			{Ins: []string{"piece1", "piece2"}, Out: "prefix: piece1piece2"},
-			{Ins: []string{"piece1", "piece2\n"}, Out: "prefix: piece1piece2\n"},
-			{Ins: []string{"\npiece1", "piece2"}, Out: "prefix: \nprefix: piece1piece2"},
-			{Ins: []string{"piece1", "\npiece2"}, Out: "prefix: piece1\nprefix: piece2"},
-			{Ins: []string{"piece1\n", "piece2"}, Out: "prefix: piece1\nprefix: piece2"},
-		}
-
-		for i, ex := range examples {
-			ex := ex
-
-			It(fmt.Sprintf("prints correctly '%d'", i), func() {
-				for _, in := range ex.Ins {
-					w.Write([]byte(in))
-				}
-				Expect(outBuffer.String()).To(Equal(ex.Out))
-			})
-		}
-	})
-})
+func TestComboWriter(t *testing.T) {
+	type Example struct {
+		Ins []string
+		Out string
+	}
+
+	examples := []Example{
+		{Ins: []string{""}, Out: ""},
+		{Ins: []string{"", ""}, Out: ""},
+		{Ins: []string{"\n"}, Out: "prefix: \n"},
+		{Ins: []string{"", "\n"}, Out: "prefix: \n"},
+		{Ins: []string{"\n\n", "\n"}, Out: "prefix: \nprefix: \nprefix: \n"},
+		{Ins: []string{"piece1"}, Out: "prefix: piece1"},
+		{Ins: []string{"piece1", "piece2"}, Out: "prefix: piece1piece2"},
+		{Ins: []string{"piece1", "piece2\n"}, Out: "prefix: piece1piece2\n"},
+		{Ins: []string{"\npiece1", "piece2"}, Out: "prefix: \nprefix: piece1piece2"},
+		{Ins: []string{"piece1", "\npiece2"}, Out: "prefix: piece1\nprefix: piece2"},
+		{Ins: []string{"piece1\n", "piece2"}, Out: "prefix: piece1\nprefix: piece2"},
+	}
+
+	for i, ex := range examples {
+		ex := ex
+
+		t.Run(fmt.Sprintf("prints correctly '%d'", i), func(t *testing.T) {
+			outBuffer := bytes.NewBufferString("")
+			errBuffer := bytes.NewBufferString("")
+			logger := NewRecordingLogger()
+			ui := NewWriterUI(outBuffer, errBuffer, logger)
+			w := NewComboWriter(ui).Writer("prefix: ")
+
+			for _, in := range ex.Ins {
+				w.Write([]byte(in))
+			}
+			assert.Equal(t, outBuffer.String(), ex.Out)
+		})
+	}
+}

ui/indenting_ui_test.go

@@ -2,129 +2,118 @@ package ui_test
 
 import (
 	"bytes"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"testing"
 
 	. "github.com/cppforlife/go-cli-ui/ui"
 	fakeui "github.com/cppforlife/go-cli-ui/ui/fakes"
 	. "github.com/cppforlife/go-cli-ui/ui/table"
+	"github.com/stretchr/testify/assert"
 )
 
-var _ = Describe("IndentingUI", func() {
-	var (
-		uiOut, uiErr *bytes.Buffer
-		parentFakeUI *fakeui.FakeUI
-		parentUI     UI
-		ui           UI
-	)
-
-	BeforeEach(func() {
-		uiOut = bytes.NewBufferString("")
-		uiErr = bytes.NewBufferString("")
-
-		logger := NewRecordingLogger()
-		parentUI = NewWriterUI(uiOut, uiErr, logger)
-		parentFakeUI = &fakeui.FakeUI{}
-	})
+func TestIndentingUI(t *testing.T) {
+	t.Run("ErrorLinef", func(t *testing.T) {
+		t.Run("delegates to the parent UI with an indent", func(t *testing.T) {
+			uiOut := bytes.NewBufferString("")
+			uiErr := bytes.NewBufferString("")
+			parentUI := NewWriterUI(uiOut, uiErr, NewRecordingLogger())
 
-	JustBeforeEach(func() {
-		ui = NewIndentingUI(parentUI)
-	})
-
-	Describe("ErrorLinef", func() {
-		It("delegates to the parent UI with an indent", func() {
+			ui := NewIndentingUI(parentUI)
 			ui.ErrorLinef("fake-error-line")
-			Expect(uiErr.String()).To(ContainSubstring("  fake-error-line\n"))
-			Expect(uiOut.String()).To(BeEmpty())
+			assert.Contains(t, uiErr.String(), "  fake-error-line\n")
+			assert.Equal(t, uiOut.String(), "")
 		})
 	})
 
-	Describe("PrintLinef", func() {
-		It("delegates to the parent UI with an indent", func() {
+	t.Run("PrintLinef", func(t *testing.T) {
+		t.Run("delegates to the parent UI with an indent", func(t *testing.T) {
+			uiOut := bytes.NewBufferString("")
+			uiErr := bytes.NewBufferString("")
+			parentUI := NewWriterUI(uiOut, uiErr, NewRecordingLogger())
+
+			ui := NewIndentingUI(parentUI)
 			ui.PrintLinef("fake-line")
-			Expect(uiOut.String()).To(ContainSubstring("  fake-line\n"))
-			Expect(uiErr.String()).To(BeEmpty())
+			assert.Contains(t, uiOut.String(), "  fake-line\n")
+			assert.Equal(t, uiErr.String(), "")
 		})
 	})
 
-	Describe("BeginLinef", func() {
-		It("delegates to the parent UI with an indent", func() {
+	t.Run("BeginLinef", func(t *testing.T) {
+		t.Run("delegates to the parent UI with an indent", func(t *testing.T) {
+			uiOut := bytes.NewBufferString("")
+			uiErr := bytes.NewBufferString("")
+			parentUI := NewWriterUI(uiOut, uiErr, NewRecordingLogger())
+
+			ui := NewIndentingUI(parentUI)
 			ui.BeginLinef("fake-start")
-			Expect(uiOut.String()).To(ContainSubstring("  fake-start"))
-			Expect(uiErr.String()).To(BeEmpty())
+			assert.Contains(t, uiOut.String(), "  fake-start")
+			assert.Equal(t, uiErr.String(), "")
 		})
 	})
 
-	Describe("EndLinef", func() {
-		It("delegates to the parent UI", func() {
+	t.Run("EndLinef", func(t *testing.T) {
+		t.Run("delegates to the parent UI", func(t *testing.T) {
+			uiOut := bytes.NewBufferString("")
+			uiErr := bytes.NewBufferString("")
+			parentUI := NewWriterUI(uiOut, uiErr, NewRecordingLogger())
+
+			ui := NewIndentingUI(parentUI)
 			ui.EndLinef("fake-end")
-			Expect(uiOut.String()).To(ContainSubstring("fake-end\n"))
-			Expect(uiErr.String()).To(BeEmpty())
+			assert.Contains(t, uiOut.String(), "fake-end\n")
+			assert.Equal(t, uiErr.String(), "")
 		})
 	})
 
-	Describe("PrintBlock", func() {
-		BeforeEach(func() {
-			parentUI = parentFakeUI
-		})
-
-		It("delegates to the parent UI", func() {
+	t.Run("PrintBlock", func(t *testing.T) {
+		t.Run("delegates to the parent UI", func(t *testing.T) {
+			parentFakeUI := &fakeui.FakeUI{}
+			ui := NewIndentingUI(parentFakeUI)
 			ui.PrintBlock([]byte("block"))
-			Expect(parentFakeUI.Blocks).To(Equal([]string{"block"}))
+			assert.Equal(t, parentFakeUI.Blocks, []string{"block"})
 		})
 	})
 
-	Describe("PrintErrorBlock", func() {
-		BeforeEach(func() {
-			parentUI = parentFakeUI
-		})
-
-		It("delegates to the parent UI", func() {
+	t.Run("PrintErrorBlock", func(t *testing.T) {
+		t.Run("delegates to the parent UI", func(t *testing.T) {
+			parentFakeUI := &fakeui.FakeUI{}
+			ui := NewIndentingUI(parentFakeUI)
 			ui.PrintBlock([]byte("block"))
-			Expect(parentFakeUI.Blocks).To(Equal([]string{"block"}))
+			assert.Equal(t, parentFakeUI.Blocks, []string{"block"})
 		})
 	})
 
-	Describe("PrintTable", func() {
-		BeforeEach(func() {
-			parentUI = parentFakeUI
-		})
-
-		It("delegates to the parent UI", func() {
+	t.Run("PrintTable", func(t *testing.T) {
+		t.Run("delegates to the parent UI", func(t *testing.T) {
+			parentFakeUI := &fakeui.FakeUI{}
+			ui := NewIndentingUI(parentFakeUI)
 			table := Table{
 				Content: "things",
 				Header:  []Header{NewHeader("header1")},
 			}
 
 			ui.PrintTable(table)
-
-			Expect(parentFakeUI.Table).To(Equal(table))
+			assert.Equal(t, parentFakeUI.Table, table)
 		})
 	})
 
-	Describe("IsInteractive", func() {
-		BeforeEach(func() {
-			parentUI = parentFakeUI
-		})
+	t.Run("IsInteractive", func(t *testing.T) {
+		t.Run("delegates to the parent UI", func(t *testing.T) {
+			parentFakeUI := &fakeui.FakeUI{}
+			ui := NewIndentingUI(parentFakeUI)
 
-		It("delegates to the parent UI", func() {
 			parentFakeUI.Interactive = true
-			Expect(ui.IsInteractive()).To(BeTrue())
+			assert.Equal(t, ui.IsInteractive(), true)
 
 			parentFakeUI.Interactive = false
-			Expect(ui.IsInteractive()).To(BeFalse())
+			assert.Equal(t, ui.IsInteractive(), false)
 		})
 	})
 
-	Describe("Flush", func() {
-		BeforeEach(func() {
-			parentUI = parentFakeUI
-		})
-
-		It("delegates to the parent UI", func() {
+	t.Run("Flush", func(t *testing.T) {
+		t.Run("delegates to the parent UI", func(t *testing.T) {
+			parentFakeUI := &fakeui.FakeUI{}
+			ui := NewIndentingUI(parentFakeUI)
 			ui.Flush()
-			Expect(parentFakeUI.Flushed).To(BeTrue())
+			assert.Equal(t, parentFakeUI.Flushed, true)
 		})
 	})
-})
+}