feat: Add integration tests for HTTP, WebSocket, Redis, and PostgreSQL handlers

- Implemented integration tests for various HTTP endpoints including user creation, retrieval, and health checks.
- Added WebSocket tests for connection, message sending, and receiving.
- Created Redis tests for key-value operations, TTL verification, and hash operations.
- Developed PostgreSQL tests for data insertion, querying, and raw SQL execution.
- Introduced Kafka feature tests for topic creation and message publishing.
- Established shell command tests for executing commands and checking outputs.
- Configured a YAML file for test settings, including container setups for PostgreSQL and Redis.
- Added coverage for user workflows and error handling scenarios.

Author: alileza

.gitignore

@@ -1 +1,3 @@
 bin
+coverage-*
+coverage/

Makefile

@@ -1,4 +1,4 @@
-.PHONY: build test lint clean install run help
+.PHONY: build test lint clean install run help integration-test integration-test-coverage coverage-all
 
 # Build variables
 VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo "dev")
@@ -83,7 +83,8 @@ deps:
 clean:
 	@echo "Cleaning..."
 	@rm -rf ./bin
-	@rm -f coverage.out coverage.html
+	@rm -rf ./coverage ./coverage-merged
+	@rm -f coverage.out coverage.html coverage-integration.out coverage-integration.html coverage-all.out coverage-all.html
 
 ## run: Run tomato with example config
 run: build
@@ -99,6 +100,36 @@ docker-build:
 	docker build -t tomatool/tomato:$(VERSION) .
 	docker tag tomatool/tomato:$(VERSION) tomatool/tomato:latest
 
+## integration-test: Run integration tests using tomato to test itself
+integration-test: build
+	@echo "Running integration tests..."
+	$(BINARY_PATH) run -c ./tests/tomato.yml
+
+## integration-test-coverage: Run integration tests with coverage (Cloudflare technique)
+integration-test-coverage:
+	@echo "Building coverage-instrumented binary..."
+	@mkdir -p ./bin
+	$(GOCMD) build -cover -covermode=atomic -coverpkg=./... $(LDFLAGS) -o ./bin/tomato-coverage .
+	@echo "Running integration tests with coverage..."
+	@mkdir -p ./coverage
+	GOCOVERDIR=./coverage ./bin/tomato-coverage run -c ./tests/tomato.yml || true
+	@echo "Converting coverage data..."
+	$(GOCMD) tool covdata textfmt -i=./coverage -o=coverage-integration.out
+	@echo "Generating coverage report..."
+	$(GOCMD) tool cover -html=coverage-integration.out -o coverage-integration.html
+	@echo "Integration coverage report: coverage-integration.html"
+
+## coverage-all: Run both unit tests and integration tests with combined coverage
+coverage-all: test-coverage integration-test-coverage
+	@echo "Merging coverage reports..."
+	@if [ -f coverage.out ] && [ -f coverage-integration.out ]; then \
+		$(GOCMD) tool covdata merge -i=./coverage -o=./coverage-merged 2>/dev/null || true; \
+		cat coverage.out > coverage-all.out; \
+		tail -n +2 coverage-integration.out >> coverage-all.out; \
+		$(GOCMD) tool cover -html=coverage-all.out -o coverage-all.html; \
+		echo "Combined coverage report: coverage-all.html"; \
+	fi
+
 ## release: Create a release build for multiple platforms
 release: clean
 	@echo "Building releases..."

command/docs.go

@@ -64,7 +64,7 @@ func collectStepCategories() []handler.StepCategory {
 	categories := []handler.StepCategory{}
 
 	// HTTP steps
-	httpHandler, _ := handler.NewHTTP("api", handler.DummyConfig(), nil)
+	httpHandler, _ := handler.NewHTTPClient("api", handler.DummyConfig(), nil)
 	categories = append(categories, httpHandler.Steps())
 
 	// Redis steps
@@ -80,7 +80,7 @@ func collectStepCategories() []handler.StepCategory {
 	categories = append(categories, kafkaHandler.Steps())
 
 	// WebSocket steps
-	wsHandler, _ := handler.NewWebSocket("ws", handler.DummyConfig(), nil)
+	wsHandler, _ := handler.NewWebSocketClient("ws", handler.DummyConfig(), nil)
 	categories = append(categories, wsHandler.Steps())
 
 	// Shell steps

internal/config/config.go

@@ -122,6 +122,8 @@ type Resource struct {
 	Type      string         `yaml:"type"`
 	Container string         `yaml:"container"`
 	Options   map[string]any `yaml:"options"`
+	// Reset configuration
+	Reset *bool `yaml:"reset,omitempty"` // nil = use global setting, true = always reset, false = never reset
 	// Database specific
 	Database string `yaml:"database,omitempty"`
 	// HTTP specific

internal/handler/handler.go

@@ -52,8 +52,8 @@ type CacheStore interface {
 	Exists(ctx context.Context, key string) (bool, error)
 }
 
-// WebSocketClient is implemented by handlers that can handle WebSocket connections
-type WebSocketClient interface {
+// WebSocketClientInterface is implemented by handlers that can handle WebSocket connections
+type WebSocketClientInterface interface {
 	Connect(ctx context.Context, headers map[string]string) error
 	Send(ctx context.Context, message []byte) error
 	Receive(ctx context.Context, timeout int) ([]byte, error)