More tests

Arimeka · Mar 16, 2020 · 9d0458e · 9d0458e
1 parent 2e949ae
commit 9d0458e
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 3 deletions.
diff --git a/http_test.go b/http_test.go
@@ -3,6 +3,8 @@ package mediaprobe_test
 import (
 	"net/http"
 	"net/http/httptest"
+	"sync"
+	"sync/atomic"
 	"time"
 )
 
@@ -30,13 +32,28 @@ func ServeHttp(handler *Handler) *Server {
 type Handler struct {
 	Status   int
 	Filename string
+
+	FailOnAttempt uint64
+	Counter       uint64
+	mu            sync.RWMutex
 }
 
 func (h *Handler) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 	if h.Status != 0 {
 		rw.WriteHeader(h.Status)
 		return
 	}
+	if h.FailOnAttempt > 0 {
+		h.mu.RLock()
+		counter := h.Counter
+		h.mu.RUnlock()
+		if counter >= h.FailOnAttempt {
+			rw.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		atomic.AddUint64(&h.Counter, 1)
+	}
 
 	http.ServeFile(rw, req, h.Filename)
 }
diff --git a/image_test.go b/image_test.go
@@ -19,9 +19,11 @@ func TestInfo_ParseImage(t *testing.T) {
 	t.Run("not_found", parseImageNotFound)
 	t.Run("not_found_remote", parseImageNotFoundRemote)
 	t.Run("conn_error_remote", parseImageConnectionErrorRemote)
+	t.Run("server_error_remote", parseImageServerErrorsRemote)
 	t.Run("valid", parseImageValid)
 	t.Run("valid_remote", parseImageValidRemote)
 	t.Run("invalid", parseImageInvalid)
+	t.Run("invalid_remote", parseImageInvalidRemote)
 	t.Run("with_orientation", parseImageWithOrientation)
 	t.Run("jpeg_without_exif", parseImageJPEGWithoutExif)
 	t.Run("png_without_exif", parseImagePNGWithoutExif)
@@ -37,7 +39,7 @@ func parseImageNotFound(t *testing.T) {
 
 func parseImageNotFoundRemote(t *testing.T) {
 	handler := &Handler{
-		Filename: "./fixtures/image.jpeg",
+		Filename: testImageValidImage,
 	}
 	srv := ServeHttp(handler)
 	defer srv.Stop()
@@ -56,7 +58,7 @@ func parseImageNotFoundRemote(t *testing.T) {
 
 func parseImageConnectionErrorRemote(t *testing.T) {
 	handler := &Handler{
-		Filename: "./fixtures/image.jpeg",
+		Filename: testImageValidImage,
 	}
 	srv := ServeHttp(handler)
 
@@ -72,6 +74,42 @@ func parseImageConnectionErrorRemote(t *testing.T) {
 	}
 }
 
+func parseImageServerErrorsRemote(t *testing.T) {
+	handler := &Handler{
+		Filename:      testImageValidImage,
+		FailOnAttempt: 2,
+	}
+	srv := ServeHttp(handler)
+	defer srv.Stop()
+
+	info, err := mediaprobe.New(srv.Endpoint())
+	if err != nil {
+		t.Fatalf("Unexpected error %v", err)
+	}
+
+	err = info.ParseImage()
+	if err == nil {
+		t.Errorf("Expected to return error found but return nil")
+	}
+
+	handler = &Handler{
+		Filename:      testImageValidImage,
+		FailOnAttempt: 3,
+	}
+	srv = ServeHttp(handler)
+	defer srv.Stop()
+
+	info, err = mediaprobe.New(srv.Endpoint())
+	if err != nil {
+		t.Fatalf("Unexpected error %v", err)
+	}
+
+	err = info.ParseImage()
+	if err == nil {
+		t.Errorf("Expected to return error found but return nil")
+	}
+}
+
 func parseImageValid(t *testing.T) {
 	info, err := mediaprobe.New(testImageValidImage)
 	if err != nil {
@@ -90,7 +128,7 @@ func parseImageValid(t *testing.T) {
 
 func parseImageValidRemote(t *testing.T) {
 	handler := &Handler{
-		Filename: "./fixtures/image.jpeg",
+		Filename: testImageValidImage,
 	}
 	srv := ServeHttp(handler)
 	defer srv.Stop()
@@ -122,6 +160,23 @@ func parseImageInvalid(t *testing.T) {
 	}
 }
 
+func parseImageInvalidRemote(t *testing.T) {
+	handler := &Handler{
+		Filename: testImageInvalidImage,
+	}
+	srv := ServeHttp(handler)
+	defer srv.Stop()
+
+	info, err := mediaprobe.New(srv.Endpoint())
+	if err != nil {
+		t.Fatalf("Unexpected error %v", err)
+	}
+	err = info.ParseImage()
+	if err == nil {
+		t.Errorf("Expected to return error but return nil")
+	}
+}
+
 func parseImageWithOrientation(t *testing.T) {
 	info, _ := mediaprobe.New(testImageWithExifOrientation)
 	err := info.ParseImage()

diff --git a/info_test.go b/info_test.go
@@ -11,6 +11,7 @@ func TestNew(t *testing.T) {
 	t.Run("not_found", newNotFound)
 	t.Run("not_found_remote", newNotFoundRemote)
 	t.Run("conn_error_remote", newConnErrorRemote)
+	t.Run("server_error_remote", newServerErrorRemote)
 	t.Run("local", newLocalFile)
 	t.Run("remote", newRemoteFile)
 }
@@ -42,6 +43,20 @@ func newConnErrorRemote(t *testing.T) {
 	}
 }
 
+func newServerErrorRemote(t *testing.T) {
+	handler := &Handler{
+		Filename:      "./fixtures/video.mp4",
+		FailOnAttempt: 1,
+	}
+	srv := ServeHttp(handler)
+	defer srv.Stop()
+
+	_, err := mediaprobe.New(srv.Endpoint())
+	if err == nil {
+		t.Errorf("Expected to return error found but return nil")
+	}
+}
+
 func newLocalFile(t *testing.T) {
 	info, err := mediaprobe.New("./fixtures/video.mp4")
 	if err != nil {