still trying to reproduce

Signed-off-by: Frederic BIDON <[email protected]>

.github/workflows/go-test.yml

@@ -35,13 +35,11 @@ jobs:
         go-version: '${{ matrix.go_version }}'
         check-latest: true
         cache: true
-
     - uses: actions/checkout@v3
-
     - run: go test -v -race -coverprofile="coverage-${{ matrix.os }}.${{ matrix.go_version }}.out" -covermode=atomic ./...
 
-    - run: go test -v -run 145
-      name: repro test
+    - name: repro test
+      run: go test -v -run '(145)|(NormalizeURI)|(NormalizeBase)'
       env:
         SWAGGER_DEBUG: '1'
 

fixtures/bugs/145/Program Files (x86)/AppName/ref.json

@@ -0,0 +1,17 @@
+{
+"definitions": {
+    "todo-partial": {
+      "title": "Todo Partial",
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "completed": {
+          "type": ["boolean", "null"]
+        }
+      },
+      "required": ["name", "completed"]
+    }
+  }
+}

fixtures/bugs/145/Program Files (x86)/AppName/todos.json

@@ -294,17 +294,7 @@
   },
   "definitions": {
     "todo-partial": {
-      "title": "Todo Partial",
-      "type": "object",
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "completed": {
-          "type": ["boolean", "null"]
-        }
-      },
-      "required": ["name", "completed"]
+      "$ref": "ref.json#/definitions/todo-partial"
     },
     "todo-full": {
       "title": "Todo Full",

normalizer.go

@@ -47,6 +47,7 @@ func normalizeURI(refPath, base string) string {
 	}
 
 	fixWindowsURI(refURL, refPath) // noop on non-windows OS
+	debugLog("normalizeURI called:\noriginal: refPath=%q, base=%q\nafter fix windows: %q", refPath, base, refURL.String())
 
 	refURL.Path = path.Clean(refURL.Path)
 	if refURL.Path == "." {
@@ -67,6 +68,7 @@ func normalizeURI(refPath, base string) string {
 	// copying fragment from ref to base
 	baseURL.Fragment = refURL.Fragment
 
+	debugLog("normalizeURI called:\noriginal: refPath=%q, base=%q\nresult: %q", refPath, base, baseURL.String())
 	return baseURL.String()
 }
 
@@ -176,7 +178,7 @@ func normalizeBase(in string) string {
 	u.Fragment = "" // any fragment in the base is irrelevant
 
 	fixWindowsURI(u, in) // noop on non-windows OS
-	debugLog("normalizBase called:\noriginal: %s\nafter fix windows: %s", in, u.String())
+	debugLog("normalizeBase called:\noriginal: %q\nafter fix windows: %q", in, u.String())
 
 	u.Path = path.Clean(u.Path)
 	if u.Path == "." { // empty after Clean()
@@ -199,6 +201,6 @@ func normalizeBase(in string) string {
 	u.Scheme = fileScheme
 	u.Path = absPath(u.Path) // platform-dependent
 	u.RawQuery = ""          // any query component is irrelevant for a base
-	debugLog("normalizBase called:\noriginal: %s\nafter normalizeBase: %s", in, u.String())
+	debugLog("normalizeBase called:\noriginal: %q\nafter normalizeBase: %q", in, u.String())
 	return u.String()
 }

normalizer_test.go

@@ -447,6 +447,11 @@ func TestNormalizer_NormalizeBase(t *testing.T) {
 			Expected: "file:///e:/base/sub/file.json",
 			Windows:  true,
 		},
+		{
+			// escaped characters in base (1)
+			Base:     `file:///C:/base (x86)/Spec.json`,
+			Expected: `file:///C:/base%20%28x86%29/Spec.json`,
+		},
 	} {
 		testCase := toPin
 		if testCase.Windows && runtime.GOOS != windowsOS {

schema_loader_test.go

@@ -9,12 +9,25 @@ import (
 )
 
 func TestLoader_Issue145(t *testing.T) {
-	basePath := filepath.Join("fixtures", "bugs", "145", "Program Files (x86)", "AppName", "todos.json")
-	todosDoc, err := jsonDoc(basePath)
-	require.NoError(t, err)
+	t.Run("with ExpandSpec", func(t *testing.T) {
+		basePath := filepath.Join("fixtures", "bugs", "145", "Program Files (x86)", "AppName", "todos.json")
+		todosDoc, err := jsonDoc(basePath)
+		require.NoError(t, err)
 
-	spec := new(Swagger)
-	require.NoError(t, json.Unmarshal(todosDoc, spec))
+		spec := new(Swagger)
+		require.NoError(t, json.Unmarshal(todosDoc, spec))
 
-	require.NoError(t, ExpandSpec(spec, &ExpandOptions{RelativeBase: basePath}))
+		require.NoError(t, ExpandSpec(spec, &ExpandOptions{RelativeBase: basePath}))
+	})
+
+	t.Run("with ExpandSchema", func(t *testing.T) {
+		basePath := filepath.Join("fixtures", "bugs", "145", "Program Files (x86)", "AppName", "ref.json")
+		schemaDoc, err := jsonDoc(basePath)
+		require.NoError(t, err)
+
+		sch := new(Schema)
+		require.NoError(t, json.Unmarshal(schemaDoc, sch))
+
+		require.NoError(t, ExpandSchema(sch, nil, nil))
+	})
 }