fix error on negative float and int numbers

Author: pratik-sharma-1

datamodel/high/node_builder.go

@@ -492,24 +492,22 @@ func (n *NodeBuilder) AddYAMLNode(parent *yaml.Node, entry *nodes.NodeEntry) *ya
 			}
 			if b, bok := value.(*int64); bok {
 				encodeSkip = true
-				if *b > 0 {
+				if *b != 0 {
 					valueNode = utils.CreateIntNode(strconv.Itoa(int(*b)))
 					valueNode.Line = line
 				}
 			}
 			if b, bok := value.(*float64); bok {
 				encodeSkip = true
-				if *b > 0 || (entry.RenderZero && entry.Line > 0) {
+				if *b != 0 || (entry.RenderZero && entry.Line > 0) {
 					formatFloat := strconv.FormatFloat(*b, 'f', -1, 64)
-					if *b > 0 {
-						if *b == math.Trunc(*b) {
-							valueNode = utils.CreateIntNode(formatFloat)
-						} else {
-							valueNode = utils.CreateFloatNode(formatFloat)
-						}
-					} else {
+
+					if *b == math.Trunc(*b) {
 						valueNode = utils.CreateIntNode(formatFloat)
+					} else {
+						valueNode = utils.CreateFloatNode(formatFloat)
 					}
+
 					valueNode.Line = line
 				}
 			}

datamodel/high/node_builder_test.go

@@ -1108,3 +1108,35 @@ func TestNodeBuilder_GetStringLowValue(t *testing.T) {
 
 	assert.Equal(t, `thing: "thing"`, strings.TrimSpace(string(data)))
 }
+
+func TestNewNodeBuilder_Float64_Negative(t *testing.T) {
+	floatNum := -3.33333
+	t1 := test1{
+		Thral: &floatNum,
+	}
+
+	nb := NewNodeBuilder(&t1, &t1)
+	node := nb.Render()
+
+	data, _ := yaml.Marshal(node)
+
+	desired := `thung: -3.33333`
+
+	assert.Equal(t, desired, strings.TrimSpace(string(data)))
+}
+
+func TestNewNodeBuilder_Int64_Negative(t *testing.T) {
+	intNum := int64(-3)
+	t1 := test1{
+		Thurr: &intNum,
+	}
+
+	nb := NewNodeBuilder(&t1, &t1)
+	node := nb.Render()
+
+	data, _ := yaml.Marshal(node)
+
+	desired := `thurr: -3`
+
+	assert.Equal(t, desired, strings.TrimSpace(string(data)))
+}

datamodel/high/v3/document_test.go

@@ -880,25 +880,3 @@ components:
 
 	assert.Equal(t, desired, strings.TrimSpace(string(r)))
 }
-
-func TestDocument_RenderJSONError(t *testing.T) {
-	// create a new document
-	jsonFile := `{"openapi":"3.0.0","info":{"title":"dummy","version":"1.0.0"},"paths":{"/dummy":{"post":{"requestBody":{"content":{"application/json":{"schema":{"type":"object","properties":{"value":{"type":"number","format":"decimal","multipleOf":0.01,"minimum":-999.99}}}}}},"responses":{"200":{"description":"OK"}}}}}}`
-
-	info, _ := datamodel.ExtractSpecInfo([]byte(jsonFile))
-	var err error
-	lowDoc, err = lowv3.CreateDocumentFromConfig(info, &datamodel.DocumentConfiguration{
-		AllowFileReferences:   true,
-		AllowRemoteReferences: true,
-	})
-	if err != nil {
-		panic("broken something")
-	}
-	h := NewDocument(lowDoc)
-
-	// render the document to YAML and it should be identical.
-	r, e := h.RenderJSON(" ")
-	assert.Nil(t, r)
-	assert.Error(t, e)
-	assert.Equal(t, "yaml: cannot decode !!float `-999.99` as a !!int", e.Error())
-}

document_test.go

@@ -1429,8 +1429,8 @@ func TestDocument_Issue264(t *testing.T) {
 	_, _ = d.BuildV3Model()
 
 	_, _, _, errs := d.RenderAndReload() // code panics here
-	assert.Len(t, errs, 1)
-	assert.Equal(t, "yaml: cannot decode !!float `-999.99` as a !!int", errs[0].Error())
+	assert.Nil(t, errs)
+
 }
 
 func TestDocument_Issue269(t *testing.T) {