increased coverage

Author: SAPRD2

helpers/regex_maker.go

@@ -18,7 +18,7 @@ func GetRegexForPath(tpl string) (*regexp.Regexp, error) {
 	template := tpl
 
 	// Now let's parse it.
-	defaultPattern := "[^/]+"
+	defaultPattern := "[^/]*"
 
 	pattern := bytes.NewBufferString("^")
 	var end int

helpers/regex_maker_test.go

@@ -15,7 +15,7 @@ func TestGetRegexForPath(t *testing.T) {
 			name:     "well-formed template with default pattern",
 			tpl:      "/orders/{id}",
 			wantErr:  false,
-			wantExpr: "^/orders/([^/]+)$",
+			wantExpr: "^/orders/([^/]*)$",
 		},
 		{
 			name:     "well-formed template with custom pattern",
@@ -47,13 +47,13 @@ func TestGetRegexForPath(t *testing.T) {
 			name:     "template with multiple variables",
 			tpl:      "/orders/{id:[0-9]+}/items/{itemId}",
 			wantErr:  false,
-			wantExpr: "^/orders/([0-9]+)/items/([^/]+)$",
+			wantExpr: "^/orders/([0-9]+)/items/([^/]*)$",
 		},
 		{
 			name:     "OData formatted URL with single quotes",
 			tpl:      "/entities('{id}')",
 			wantErr:  false,
-			wantExpr: "^/entities\\('([^/]+)'\\)$",
+			wantExpr: "^/entities\\('([^/]*)'\\)$",
 		},
 		{
 			name:     "OData formatted URL with custom pattern",

parameters/path_parameters_test.go

@@ -1498,3 +1498,55 @@ paths:
 	assert.False(t, valid)
 	assert.Len(t, errors, 1)
 }
+
+func TestNewValidator_ODataFormattedOpenAPISpecs_Error(t *testing.T) {
+	spec := `openapi: 3.0.0
+paths:
+  /entities('{Entity'):
+    parameters:
+    - in: path
+      name: Entity
+      required: true
+      schema:
+        type: integer
+    get:
+      operationId: one
+`
+	doc, _ := libopenapi.NewDocument([]byte(spec))
+
+	m, _ := doc.BuildV3Model()
+
+	v := NewParameterValidator(&m.Model)
+
+	request, _ := http.NewRequest(http.MethodGet, "https://things.com/entities('1')", nil)
+
+	valid, errors := v.ValidatePathParams(request)
+	assert.False(t, valid)
+	assert.NotEmpty(t, errors)
+}
+
+func TestNewValidator_ODataFormattedOpenAPISpecs_ErrorEmptyParameter(t *testing.T) {
+	spec := `openapi: 3.0.0
+paths:
+  /entities('{Entity}'):
+    parameters:
+    - in: path
+      name: Entity
+      required: true
+      schema:
+        type: integer
+    get:
+      operationId: one
+`
+	doc, _ := libopenapi.NewDocument([]byte(spec))
+
+	m, _ := doc.BuildV3Model()
+
+	v := NewParameterValidator(&m.Model)
+
+	request, _ := http.NewRequest(http.MethodGet, "https://things.com/entities('')", nil)
+
+	valid, errors := v.ValidatePathParams(request)
+	assert.False(t, valid)
+	assert.NotEmpty(t, errors)
+}

paths/paths_test.go

@@ -746,3 +746,26 @@ paths:
 	assert.NotNil(t, pathItem)
 	assert.Equal(t, "one", pathItem.Get.OperationId)
 }
+
+func TestNewValidator_ODataFormattedOpenAPISpecs_Error(t *testing.T) {
+	spec := `openapi: 3.0.0
+paths:
+  /entities('{Entity'):
+    parameters:
+    - in: path
+      name: Entity
+      required: true
+      schema:
+        type: integer
+    get:
+      operationId: one
+`
+	doc, _ := libopenapi.NewDocument([]byte(spec))
+
+	m, _ := doc.BuildV3Model()
+
+	request, _ := http.NewRequest(http.MethodGet, "https://things.com/entities('1')", nil)
+
+	_, errs, _ := FindPath(request, &m.Model)
+	assert.NotEmpty(t, errs)
+}