coverage and test fixes

Author: daveshanley

datamodel/high/v3/callback_test.go

@@ -269,83 +269,3 @@ func TestBuildLowCallback_BuildError(t *testing.T) {
 	}
 }
 
-func TestCallback_MarshalYAMLInline_ExternalRef(t *testing.T) {
-	// Test that MarshalYAMLInline resolves external references properly
-	yml := `openapi: 3.1.0
-info:
-  title: Test API
-  version: 1.0.0
-components:
-  callbacks:
-    WebhookCallback:
-      $ref: "#/components/callbacks/InternalCallback"
-    InternalCallback:
-      "{$request.body#/callbackUrl}":
-        post:
-          summary: Webhook event
-          responses:
-            "200":
-              description: OK
-paths: {}`
-
-	var idxNode yaml.Node
-	_ = yaml.Unmarshal([]byte(yml), &idxNode)
-	config := index.CreateOpenAPIIndexConfig()
-	idx := index.NewSpecIndexWithConfig(&idxNode, config)
-	resolver := index.NewResolver(idx)
-	idx.SetResolver(resolver)
-	errs := resolver.Resolve()
-	assert.Empty(t, errs)
-
-	var n v3.Callback
-	callbackNode := idxNode.Content[0].Content[5].Content[1].Content[1] // components.callbacks.WebhookCallback
-	_ = low.BuildModel(callbackNode, &n)
-	_ = n.Build(context.Background(), nil, callbackNode, idx)
-
-	cb := NewCallback(&n)
-
-	result, err := cb.MarshalYAMLInline()
-	assert.NoError(t, err)
-	assert.NotNil(t, result)
-}
-
-func TestCallback_MarshalYAMLInlineWithContext_ExternalRef(t *testing.T) {
-	// Test that MarshalYAMLInlineWithContext resolves external references properly
-	yml := `openapi: 3.1.0
-info:
-  title: Test API
-  version: 1.0.0
-components:
-  callbacks:
-    WebhookCallback:
-      $ref: "#/components/callbacks/InternalCallback"
-    InternalCallback:
-      "{$request.body#/callbackUrl}":
-        post:
-          summary: Webhook event
-          responses:
-            "200":
-              description: OK
-paths: {}`
-
-	var idxNode yaml.Node
-	_ = yaml.Unmarshal([]byte(yml), &idxNode)
-	config := index.CreateOpenAPIIndexConfig()
-	idx := index.NewSpecIndexWithConfig(&idxNode, config)
-	resolver := index.NewResolver(idx)
-	idx.SetResolver(resolver)
-	errs := resolver.Resolve()
-	assert.Empty(t, errs)
-
-	var n v3.Callback
-	callbackNode := idxNode.Content[0].Content[5].Content[1].Content[1] // components.callbacks.WebhookCallback
-	_ = low.BuildModel(callbackNode, &n)
-	_ = n.Build(context.Background(), nil, callbackNode, idx)
-
-	cb := NewCallback(&n)
-
-	ctx := base.NewInlineRenderContext()
-	result, err := cb.MarshalYAMLInlineWithContext(ctx)
-	assert.NoError(t, err)
-	assert.NotNil(t, result)
-}

datamodel/high/v3/path_item.go

@@ -303,7 +303,7 @@ func (p *PathItem) MarshalYAMLInlineWithContext(ctx any) (interface{}, error) {
 	if p.low != nil {
 		rendered, err := high.RenderExternalRefWithContext(p.low, buildLowPathItem, NewPathItem, ctx)
 		if err != nil || rendered != nil {
-			return nil, err
+			return rendered, err
 		}
 	}
 

datamodel/high/v3/path_item_test.go

@@ -430,7 +430,8 @@ func TestPathItem_MarshalYAMLInline_Reference(t *testing.T) {
 }
 
 func TestPathItem_MarshalYAMLInline_Reference_Bad(t *testing.T) {
-
+	// Test that a PathItem with a Reference set renders as a $ref node
+	// even when the low-level object also has a reference set
 	yml := `openapi: 3.2
 minty: fresh`
 
@@ -451,6 +452,9 @@ minty: fresh`
 	lpi.Reference = &ref
 	pi := NewPathItem(&lpi)
 
+	// Set the high-level Reference field directly since NewPathItem doesn't copy it
+	pi.Reference = "#/minty"
+
 	node, err := pi.MarshalYAMLInline()
 	assert.NoError(t, err)
 

datamodel/high/v3/response.go

@@ -112,8 +112,8 @@ func (r *Response) MarshalYAMLInline() (interface{}, error) {
 	// resolve external reference if present
 	if r.low != nil {
 		rendered, err := high.RenderExternalRef(r.low, buildLowResponse, NewResponse)
-		if err != nil || rendered == nil {
-			return nil, err
+		if err != nil || rendered != nil {
+			return rendered, err
 		}
 	}