make the REST test JSON response a bit bigger, by adding a 3rd output…

… field
kataras · Sep 30, 2024 · 84c22a9 · 84c22a9
1 parent 3bed812
commit 84c22a9
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 44 deletions.
diff --git a/_code/rest/buffalo/main.go b/_code/rest/buffalo/main.go
@@ -19,8 +19,9 @@ type (
 	}
 
 	testOutput struct {
-		ID    int `json:"id"`
-		Count int `json:"count"`
+		ID      int    `json:"id"`
+		Count   int    `json:"count"`
+		FirstID string `json:"first_id"`
 	}
 )
 
@@ -37,8 +38,9 @@ func handler(ctx buffalo.Context) error {
 	}
 
 	return ctx.Render(200, render.JSON(testOutput{
-		ID:    id,
-		Count: len(in),
+		ID:      id,
+		Count:   len(in),
+		FirstID: in[0].ID,
 	}))
 }
 

diff --git a/_code/rest/chi/main.go b/_code/rest/chi/main.go
@@ -18,8 +18,9 @@ type (
 	}
 
 	testOutput struct {
-		ID    int `json:"id"`
-		Count int `json:"count"`
+		ID      int    `json:"id"`
+		Count   int    `json:"count"`
+		FirstID string `json:"first_id"`
 	}
 )
 
@@ -45,8 +46,9 @@ func handler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Add(contentTypeKey, contentTypeValue)
 
 	json.NewEncoder(w).Encode(testOutput{
-		ID:    id,
-		Count: len(in),
+		ID:      id,
+		Count:   len(in),
+		FirstID: in[0].ID,
 	})
 }
 

diff --git a/_code/rest/echo/main.go b/_code/rest/echo/main.go
@@ -18,8 +18,9 @@ type (
 	}
 
 	testOutput struct {
-		ID    int `json:"id"`
-		Count int `json:"count"`
+		ID      int    `json:"id"`
+		Count   int    `json:"count"`
+		FirstID string `json:"first_id"`
 	}
 )
 
@@ -36,8 +37,9 @@ func handler(ctx echo.Context) error {
 	}
 
 	return ctx.JSON(200, testOutput{
-		ID:    id,
-		Count: len(in),
+		ID:      id,
+		Count:   len(in),
+		FirstID: in[0].ID,
 	})
 }
 

diff --git a/_code/rest/express/main.js b/_code/rest/express/main.js
@@ -16,7 +16,8 @@ function createWebServer() {
         const inputs = req.body;
         res.json({
             id: id,
-            count: inputs.length
+            count: inputs.length,
+            first_id: inputs[0].id
         });
     });
 

diff --git a/_code/rest/gin/main.go b/_code/rest/gin/main.go
@@ -17,8 +17,9 @@ type (
 	}
 
 	testOutput struct {
-		ID    int `json:"id"`
-		Count int `json:"count"`
+		ID      int    `json:"id"`
+		Count   int    `json:"count"`
+		FirstID string `json:"first_id"`
 	}
 )
 
@@ -39,8 +40,9 @@ func handler(ctx *gin.Context) {
 	}
 
 	ctx.JSON(200, testOutput{
-		ID:    id,
-		Count: len(in),
+		ID:      id,
+		Count:   len(in),
+		FirstID: in[0].ID,
 	})
 }
 

diff --git a/_code/rest/iris/main.go b/_code/rest/iris/main.go
@@ -12,8 +12,9 @@ type (
 	}
 
 	testOutput struct {
-		ID    int `json:"id"`
-		Count int `json:"count"`
+		ID      int    `json:"id"`
+		Count   int    `json:"count"`
+		FirstID string `json:"first_id"`
 	}
 )
 
@@ -29,8 +30,9 @@ func handler(ctx iris.Context) {
 	}
 
 	ctx.JSON(testOutput{
-		ID:    id,
-		Count: len(in),
+		ID:      id,
+		Count:   len(in),
+		FirstID: in[0].ID,
 	})
 }
 

diff --git a/_code/rest/kestrel/Startup.cs b/_code/rest/kestrel/Startup.cs
@@ -22,6 +22,7 @@ public struct testOutput
     {
         public int id { get; set; }
         public int count { get; set; }
+        public string first_id { get; set; }
     }
 
     public class Startup
@@ -60,7 +61,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 var output = new testOutput
                 {
                     id = int.Parse(context.GetRouteValue("id").ToString()),
-                    count = inputs.Count
+                    count = inputs.Count,
+                    first_id = inputs[0].Id 
                 };
 
                 context.Response.Headers.Add("Content-Type", "application/json; charset=utf-8");

diff --git a/_code/rest/koa/main.js b/_code/rest/koa/main.js
@@ -18,6 +18,7 @@ function createWebServer() {
         ctx.body = {
             id: id,
             count: inputs.length,
+            first_id: inputs[0].id
         };
     });
 

diff --git a/_code/rest/martini/main.go b/_code/rest/martini/main.go
@@ -18,8 +18,9 @@ type (
 	}
 
 	testOutput struct {
-		ID    int `json:"id"`
-		Count int `json:"count"`
+		ID      int    `json:"id"`
+		Count   int    `json:"count"`
+		FirstID string `json:"first_id"`
 	}
 )
 
@@ -45,8 +46,9 @@ func handler(w http.ResponseWriter, r *http.Request, params martini.Params) {
 	w.Header().Add(contentTypeKey, contentTypeValue)
 
 	json.NewEncoder(w).Encode(testOutput{
-		ID:    id,
-		Count: len(in),
+		ID:      id,
+		Count:   len(in),
+		FirstID: in[0].ID,
 	})
 }
 

diff --git a/main.go b/main.go
@@ -93,6 +93,10 @@ func readTests(filename string) ([]*Test, error) {
 }
 
 func filterTests(specificTests stringSlice, tests ...*Test) []*Test {
+	if len(specificTests) == 0 {
+		return tests
+	}
+
 	testsAndEnvsToKeep := make(map[string][]string, len(specificTests))
 	for _, specificTest := range specificTests {
 		if specificTestName := strings.ToLower(specificTest); specificTestName != "" {

diff --git a/slice_flag.go b/slice_flag.go
@@ -12,14 +12,3 @@ func (s *stringSlice) Set(value string) error {
 	*s = append(*s, value)
 	return nil
 }
-
-// type sliceFlag[T any] struct {
-// 	slice []T
-// }
-// func (s *sliceFlag[T]) String() string {
-// 	return fmt.Sprintf("%v", s.slice)
-// }
-// func (s *sliceFlag[T]) Set(value string) error {
-// 	s.slice = append(s.slice, *(*T)(unsafe.Pointer(&value)))
-// 	return nil
-// }
diff --git a/tests.yml b/tests.yml
@@ -33,7 +33,7 @@
 # ::End sample YAML::
 - Name: Static
   Description: Fires {{.NumberOfRequests}} requests, receives a static message as response.
-  NumberOfRequests: 1000000
+  NumberOfRequests: 100000
   # Duration: 5s
   Method: GET
   URL: http://localhost:5000
@@ -57,7 +57,7 @@
   Description: >-
      Fires {{.NumberOfRequests}} requests with a dynamic parameter of string,
      receives a hello text based on the parameter as response.
-  NumberOfRequests: 550000
+  NumberOfRequests: 100000
   # Duration: 5s
   Method: GET
   URL: http://localhost:5000/hello/world
@@ -67,9 +67,9 @@
     - Repo: gin-gonic/gin
     - Repo: koajs/koa
       Language: Javascript
-    - Repo: kataras/iris
+    # - Repo: kataras/iris
     # - Repo: kataras/iris-private
-    #   Dir: ./_code/parameterized/iris-next
+      Dir: ./_code/parameterized/iris-next
     - Repo: labstack/echo
     - Name: Kestrel
       Repo: dotnet/aspnetcore
@@ -80,9 +80,9 @@
 - Name: REST
   Description: >-
       Fires {{.NumberOfRequests}} requests with a dynamic parameter of int,
-      sends JSON as request body and receives JSON as response.
-  NumberOfRequests: 200000
-  # Duration: 5s
+      sends 1MB JSON as request body and receives JSON as response.
+  NumberOfRequests: 100000
+  # Duration: 8s
   Method: POST
   # BodyFile: ./_code/rest/request.json
   BodyFile: "https://microsoftedge.github.io/Demos/json-dummy-data/1MB.json"