Add output helpers

nlowe · Dec 5, 2019 · ebb267b · ebb267b
1 parent f4d06fb
commit ebb267b
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 53 deletions.
diff --git a/challenge/day5/a.go b/challenge/day5/a.go
@@ -2,11 +2,11 @@ package day5
 
 import (
 	"fmt"
-	"sync"
 
 	"github.com/nlowe/aoc2019/challenge"
 	"github.com/nlowe/aoc2019/intcode"
 	"github.com/nlowe/aoc2019/intcode/input"
+	"github.com/nlowe/aoc2019/intcode/output"
 	"github.com/spf13/cobra"
 )
 
@@ -19,19 +19,13 @@ var A = &cobra.Command{
 }
 
 func a(challenge *challenge.Input) int {
-	cpu, output := intcode.NewCPUForProgram(<-challenge.Lines(), input.NewFixed(1))
+	cpu, outputs := intcode.NewCPUForProgram(<-challenge.Lines(), input.NewFixed(1))
 
 	lastCode := 0
-	wg := sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		for code := range output {
-			fmt.Printf("output: %d\n", code)
-			lastCode = code
-		}
-
-		wg.Done()
-	}()
+	wg := output.Each(outputs, func(code int) {
+		fmt.Printf("output: %d\n", code)
+		lastCode = code
+	})
 
 	cpu.Run()
 	wg.Wait()

diff --git a/challenge/day5/b.go b/challenge/day5/b.go
@@ -2,11 +2,11 @@ package day5
 
 import (
 	"fmt"
-	"sync"
 
 	"github.com/nlowe/aoc2019/challenge"
 	"github.com/nlowe/aoc2019/intcode"
 	"github.com/nlowe/aoc2019/intcode/input"
+	"github.com/nlowe/aoc2019/intcode/output"
 	"github.com/spf13/cobra"
 )
 
@@ -19,15 +19,10 @@ var B = &cobra.Command{
 }
 
 func b(challenge *challenge.Input) int {
-	cpu, output := intcode.NewCPUForProgram(<-challenge.Lines(), input.NewFixed(5))
+	cpu, outputs := intcode.NewCPUForProgram(<-challenge.Lines(), input.NewFixed(5))
 
 	code := 0
-	wg := sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		code = <-output
-		wg.Done()
-	}()
+	wg := output.Single(outputs, &code)
 
 	cpu.Run()
 	wg.Wait()

diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ module github.com/nlowe/aoc2019
 go 1.13
 
 require (
+	github.com/magiconair/properties v1.8.1
 	github.com/pelletier/go-toml v1.6.0 // indirect
 	github.com/pkg/profile v1.4.0
 	github.com/spf13/afero v1.2.2 // indirect

diff --git a/intcode/cpu_test.go b/intcode/cpu_test.go
@@ -3,10 +3,10 @@ package intcode
 import (
 	"fmt"
 	"strconv"
-	"sync"
 	"testing"
 
 	"github.com/nlowe/aoc2019/intcode/input"
+	"github.com/nlowe/aoc2019/intcode/output"
 	"github.com/stretchr/testify/require"
 )
 
@@ -55,14 +55,8 @@ func TestCPU_Indirection(t *testing.T) {
 }
 
 func TestCPU_IO(t *testing.T) {
-	sut, output := NewCPUForProgram("00003,0,00004,0,99", input.NewFixed(42))
-
-	wg := sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		require.Equal(t, 42, <-output)
-		wg.Done()
-	}()
+	sut, outputs := NewCPUForProgram("00003,0,00004,0,99", input.NewFixed(42))
+	wg := output.Expect(t, outputs, 42)
 
 	sut.Run()
 	wg.Wait()
@@ -86,14 +80,8 @@ func TestCPU_Compare(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(fmt.Sprintf("%s=%d", tt.program, tt.expected), func(t *testing.T) {
-			cpu, output := NewCPUForProgram(tt.program, tt.input)
-
-			wg := sync.WaitGroup{}
-			wg.Add(1)
-			go func() {
-				require.Equal(t, tt.expected, <-output)
-				wg.Done()
-			}()
+			cpu, outputs := NewCPUForProgram(tt.program, tt.input)
+			wg := output.Expect(t, outputs, tt.expected)
 
 			cpu.Run()
 			wg.Wait()
@@ -115,14 +103,8 @@ func TestCPU_Jump(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(fmt.Sprintf("%s=%d", tt.program, tt.expected), func(t *testing.T) {
-			cpu, output := NewCPUForProgram(tt.program, tt.input)
-
-			wg := sync.WaitGroup{}
-			wg.Add(1)
-			go func() {
-				require.Equal(t, tt.expected, <-output)
-				wg.Done()
-			}()
+			cpu, outputs := NewCPUForProgram(tt.program, tt.input)
+			wg := output.Expect(t, outputs, tt.expected)
 
 			cpu.Run()
 			wg.Wait()
@@ -143,14 +125,8 @@ func TestCPU_CmpAndJump(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(strconv.Itoa(tt.expected), func(t *testing.T) {
-			cpu, output := NewCPUForProgram(tt.program, tt.input)
-
-			wg := sync.WaitGroup{}
-			wg.Add(1)
-			go func() {
-				require.Equal(t, tt.expected, <-output)
-				wg.Done()
-			}()
+			cpu, outputs := NewCPUForProgram(tt.program, tt.input)
+			wg := output.Expect(t, outputs, tt.expected)
 
 			cpu.Run()
 			wg.Wait()

diff --git a/intcode/output/expect.go b/intcode/output/expect.go
@@ -0,0 +1,48 @@
+package output
+
+import (
+	"sync"
+	"testing"
+
+	"github.com/magiconair/properties/assert"
+)
+
+func Each(outputs <-chan int, cb func(int)) *sync.WaitGroup {
+	wg := &sync.WaitGroup{}
+
+	go func() {
+		for code := range outputs {
+			cb(code)
+		}
+
+		wg.Done()
+	}()
+
+	return wg
+}
+
+func Expect(t *testing.T, outputs <-chan int, expected ...int) *sync.WaitGroup {
+	wg := &sync.WaitGroup{}
+	wg.Add(1)
+
+	go func() {
+		for v := range outputs {
+			assert.Equal(t, expected[0], v)
+		}
+		wg.Done()
+	}()
+
+	return wg
+}
+
+func Single(outputs <-chan int, result *int) *sync.WaitGroup {
+	wg := &sync.WaitGroup{}
+	wg.Add(1)
+
+	go func() {
+		*result = <-outputs
+		wg.Done()
+	}()
+
+	return wg
+}