44 "net/http"
55 "net/http/httptest"
66 "net/url"
7+ "os"
78 "path/filepath"
89 "strings"
910 "testing"
@@ -16,15 +17,19 @@ import (
1617// It loads the server configuration and sets up the router, failing the test if either step encounters an error.
1718func setupRouter (t * testing.T ) * gin.Engine {
1819 t .Helper ()
20+
1921 config , err := LoadConfig ()
2022 if err != nil {
2123 t .Fatalf ("Failed to load config: %v" , err )
2224 }
25+
2326 config .StaticDir = filepath .Join (".." , ".." , "static" )
27+
2428 r , err := SetupRouter (config )
2529 if err != nil {
2630 t .Fatalf ("Failed to setup router: %v" , err )
2731 }
32+
2833 return r
2934}
3035
@@ -88,13 +93,15 @@ func TestRouterSetup(t *testing.T) {
8893 for _ , tt := range tests {
8994 t .Run (tt .name , func (t * testing.T ) {
9095 router := setupRouter (t )
96+
9197 var req * http.Request
9298 if tt .method == "POST" {
9399 req , _ = http .NewRequest (tt .method , tt .path , strings .NewReader (tt .formData .Encode ()))
94100 req .Header .Set ("Content-Type" , "application/x-www-form-urlencoded" )
95101 } else {
96102 req , _ = http .NewRequest (tt .method , tt .path , nil )
97103 }
104+
98105 resp := httptest .NewRecorder ()
99106 router .ServeHTTP (resp , req )
100107 assert .Equal (t , tt .wantStatus , resp .Code , "Status code" )
@@ -117,6 +124,7 @@ func TestTrustedProxies(t *testing.T) {
117124 wantBody string
118125 wantError bool
119126 }{
127+ // Existing test cases remain unchanged
120128 {
121129 name : "No trusted proxies" ,
122130 trustedProxies : "" ,
@@ -145,6 +153,16 @@ func TestTrustedProxies(t *testing.T) {
145153 wantBody : "" ,
146154 wantError : true ,
147155 },
156+ // New test case for Line 45 - Empty proxy entry
157+ {
158+ name : "Trusted proxies with empty entry" ,
159+ trustedProxies : "192.168.1.1,,10.0.0.1" ,
160+ remoteAddr : "192.168.1.1:12345" ,
161+ xForwardedFor : "203.0.113.1" ,
162+ wantClientIP : "203.0.113.1" ,
163+ wantStatus : http .StatusOK ,
164+ wantBody : "EUI-64 Calculator" ,
165+ },
148166 }
149167
150168 for _ , tt := range tests {
@@ -158,32 +176,98 @@ func TestTrustedProxies(t *testing.T) {
158176 if tt .wantError {
159177 _ , err := SetupRouter (Config {Port : defaultPort , TrustedProxies : strings .Split (tt .trustedProxies , "," )})
160178 assert .Error (t , err , "Expected error for invalid proxy" )
179+
161180 return
162181 }
163182
164183 router := setupRouter (t )
165- req , _ := http .NewRequest ("GET" , "/" , nil )
184+ req , _ := http .NewRequest (http . MethodGet , "/" , nil )
166185 req .RemoteAddr = tt .remoteAddr
186+
167187 if tt .xForwardedFor != "" {
168188 req .Header .Set ("X-Forwarded-For" , tt .xForwardedFor )
169189 }
190+
170191 resp := httptest .NewRecorder ()
171192 router .ServeHTTP (resp , req )
172193 assert .Equal (t , tt .wantStatus , resp .Code , "Status code" )
173194 assert .Contains (t , resp .Body .String (), tt .wantBody , "Response body" )
174195
175196 var gotClientIP string
197+
176198 router .GET ("/test-ip" , func (c * gin.Context ) {
177199 gotClientIP = c .ClientIP ()
178200 })
179- req , _ = http .NewRequest ("GET" , "/test-ip" , nil )
201+
202+ req , _ = http .NewRequest (http .MethodGet , "/test-ip" , nil )
180203 req .RemoteAddr = tt .remoteAddr
204+
181205 if tt .xForwardedFor != "" {
182206 req .Header .Set ("X-Forwarded-For" , tt .xForwardedFor )
183207 }
208+
184209 resp = httptest .NewRecorder ()
185210 router .ServeHTTP (resp , req )
186211 assert .Equal (t , tt .wantClientIP , gotClientIP , "Client IP" )
187212 })
188213 }
189214}
215+
216+ // New TestLoadConfig to cover Lines 37 and 56.
217+ func TestLoadConfig (t * testing.T ) {
218+ tests := []struct {
219+ name string
220+ portEnv string
221+ trustedProxies string
222+ staticDirEnv string
223+ wantPort string
224+ wantProxies []string
225+ wantStaticDir string
226+ }{
227+ {
228+ name : "Default config" ,
229+ portEnv : "" ,
230+ trustedProxies : "" ,
231+ staticDirEnv : "" ,
232+ wantPort : defaultPort ,
233+ wantProxies : nil ,
234+ wantStaticDir : filepath .Join (filepath .Dir (os .Args [0 ]), defaultStaticDir ), // Approximation
235+ },
236+ {
237+ name : "Custom port (Line 37)" ,
238+ portEnv : "9090" ,
239+ trustedProxies : "" ,
240+ staticDirEnv : "" ,
241+ wantPort : ":9090" ,
242+ wantProxies : nil ,
243+ wantStaticDir : filepath .Join (filepath .Dir (os .Args [0 ]), defaultStaticDir ),
244+ },
245+ {
246+ name : "Custom static dir" ,
247+ portEnv : "" ,
248+ trustedProxies : "" ,
249+ staticDirEnv : "/custom/static" ,
250+ wantPort : defaultPort ,
251+ wantProxies : nil ,
252+ wantStaticDir : "/custom/static" ,
253+ },
254+ // Note: Line 56 (os.Executable failure) is harder to test directly without mocking.
255+ // We can assume it works if STATIC_DIR is unset and defaultStaticDir is used.
256+ }
257+
258+ for _ , tt := range tests {
259+ t .Run (tt .name , func (t * testing.T ) {
260+ // Clear and set environment variables
261+ t .Setenv ("PORT" , tt .portEnv )
262+ t .Setenv (trustedProxiesEnv , tt .trustedProxies )
263+ t .Setenv (staticDirEnv , tt .staticDirEnv )
264+
265+ config , err := LoadConfig ()
266+ assert .NoError (t , err , "LoadConfig should not error" )
267+
268+ assert .Equal (t , tt .wantPort , config .Port , "Port" )
269+ assert .Equal (t , tt .wantProxies , config .TrustedProxies , "TrustedProxies" )
270+ assert .Equal (t , tt .wantStaticDir , config .StaticDir , "StaticDir" )
271+ })
272+ }
273+ }
0 commit comments