Add tests for resolvers without any tests

Makefile

@@ -5,6 +5,9 @@ build:
 	@cd cmd/api && go build
 
 test:
+	@go test ./... -tags test
+
+vtest:
 	@go test -v ./... -tags test
 
 check: lint

internal/caches/twitchusernamecache/cache_test.go

@@ -0,0 +1 @@
+package twitchusernamecache

internal/db/pool.go

@@ -20,9 +20,6 @@ type Pool interface {
 }
 
 func NewPool(ctx context.Context, dsn string) (Pool, error) {
-
-	var err error
-
 	pool, err := pgxpool.Connect(ctx, dsn)
 
 	if err != nil {

internal/db/pool_test.go

@@ -0,0 +1 @@
+package db

internal/logger/context.go

@@ -0,0 +1,25 @@
+package logger
+
+import (
+	"context"
+	"log"
+)
+
+type contextKeyType string
+
+var (
+	contextKey = contextKeyType("logger")
+)
+
+func FromContext(ctx context.Context) Logger {
+	if v := ctx.Value(contextKey); v != nil {
+		return v.(Logger)
+	}
+
+	log.Fatal("No logger found in context")
+	return nil
+}
+
+func OnContext(ctx context.Context, logger Logger) context.Context {
+	return context.WithValue(ctx, contextKey, logger)
+}

internal/logger/context_test.go

@@ -0,0 +1 @@
+package logger

internal/logger/logger.go

@@ -1,9 +1,6 @@
 package logger
 
 import (
-	"context"
-	"log"
-
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
@@ -25,25 +22,6 @@ type Logger interface {
 	Sync() error
 }
 
-type contextKeyType string
-
-var (
-	contextKey = contextKeyType("logger")
-)
-
-func FromContext(ctx context.Context) Logger {
-	if v := ctx.Value(contextKey); v != nil {
-		return v.(Logger)
-	}
-
-	log.Fatal("No logger found in context")
-	return nil
-}
-
-func OnContext(ctx context.Context, logger Logger) context.Context {
-	return context.WithValue(ctx, contextKey, logger)
-}
-
 func New(logLevel zap.AtomicLevel, logDevelopment bool) Logger {
 	zapConfig := zap.Config{
 		Level:            logLevel,

internal/resolvers/default/initialize_test.go

@@ -0,0 +1,28 @@
+package defaultresolver
+
+import (
+	"context"
+	"testing"
+
+	"github.com/Chatterino/api/internal/logger"
+	"github.com/Chatterino/api/pkg/config"
+	"github.com/go-chi/chi/v5"
+	"github.com/pashagolub/pgxmock"
+
+	qt "github.com/frankban/quicktest"
+)
+
+func TestInitialize(t *testing.T) {
+	ctx := logger.OnContext(context.Background(), logger.NewTest())
+	c := qt.New(t)
+
+	pool, err := pgxmock.NewPool()
+	c.Assert(err, qt.IsNil)
+
+	r := chi.NewRouter()
+
+	c.Run("No credentials", func(c *qt.C) {
+		cfg := config.APIConfig{}
+		Initialize(ctx, cfg, pool, r, nil)
+	})
+}

internal/resolvers/discord/initialize_test.go

@@ -0,0 +1,39 @@
+package discord
+
+import (
+	"context"
+	"testing"
+
+	"github.com/Chatterino/api/internal/logger"
+	"github.com/Chatterino/api/pkg/config"
+	"github.com/Chatterino/api/pkg/resolver"
+	"github.com/pashagolub/pgxmock"
+
+	qt "github.com/frankban/quicktest"
+)
+
+func TestInitialize(t *testing.T) {
+	ctx := logger.OnContext(context.Background(), logger.NewTest())
+	c := qt.New(t)
+
+	pool, err := pgxmock.NewPool()
+	c.Assert(err, qt.IsNil)
+
+	c.Run("No credentials", func(c *qt.C) {
+		cfg := config.APIConfig{}
+		customResolvers := []resolver.Resolver{}
+		c.Assert(customResolvers, qt.HasLen, 0)
+		Initialize(ctx, cfg, pool, &customResolvers)
+		c.Assert(customResolvers, qt.HasLen, 0)
+	})
+
+	c.Run("Credentials", func(c *qt.C) {
+		cfg := config.APIConfig{
+			DiscordToken: "test",
+		}
+		customResolvers := []resolver.Resolver{}
+		c.Assert(customResolvers, qt.HasLen, 0)
+		Initialize(ctx, cfg, pool, &customResolvers)
+		c.Assert(customResolvers, qt.HasLen, 1)
+	})
+}

internal/resolvers/livestreamfails/initialize_test.go

@@ -0,0 +1,29 @@
+package livestreamfails
+
+import (
+	"context"
+	"testing"
+
+	"github.com/Chatterino/api/internal/logger"
+	"github.com/Chatterino/api/pkg/config"
+	"github.com/Chatterino/api/pkg/resolver"
+	"github.com/pashagolub/pgxmock"
+
+	qt "github.com/frankban/quicktest"
+)
+
+func TestInitialize(t *testing.T) {
+	ctx := logger.OnContext(context.Background(), logger.NewTest())
+	c := qt.New(t)
+
+	pool, err := pgxmock.NewPool()
+	c.Assert(err, qt.IsNil)
+
+	c.Run("No credentials", func(c *qt.C) {
+		cfg := config.APIConfig{}
+		customResolvers := []resolver.Resolver{}
+		c.Assert(customResolvers, qt.HasLen, 0)
+		Initialize(ctx, cfg, pool, &customResolvers)
+		c.Assert(customResolvers, qt.HasLen, 1)
+	})
+}

internal/resolvers/oembed/initialize_test.go

@@ -0,0 +1,32 @@
+package oembed
+
+import (
+	"context"
+	"testing"
+
+	"github.com/Chatterino/api/internal/logger"
+	"github.com/Chatterino/api/pkg/config"
+	"github.com/Chatterino/api/pkg/resolver"
+	"github.com/pashagolub/pgxmock"
+
+	qt "github.com/frankban/quicktest"
+)
+
+func TestInitialize(t *testing.T) {
+	ctx := logger.OnContext(context.Background(), logger.NewTest())
+	c := qt.New(t)
+
+	pool, err := pgxmock.NewPool()
+	c.Assert(err, qt.IsNil)
+
+	c.Run("No file", func(c *qt.C) {
+		dir := t.TempDir()
+		cfg := config.APIConfig{
+			OembedProvidersPath: dir + "/providers.json",
+		}
+		customResolvers := []resolver.Resolver{}
+		c.Assert(customResolvers, qt.HasLen, 0)
+		Initialize(ctx, cfg, pool, &customResolvers)
+		c.Assert(customResolvers, qt.HasLen, 0)
+	})
+}

internal/resolvers/supinic/initialize_test.go

@@ -0,0 +1,29 @@
+package supinic
+
+import (
+	"context"
+	"testing"
+
+	"github.com/Chatterino/api/internal/logger"
+	"github.com/Chatterino/api/pkg/config"
+	"github.com/Chatterino/api/pkg/resolver"
+	"github.com/pashagolub/pgxmock"
+
+	qt "github.com/frankban/quicktest"
+)
+
+func TestInitialize(t *testing.T) {
+	ctx := logger.OnContext(context.Background(), logger.NewTest())
+	c := qt.New(t)
+
+	pool, err := pgxmock.NewPool()
+	c.Assert(err, qt.IsNil)
+
+	c.Run("No credentials", func(c *qt.C) {
+		cfg := config.APIConfig{}
+		customResolvers := []resolver.Resolver{}
+		c.Assert(customResolvers, qt.HasLen, 0)
+		Initialize(ctx, cfg, pool, &customResolvers)
+		c.Assert(customResolvers, qt.HasLen, 1)
+	})
+}

internal/routes/twitchemotes/initialize.go

@@ -0,0 +1,67 @@
+package twitchemotes
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"log"
+	"net/http"
+	"time"
+
+	"github.com/Chatterino/api/internal/db"
+	"github.com/Chatterino/api/pkg/cache"
+	"github.com/Chatterino/api/pkg/config"
+	"github.com/go-chi/chi/v5"
+	"github.com/nicklaw5/helix"
+)
+
+func setHandler(ctx context.Context, twitchemotesCache cache.Cache, w http.ResponseWriter, r *http.Request) {
+	setID := chi.URLParam(r, "setID")
+	w.Header().Set("Content-Type", "application/json")
+
+	response, err := twitchemotesCache.Get(ctx, setID, nil)
+	if err != nil {
+		var perr *twitchEmotesError
+		if errors.As(err, &perr) {
+			w.WriteHeader(perr.Status)
+			data, err := json.Marshal(&TwitchEmotesErrorResponse{
+				Status:  perr.Status,
+				Message: perr.Error(),
+			})
+			if err != nil {
+				log.Println("Error marshalling twitch emotes error response:", err)
+			}
+			_, err = w.Write(data)
+			if err != nil {
+				log.Println("Error writing response:", err)
+			}
+		} else {
+			fmt.Println("Unknown error in twitchemotes set handler:", err)
+		}
+
+		return
+	}
+
+	_, err = w.Write(response)
+	if err != nil {
+		log.Println("Error writing response:", err)
+	}
+}
+
+// Initialize servers the /twitchemotes/set/{setID} route
+// In newer versions of Chatterino this data is fetched client-side instead.
+// To support older versions of Chattterino that relied on this API we will keep this API functional for some time longer.
+func Initialize(ctx context.Context, cfg config.APIConfig, pool db.Pool, router *chi.Mux, helixClient *helix.Client, helixUsernameCache cache.Cache) error {
+	loader := &TwitchemotesLoader{
+		helixAPI:           helixClient,
+		helixUsernameCache: helixUsernameCache,
+	}
+	twitchemotesCache := cache.NewPostgreSQLCache(ctx, cfg, pool, "twitchemotes", loader, time.Duration(30)*time.Minute)
+
+	router.Get("/twitchemotes/set/{setID}", func(w http.ResponseWriter, r *http.Request) {
+		setHandler(ctx, twitchemotesCache, w, r)
+	})
+
+	return nil
+}

internal/routes/twitchemotes/initialize_test.go

@@ -0,0 +1,28 @@
+package twitchemotes
+
+import (
+	"context"
+	"testing"
+
+	"github.com/Chatterino/api/internal/logger"
+	"github.com/Chatterino/api/pkg/config"
+	"github.com/go-chi/chi/v5"
+	"github.com/pashagolub/pgxmock"
+
+	qt "github.com/frankban/quicktest"
+)
+
+func TestInitialize(t *testing.T) {
+	ctx := logger.OnContext(context.Background(), logger.NewTest())
+	c := qt.New(t)
+
+	pool, err := pgxmock.NewPool()
+	c.Assert(err, qt.IsNil)
+
+	r := chi.NewRouter()
+
+	c.Run("No credentials", func(c *qt.C) {
+		cfg := config.APIConfig{}
+		Initialize(ctx, cfg, pool, r, nil, nil)
+	})
+}