improve code quality

kamilsk · Feb 19, 2019 · 939feaf · 939feaf
1 parent a977c7f
commit 939feaf
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/channel_test.go b/channel_test.go
@@ -5,14 +5,14 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kamilsk/retry"
+	. "github.com/kamilsk/retry"
 )
 
 func TestMultiplex(t *testing.T) {
 	sleep := 100 * time.Millisecond
 
 	start := time.Now()
-	<-retry.Multiplex(retry.WithSignal(os.Interrupt), retry.WithTimeout(sleep))
+	<-Multiplex(WithSignal(os.Interrupt), WithTimeout(sleep))
 	end := time.Now()
 
 	if expected, obtained := sleep, end.Sub(start); expected > obtained {
@@ -21,7 +21,7 @@ func TestMultiplex(t *testing.T) {
 }
 
 func TestMultiplex_WithoutChannels(t *testing.T) {
-	<-retry.Multiplex()
+	<-Multiplex()
 }
 
 func TestWithDeadline(t *testing.T) {
@@ -34,7 +34,7 @@ func TestWithDeadline(t *testing.T) {
 	}
 	for _, test := range tests {
 		start := time.Now()
-		<-retry.WithDeadline(start.Add(test.deadline))
+		<-WithDeadline(start.Add(test.deadline))
 		end := time.Now()
 
 		if !end.After(start.Add(test.deadline)) {
@@ -44,14 +44,14 @@ func TestWithDeadline(t *testing.T) {
 }
 
 func TestWithSignal_NilSignal(t *testing.T) {
-	<-retry.WithSignal(nil)
+	<-WithSignal(nil)
 }
 
 func TestWithTimeout(t *testing.T) {
 	sleep := 100 * time.Millisecond
 
 	start := time.Now()
-	<-retry.WithTimeout(sleep)
+	<-WithTimeout(sleep)
 	end := time.Now()
 
 	if expected, obtained := sleep, end.Sub(start); expected > obtained {

diff --git a/cmd/retry/parser.go b/cmd/retry/parser.go
@@ -31,7 +31,7 @@ type Command struct {
 }
 
 var (
-	re = regexp.MustCompile(`^(\w+)(?::((?:[\w\.]+,?)+))?$`)
+	re = regexp.MustCompile(`^(\w+)(?::((?:[\w.]+,?)+))?$`)
 
 	compliance map[string]struct {
 		cursor  interface{}

diff --git a/cmd/retry/parser_gen.go b/cmd/retry/parser_gen.go
@@ -53,7 +53,7 @@ func init() {
 	}
 	usage = func(output io.Writer, md Metadata) func() {
 		return func() {
-			fmt.Fprintf(output, `
+			_, _ = fmt.Fprintf(output, `
 Usage: %s [-timeout Timeout] [--debug] [--notify] [strategy flags] -- command
 
 The strategy flags

diff --git a/context_test.go b/context_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kamilsk/retry"
+	. "github.com/kamilsk/retry"
 )
 
 func TestWithContext(t *testing.T) {
@@ -28,7 +28,7 @@ func TestWithContext(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 
 			start := time.Now()
-			<-retry.WithContext(context.TODO(), tc.deadline()).Done()
+			<-WithContext(context.TODO(), tc.deadline()).Done()
 			end := time.Now()
 
 			if !end.After(start.Add(tc.expected)) {

diff --git a/retry_test.go b/retry_test.go
@@ -5,9 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/kamilsk/retry/strategy"
-
 	. "github.com/kamilsk/retry"
+	. "github.com/kamilsk/retry/strategy"
 )
 
 func TestRetry(t *testing.T) {
@@ -35,7 +34,7 @@ func TestRetry_PanickedAction(t *testing.T) {
 		panic("catch me if you can")
 	}
 
-	err := Retry(nil, action, strategy.Infinite())
+	err := Retry(nil, action, Infinite())
 
 	if nil == err {
 		t.Error("expected an error")
@@ -65,7 +64,7 @@ func TestRetry_RetriesUntilNoErrorReturned(t *testing.T) {
 		return errors.New("error")
 	}
 
-	err := Retry(nil, action, strategy.Infinite())
+	err := Retry(nil, action, Infinite())
 
 	if nil != err {
 		t.Error("expected a nil error")
@@ -81,7 +80,7 @@ func TestRetry_RetriesUntilNoErrorReturned(t *testing.T) {
 func TestRetry_RetriesWithAlreadyDoneContext(t *testing.T) {
 	deadline, expected := WithTimeout(0), "operation timeout"
 
-	if err := Retry(deadline, func(uint) error { return nil }, strategy.Infinite()); !IsTimeout(err) {
+	if err := Retry(deadline, func(uint) error { return nil }, Infinite()); !IsTimeout(err) {
 		t.Errorf("an unexpected error. expected: %s; obtained: %v", expected, err)
 	}
 }
@@ -94,7 +93,7 @@ func TestRetry_RetriesWithDeadline(t *testing.T) {
 		return nil
 	}
 
-	if err := Retry(deadline, action, strategy.Infinite()); !IsTimeout(err) {
+	if err := Retry(deadline, action, Infinite()); !IsTimeout(err) {
 		t.Errorf("an unexpected error. expected: %s; obtained: %v", expected, err)
 	}
 }