modified template script, more in-line w/ generated code

This commit is contained in:
alexchao26
2020-12-12 21:41:06 -05:00
parent 15c41ba227
commit 7d03c33c61
+23 -30
View File
@@ -17,19 +17,19 @@ type TemplateData struct {
var testTemplateString = `package main var testTemplateString = `package main
import "testing" import (
"testing"
)
var tests1 = []struct { func Test_part1(t *testing.T) {
name string tests := []struct {
want int name string
input string input string
// add extra args if needed want int
}{ }{
// {"actual", ACTUAL_ANSWER, util.ReadFile("input.txt")}, // {"actual", ACTUAL_ANSWER, util.ReadFile("input.txt")},
} }
for _, tt := range tests {
func TestPart1(t *testing.T) {
for _, tt := range tests1 {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
if got := part1(tt.input); got != tt.want { if got := part1(tt.input); got != tt.want {
t.Errorf("part1() = %v, want %v", got, tt.want) t.Errorf("part1() = %v, want %v", got, tt.want)
@@ -38,17 +38,15 @@ func TestPart1(t *testing.T) {
} }
} }
var tests2 = []struct { func Test_part2(t *testing.T) {
name string tests := []struct {
want int name string
input string input string
// add extra args if needed want int
}{ }{
// {"actual", ACTUAL_ANSWER, util.ReadFile("input.txt")}, // {"actual", ACTUAL_ANSWER, util.ReadFile("input.txt")},
} }
for _, tt := range tests {
func TestPart2(t *testing.T) {
for _, tt := range tests2 {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
if got := part2(tt.input); got != tt.want { if got := part2(tt.input); got != tt.want {
t.Errorf("part2() = %v, want %v", got, tt.want) t.Errorf("part2() = %v, want %v", got, tt.want)
@@ -65,6 +63,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/alexchao26/advent-of-code-go/mathutil"
"github.com/alexchao26/advent-of-code-go/util" "github.com/alexchao26/advent-of-code-go/util"
) )
@@ -93,20 +92,14 @@ func part1(input string) int {
} }
func part2(input string) int { func part2(input string) int {
parsed := parseInput(input)
_ = parsed
return 0 return 0
} }
func parseInput(input string) []int { func parseInput(input string) (ans []int) {
var ans []int
lines := strings.Split(input, "\n") lines := strings.Split(input, "\n")
for _, l := range lines { for _, l := range lines {
ans = append(ans, mathutil.StrToInt(l)) ans = append(ans, mathutil.StrToInt(l))
} }
return ans return ans
} }
` `