Merge pull request #2 from sklevenz/dev

Dev

Author: sklevenz

README.md

@@ -1,7 +1,7 @@
 # cf-api-server-go
 
-[![Test Status](https://github.com/sklevenz/cf-api-server-go/actions/workflows/test.yaml/badge.svg)](https://github.com/sklevenz/cf-api-server/actions)
-[![Build Status](https://github.com/sklevenz/cf-api-server-go/actions/workflows/build.yaml/badge.svg)](https://github.com/sklevenz/cf-api-server/actions)
+[![Test Status](https://github.com/sklevenz/cf-api-server-go/actions/workflows/test.yaml/badge.svg)](https://github.com/sklevenz/cf-api-server-go/actions)
+[![Build Status](https://github.com/sklevenz/cf-api-server-go/actions/workflows/build.yaml/badge.svg)](https://github.com/sklevenz/cf-api-server-go/actions)
 
 mplementation of the [cf-api-spec](https://github.com/sklevenz/cf-api-spec) in Go. This project provides a Go-based solution adhering to the Cloud Foundry API specifications, enabling seamless integration and usage for Cloud Foundry-related development.
 
@@ -23,6 +23,7 @@ cf-api-server/
 │   ├── services/         # Business logic or service layer
 │   │   ├── api_service.go
 │   │   └── ...
+│   ├── server/           # HTTP server implementation
 │   ├── middleware/       # Middleware for request processing
 │   │   ├── logging.go
 │   │   ├── auth.go
@@ -39,8 +40,7 @@ cf-api-server/
 │   │   └── ...
 │   └── ...
 ├── test/                 # Tests and test utilities
-│   ├── integration/
-│   ├── unit/
+│   ├── integration/      # Integration tests
 │   └── ...
 ├── go.mod                # Go module file
 ├── go.sum                # Go module checksum file
@@ -57,6 +57,7 @@ This directory contains core application logic that is not intended to be expose
 
 - **`handlers/`**: Defines HTTP route handlers that process incoming requests and return responses.
 - **`services/`**: Implements the business logic and acts as an intermediary between handlers and the data layer.
+- **`server/`**: Implements the HTTP server code to offload the main entry point.
 - **`middleware/`**: Contains reusable middleware functions for processing HTTP requests, such as logging or authentication.
 - **`config/`**: Manages application configurations, such as environment variables and settings.
 

cmd/server/main_test.go

@@ -5,10 +5,12 @@ import (
 	"net/http"
 )
 
+func handler(w http.ResponseWriter, r *http.Request) {
+	fmt.Fprintln(w, "Hello, World!")
+}
+
 func StartServer() {
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintln(w, "Hello, World!")
-	})
+	http.HandleFunc("/", handler)
 
 	fmt.Println("Server is running on http://localhost:8080")
 	if err := http.ListenAndServe(":8080", nil); err != nil {

internal/server/server.go

@@ -0,0 +1,29 @@
+package server
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+)
+
+func TestHandler(t *testing.T) {
+	// Create a request to pass to our handler
+	req := httptest.NewRequest(http.MethodGet, "/", nil)
+
+	// Record the response
+	rec := httptest.NewRecorder()
+
+	// Call the handler directly
+	handler(rec, req)
+
+	// Check the response code
+	if rec.Code != http.StatusOK {
+		t.Errorf("expected status OK; got %v", rec.Code)
+	}
+
+	// Check the response body
+	expectedBody := "Hello, World!\n"
+	if rec.Body.String() != expectedBody {
+		t.Errorf("expected body %q; got %q", expectedBody, rec.Body.String())
+	}
+}

internal/server/server_test.go

@@ -10,6 +10,9 @@ import (
 )
 
 func TestServerIntegration(t *testing.T) {
+	// Wait befor starting the server
+	time.Sleep(1 * time.Second)
+
 	// Start the server in a separate goroutine
 	go func() {
 		server.StartServer()