cleanup - 2021 - day 1 & 2

2021/day1/day1.go

@@ -2,32 +2,21 @@ package day1
 
 import (
 	"bufio"
-	"fmt"
-	"log"
-	"os"
-	"strconv"
+	"github.com/mariamihai/advent-of-code/util"
 )
 
-func Problem1() {
-	file, err := os.Open("./day1/input2.txt")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	defer func(file *os.File) {
-		err := file.Close()
-		if err != nil {
-			log.Fatal(err)
-		}
-	}(file)
-
-	scanner := bufio.NewScanner(file)
+func Problem1(filename string) int {
+	file := util.ReadFile(filename)
+	defer util.CloseFile()(file)
 
 	var count = 0
 	var previousValue = 10000
 
+	hasDepthIncreased := func(currentDepth, previousValue int) bool { return currentDepth > previousValue }
+
+	scanner := bufio.NewScanner(file)
 	for scanner.Scan() {
-		currentDepth := readLine(scanner.Text())
+		currentDepth := util.StringToInt(scanner.Text())
 
 		if hasDepthIncreased(currentDepth, previousValue) {
 			count++
@@ -36,22 +25,7 @@ func Problem1() {
 		previousValue = currentDepth
 	}
 
-	fmt.Printf("Part 1 - Number of larger measurements: %d\n", count)
-
-	if err := scanner.Err(); err != nil {
-		log.Fatal(err)
-	}
-}
-
-func readLine(line string) int {
-	currentDepth, err := strconv.Atoi(line)
-	if err != nil {
-		log.Fatal("Error during conversion")
-	}
-
-	return currentDepth
-}
+	util.Boom(scanner.Err())
 
-func hasDepthIncreased(currentDepth, previousValue int) bool {
-	return currentDepth > previousValue
+	return count
 }

2021/day1/day1_test.go

@@ -0,0 +1,29 @@
+package day1
+
+import "testing"
+
+func TestProblem1(t *testing.T) {
+	tests := []struct {
+		description string
+		filename    string
+		expected    int
+	}{
+		{
+			description: "Should validate PROBLEM 1 against provided EXAMPLE",
+			filename:    "example1.txt",
+			expected:    7,
+		},
+		{
+			description: "Should validate PROBLEM 1 against provided INPUT",
+			filename:    "input1.txt",
+			expected:    1298,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.description, func(t *testing.T) {
+			if actual := Problem1(tt.filename); actual != tt.expected {
+				t.Errorf("Problem1() = %v, want %v", actual, tt.expected)
+			}
+		})
+	}
+}