Remove cache avatar support and add its tests

modules/avatar/avatar_test.go

@@ -1,61 +1,23 @@
-// Copyright 2014 The Gogs Authors. All rights reserved.
+// Copyright 2016 The Gogs Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
-package avatar_test
+
+package avatar
 
 import (
-	"errors"
-	"os"
-	"strconv"
 	"testing"
-	"time"
 
-	"github.com/gogits/gogs/modules/avatar"
-	"github.com/gogits/gogs/modules/log"
+	. "github.com/smartystreets/goconvey/convey"
 )
 
-const TMPDIR = "test-avatar"
+func Test_RandomImage(t *testing.T) {
+	Convey("Generate a random avatar from email", t, func() {
+		_, err := RandomImage([]byte("gogs@local"))
+		So(err, ShouldBeNil)
 
-func TestFetch(t *testing.T) {
-	os.Mkdir(TMPDIR, 0755)
-	defer os.RemoveAll(TMPDIR)
-
-	hash := avatar.HashEmail("ssx205@gmail.com")
-	a := avatar.New(hash, TMPDIR)
-	a.UpdateTimeout(time.Millisecond * 200)
-}
-
-func TestFetchMany(t *testing.T) {
-	os.Mkdir(TMPDIR, 0755)
-	defer os.RemoveAll(TMPDIR)
-
-	t.Log("start")
-	var n = 5
-	ch := make(chan bool, n)
-	for i := 0; i < n; i++ {
-		go func(i int) {
-			hash := avatar.HashEmail(strconv.Itoa(i) + "ssx205@gmail.com")
-			a := avatar.New(hash, TMPDIR)
-			a.Update()
-			t.Log("finish", hash)
-			ch <- true
-		}(i)
-	}
-	for i := 0; i < n; i++ {
-		<-ch
-	}
-	t.Log("end")
-}
-
-// cat
-// wget http://www.artsjournal.com/artfulmanager/wp/wp-content/uploads/2013/12/200x200xmirror_cat.jpg.pagespeed.ic.GOZSv6v1_H.jpg -O default.jpg
-/*
-func TestHttp(t *testing.T) {
-	http.Handle("/", avatar.CacheServer("./", "default.jpg"))
-	http.ListenAndServe(":8001", nil)
-}
-*/
-
-func TestLogTrace(t *testing.T) {
-	log.Trace("%v", errors.New("console log test"))
+		Convey("Try to generate an image with size zero", func() {
+			_, err := RandomImageSize(0, []byte("gogs@local"))
+			So(err, ShouldNotBeNil)
+		})
+	})
 }