Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions equal_null_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package jsonpatch

import "testing"

func TestEqualArraysContainingNull(t *testing.T) {
cases := []struct {
name, left, right string
want bool
}{
{"null element", `[null]`, `[null]`, true},
{"null versus number", `[null]`, `[1]`, false},
{"number versus null", `[1]`, `[null]`, false},
{"null after value", `[true,null]`, `[true,null]`, true},
{"nested array", `[[null]]`, `[[null]]`, true},
{"object key order", `{"name":"test","data":[true,null]}`, `{"data":[true,null],"name":"test"}`, true},
{"different later value", `[null,1]`, `[null,2]`, false},
}
for i := range cases {
tc := cases[i]
t.Run(tc.name, func(t *testing.T) {
if got := Equal([]byte(tc.left), []byte(tc.right)); got != tc.want {
t.Fatalf("Equal(%s, %s) = %v, want %v", tc.left, tc.right, got, tc.want)
}
})
}
}
4 changes: 4 additions & 0 deletions patch.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@ func (n *lazyNode) tryAry() bool {
}

func (n *lazyNode) equal(o *lazyNode) bool {
if n == nil || o == nil {
return n == o
}

if n.which == eRaw {
if !n.tryDoc() && !n.tryAry() {
if o.which != eRaw {
Expand Down
26 changes: 26 additions & 0 deletions v5/equal_null_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package jsonpatch

import "testing"

func TestEqualArraysContainingNull(t *testing.T) {
cases := []struct {
name, left, right string
want bool
}{
{"null element", `[null]`, `[null]`, true},
{"null versus number", `[null]`, `[1]`, false},
{"number versus null", `[1]`, `[null]`, false},
{"null after value", `[true,null]`, `[true,null]`, true},
{"nested array", `[[null]]`, `[[null]]`, true},
{"object key order", `{"name":"test","data":[true,null]}`, `{"data":[true,null],"name":"test"}`, true},
{"different later value", `[null,1]`, `[null,2]`, false},
}
for i := range cases {
tc := cases[i]
t.Run(tc.name, func(t *testing.T) {
if got := Equal([]byte(tc.left), []byte(tc.right)); got != tc.want {
t.Fatalf("Equal(%s, %s) = %v, want %v", tc.left, tc.right, got, tc.want)
}
})
}
}
4 changes: 4 additions & 0 deletions v5/patch.go
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,10 @@ func (n *lazyNode) isNull() bool {
}

func (n *lazyNode) equal(o *lazyNode) bool {
if n == nil || o == nil {
return n == o
}

if n.which == eRaw {
if !n.tryDoc() && !n.tryAry() {
if o.which != eRaw {
Expand Down
Loading