bit of coverage

burgesQ · Jul 7, 2023 · 8f22477 · 8f22477
1 parent 10b402c
commit 8f22477
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 34 deletions.
diff --git a/log/log.go b/log/log.go
@@ -69,28 +69,3 @@ func (l logger) Fatalf(format string, v ...interface{}) {
 	l.logContentf(LogErr, format, v...)
 	panic(fmt.Sprintf(format, v...))
 }
-
-// Debugf output a debug message.
-func Debugf(format string, v ...interface{}) {
-	_lg.logContentf(LogDebug, format, v...)
-}
-
-// Infof output an info message.
-func Infof(format string, v ...interface{}) {
-	_lg.logContentf(LogInfo, format, v...)
-}
-
-// Warnf output a warning message.
-func Warnf(format string, v ...interface{}) {
-	_lg.logContentf(LogWarning, format, v...)
-}
-
-// Errorf output an error message.
-func Errorf(format string, v ...interface{}) {
-	_lg.logContentf(LogErr, format, v...)
-}
-
-// Fatalf output an fatal message and then panic.
-func Fatalf(format string, v ...interface{}) {
-	_lg.logContentf(LogErr, format, v...)
-}
diff --git a/options_test.go b/options_test.go
@@ -1,6 +1,7 @@
 package webfmwk
 
 import (
+	"net/http"
 	"testing"
 	"time"
 
@@ -13,6 +14,10 @@ var _emptyHandler = func(next HandlerFunc) HandlerFunc {
 	})
 }
 
+type ws struct{}
+
+func (ws) ServeHTTP(http.ResponseWriter, *http.Request) {}
+
 func TestServerNewInit(t *testing.T) {
 	var (
 		fakeswagger = DocHandler{}
@@ -27,26 +32,37 @@ func TestServerNewInit(t *testing.T) {
 			// SetReadHeaderTimeout(testT),
 			SetPrefix("/api"),
 			//			WithMiddlewares(_emptyMiddleware),
-			WithHandlers(_emptyHandler))
+			EnableKeepAlive(),
+			WithHTTP2(),
+			EnablePprof("/some/path"),
+			WithHandlers(_emptyHandler),
+			MaxRequestBodySize(42),
+			WithSocketHandler("/sock_1", ws{}),
+			WithSocketHandlerFunc("/sock_1", func(http.ResponseWriter, *http.Request) {}),
+		)
 	)
 
 	requirer := require.New(t)
 
 	requirer.Nil(e)
 
-	requirer.True(s.meta.ctrlc)
-	requirer.True(s.meta.checkIsUp)
-	requirer.True(s.meta.cors)
+	requirer.True(s.meta.pprof, "pprof should be enabled")
+	requirer.True(s.meta.enableKeepAlive, "keep alive should be enabled")
+	requirer.True(s.meta.http2, "http2 should be enabled")
+	requirer.True(s.meta.ctrlc, "ctrl+c support enabled")
+	requirer.True(s.meta.checkIsUp, "ping pong start enabled")
+	requirer.True(s.meta.cors, "cors enabled")
 	// require.True(t, len(s.meta.middlewares) == 1)
-	requirer.True(len(s.meta.handlers) == 1)
+	requirer.True(len(s.meta.handlers) == 1, "one handler should be loaded")
 
-	requirer.Equal(s.meta.baseServer.ReadTimeout, testT)
-	requirer.Equal(s.meta.baseServer.WriteTimeout, testT)
-	requirer.Equal(s.meta.baseServer.IdleTimeout, testT)
+	requirer.Equal(testT, s.meta.baseServer.ReadTimeout)
+	requirer.Equal(testT, s.meta.baseServer.WriteTimeout)
+	requirer.Equal(testT, s.meta.baseServer.IdleTimeout, "idle timeout should be custom")
+	requirer.Equal(42, s.meta.baseServer.MaxRequestBodySize, "body max size should be 42")
 
 	requirer.True(len(s.meta.docHandlers) == 1)
 
-	requirer.Equal(s.meta.prefix, "/api")
+	requirer.Equal("/api", s.meta.prefix, "prefix should be custom")
 
 	ht := s.meta.toServer("testing")
 	requirer.Equal("webfmwk testing", ht.Name)