add tests and simplify sha1 generation

amalfra · Aug 6, 2017 · 3c1c724 · 3c1c724
1 parent d0112f2
commit 3c1c724
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -6,4 +6,7 @@ fmt:
 vet:
 	go vet ./...
 
-build: fmt vet
+test:
+	go test -v
+
+build: fmt vet test
diff --git a/etag.go b/etag.go
@@ -2,15 +2,11 @@ package etag
 
 import (
 	"crypto/sha1"
-	"encoding/hex"
 	"fmt"
 )
 
 func getHash(str string) string {
-	h := sha1.New()
-	h.Write([]byte(str))
-
-	return hex.EncodeToString(h.Sum(nil))
+	return fmt.Sprintf("%x", sha1.Sum([]byte(str)))
 }
 
 // Generate an Etag for given sring. Allows specifying whether to generate weak

diff --git a/etag_test.go b/etag_test.go
@@ -0,0 +1,38 @@
+package etag
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestNotWeekEtag(t *testing.T) {
+	inputStr := `<html>
+	<head>
+		<title>test page</title>
+	</head>
+	<body>
+		<p>test page html</p>
+	</body>
+	</html>`
+	expectedOut := fmt.Sprintf("%d-%s", len(inputStr), getHash(inputStr))
+	generatedOut := Generate(inputStr, false)
+	if generatedOut != expectedOut {
+		t.Fatalf("Incorrect Etag generated")
+	}
+}
+
+func TestWeekEtag(t *testing.T) {
+	inputStr := `<html>
+	<head>
+		<title>test page</title>
+	</head>
+	<body>
+		<p>test page html</p>
+	</body>
+	</html>`
+	expectedOut := fmt.Sprintf("W/%d-%s", len(inputStr), getHash(inputStr))
+	generatedOut := Generate(inputStr, true)
+	if generatedOut != expectedOut {
+		t.Fatalf("Incorrect Etag generated")
+	}
+}