Fix Test Coverage (#2437)

* use atomic mode and relative paths in workflow

* add publisher migration test

* fix http server examples test

* fix http server tests

Author: Umang01-hash

.github/workflows/go.yml

@@ -102,7 +102,7 @@ jobs:
           command: |
             export APP_ENV=test
             # Run tests for the examples directory with coverage
-            go test gofr.dev/examples/... -v -short -coverprofile packageWithpbgo.cov -coverpkg=gofr.dev/examples/...
+            go test ./examples/... -v -short -covermode=atomic -coverprofile packageWithpbgo.cov -coverpkg=./examples/...
              # Filter out auto-generated files by protobuf and gofr framework from coverage report
             grep -vE '(/client/|grpc-.+-client/main\.go|_client\.go|_gofr\.go|_grpc\.pb\.go|\.pb\.go|\.proto|health_.*\.go)' packageWithpbgo.cov > profile.cov
             # Display coverage statistics
@@ -211,8 +211,8 @@ jobs:
       - name: Merge Coverage Files
         working-directory: artifacts
         run: |
-          awk '!/^mode: / && FNR==1{print "mode: set"} {print}' ./Example-Test-Report/profile.cov > merged_profile.cov
-          tail -n +2 ./PKG-Coverage-Report/profile.cov >> merged_profile.cov
+          echo "mode: atomic" > merged_profile.cov
+          grep -h -v "mode:" ./Example-Test-Report/profile.cov ./PKG-Coverage-Report/profile.cov >> merged_profile.cov
 
       # Calculate and output the total code coverage percentage
       - name: Parse code-coverage value
@@ -222,6 +222,7 @@ jobs:
           codeCoverage=${codeCoverage%?}
           echo "CODE_COVERAGE=$codeCoverage" >> $GITHUB_ENV
           echo "✅ Total Code Coverage: $codeCoverage%"
+
   #      - name: Check if code-coverage is greater than threshold
   #        run: |
   #          codeCoverage=${{ env.CODE_COVERAGE }}
@@ -332,9 +333,8 @@ jobs:
       - name: Merge Coverage Files
         working-directory: artifacts
         run: |
-          echo "mode: set" > merged_profile.cov
-          tail -n +2 ./Example-Test-Report/profile.cov >> merged_profile.cov
-          tail -n +2 ./PKG-Coverage-Report/profile.cov >> merged_profile.cov
+          echo "mode: atomic" > merged_profile.cov
+          grep -h -v "mode:" ./Example-Test-Report/profile.cov ./PKG-Coverage-Report/profile.cov >> merged_profile.cov
 
           # Generate and print total coverage percentage
           echo "Total Coverage:"

examples/http-server/main_test.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -32,11 +33,14 @@ func TestMain(m *testing.M) {
 }
 
 func TestIntegration_SimpleAPIServer(t *testing.T) {
-	host := "http://localhost:9000"
-
+	httpPort := testutil.GetFreePort(t)
 	port := testutil.GetFreePort(t)
+
+	t.Setenv("HTTP_PORT", strconv.Itoa(httpPort))
 	t.Setenv("METRICS_PORT", strconv.Itoa(port))
 
+	host := fmt.Sprintf("http://localhost:%d", httpPort)
+
 	go main()
 	time.Sleep(100 * time.Millisecond) // Giving some time to start the server
 
@@ -48,7 +52,6 @@ func TestIntegration_SimpleAPIServer(t *testing.T) {
 		{"hello handler", "/hello", "Hello World!"},
 		{"hello handler with query parameter", "/hello?name=gofr", "Hello gofr!"},
 		{"redis handler", "/redis", ""},
-		{"trace handler", "/trace", ""},
 		{"mysql handler", "/mysql", float64(4)},
 	}
 
@@ -80,7 +83,16 @@ func TestIntegration_SimpleAPIServer(t *testing.T) {
 }
 
 func TestIntegration_SimpleAPIServer_Errors(t *testing.T) {
-	host := "http://localhost:9000"
+	httpPort := testutil.GetFreePort(t)
+	port := testutil.GetFreePort(t)
+
+	t.Setenv("HTTP_PORT", strconv.Itoa(httpPort))
+	t.Setenv("METRICS_PORT", strconv.Itoa(port))
+
+	host := fmt.Sprintf("http://localhost:%d", httpPort)
+
+	go main()
+	time.Sleep(100 * time.Millisecond) // Giving some time to start the server
 
 	tests := []struct {
 		desc       string
@@ -136,7 +148,16 @@ func TestIntegration_SimpleAPIServer_Errors(t *testing.T) {
 }
 
 func TestIntegration_SimpleAPIServer_Health(t *testing.T) {
-	host := "http://localhost:9000"
+	httpPort := testutil.GetFreePort(t)
+	port := testutil.GetFreePort(t)
+
+	t.Setenv("HTTP_PORT", strconv.Itoa(httpPort))
+	t.Setenv("METRICS_PORT", strconv.Itoa(port))
+
+	host := fmt.Sprintf("http://localhost:%d", httpPort)
+
+	go main()
+	time.Sleep(100 * time.Millisecond) // Giving some time to start the server
 
 	tests := []struct {
 		desc       string

examples/using-publisher/migrations/1721801313_create_topics_test.go

@@ -0,0 +1,62 @@
+package migrations
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"gofr.dev/pkg/gofr/migration"
+)
+
+// MockPubSub implements the PubSub interface for testing
+type MockPubSub struct {
+	Calls      []string
+	ErrOnTopic map[string]error
+}
+
+func (*MockPubSub) Query(_ context.Context, _ string, _ ...any) ([]byte, error) {
+	return []byte{}, nil
+}
+
+func (*MockPubSub) DeleteTopic(_ context.Context, _ string) error {
+	return nil
+}
+
+func (m *MockPubSub) CreateTopic(_ context.Context, topic string) error {
+	m.Calls = append(m.Calls, topic)
+	if err, ok := m.ErrOnTopic[topic]; ok {
+		return err
+	}
+	return nil
+}
+
+func TestCreateTopics(t *testing.T) {
+	tests := []struct {
+		name          string
+		errOnProduct  error
+		errOnOrder    error
+		expectedErr   error
+		expectedCalls []string
+	}{
+		{"success", nil, nil, nil, []string{"products", "order-logs"}},
+		{"error on products", errors.New("fail products"), nil,
+			errors.New("fail products"), []string{"products"}},
+		{"error on order-logs", nil, errors.New("fail order"), errors.New("fail order"), []string{"products", "order-logs"}},
+	}
+
+	for _, tt := range tests {
+		mockPubSub := &MockPubSub{
+			ErrOnTopic: map[string]error{
+				"products":   tt.errOnProduct,
+				"order-logs": tt.errOnOrder,
+			},
+		}
+		ds := migration.Datasource{PubSub: mockPubSub}
+
+		err := createTopics().UP(ds)
+
+		assert.Equal(t, tt.expectedErr, err, tt.name)
+		assert.Equal(t, tt.expectedCalls, mockPubSub.Calls, tt.name)
+	}
+}

examples/using-subscriber/migrations/1721800255_create_topics_test.go

@@ -0,0 +1,64 @@
+package migrations
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"gofr.dev/pkg/gofr/migration"
+)
+
+// MockPubSub implements the PubSub interface for testing
+type MockPubSub struct {
+	Calls      []string
+	ErrOnTopic map[string]error
+}
+
+func (*MockPubSub) Query(_ context.Context, _ string, _ ...any) ([]byte, error) {
+	return []byte{}, nil
+}
+
+func (*MockPubSub) DeleteTopic(_ context.Context, _ string) error {
+	return nil
+}
+
+func (m *MockPubSub) CreateTopic(_ context.Context, topic string) error {
+	m.Calls = append(m.Calls, topic)
+	if err, ok := m.ErrOnTopic[topic]; ok {
+		return err
+	}
+	return nil
+}
+
+func TestCreateTopics(t *testing.T) {
+	tests := []struct {
+		name          string
+		errOnProduct  error
+		errOnOrder    error
+		expectedErr   error
+		expectedCalls []string
+	}{
+		{"success", nil, nil, nil, []string{"products", "order-logs"}},
+		{"error on products", errors.New("fail products"), nil,
+			errors.New("fail products"), []string{"products"}},
+		{"error on order-logs", nil, errors.New("fail order"),
+			errors.New("fail order"), []string{"products", "order-logs"}},
+	}
+
+	for _, tt := range tests {
+		mockPubSub := &MockPubSub{
+			ErrOnTopic: map[string]error{
+				"products":   tt.errOnProduct,
+				"order-logs": tt.errOnOrder,
+			},
+		}
+		ds := migration.Datasource{PubSub: mockPubSub}
+
+		err := createTopics().UP(ds)
+
+		assert.Equal(t, tt.expectedErr, err, tt.name)
+		assert.Equal(t, tt.expectedCalls, mockPubSub.Calls, tt.name)
+	}
+}