Uncompressed ordered map tests in mostly ygot package.

integration_tests/schemaops/ctestschema/helpers.go

@@ -58,6 +58,10 @@ func (*MapStructTestOneChild) ΛValidate(...ygot.ValidationOption) error {
 func (*MapStructTestOneChild) ΛEnumTypeMap() map[string][]reflect.Type { return nil }
 func (*MapStructTestOneChild) ΛBelongingModule() string                { return "test-one" }
 
+// GetOrderedMap returns a populated ordered map with dummy values.
+//
+// - foo: foo-val
+// - bar: bar-val
 func GetOrderedMap(t *testing.T) *OrderedList_OrderedMap {
 	orderedMap := &OrderedList_OrderedMap{}
 	v, err := orderedMap.AppendNew("foo")
@@ -73,6 +77,11 @@ func GetOrderedMap(t *testing.T) *OrderedList_OrderedMap {
 	return orderedMap
 }
 
+// GetOrderedMapLonger returns a populated ordered map with more dummy values.
+//
+// - foo: foo-val
+// - bar: bar-val
+// - baz: baz-val
 func GetOrderedMapLonger(t *testing.T) *OrderedList_OrderedMap {
 	orderedMap := &OrderedList_OrderedMap{}
 	v, err := orderedMap.AppendNew("foo")
@@ -93,6 +102,10 @@ func GetOrderedMapLonger(t *testing.T) *OrderedList_OrderedMap {
 	return orderedMap
 }
 
+// GetOrderedMap2 returns a populated ordered map with different dummy values.
+//
+// - wee: wee-val
+// - woo: woo-val
 func GetOrderedMap2(t *testing.T) *OrderedList_OrderedMap {
 	orderedMap := &OrderedList_OrderedMap{}
 	v, err := orderedMap.AppendNew("wee")
@@ -108,6 +121,12 @@ func GetOrderedMap2(t *testing.T) *OrderedList_OrderedMap {
 	return orderedMap
 }
 
+// GetNestedOrderedMap returns a populated nested ordered map with dummy
+// values.
+//
+// - foo: foo-val
+//   - foo: foo-val
+//   - bar: bar-val
 func GetNestedOrderedMap(t *testing.T) *OrderedList_OrderedMap {
 	om := GetOrderedMap(t)
 
@@ -127,6 +146,12 @@ func GetNestedOrderedMap(t *testing.T) *OrderedList_OrderedMap {
 	return om
 }
 
+// GetOrderedMapMultikeyed returns a populated multi-keyed ordered map with
+// dummy values.
+//
+// - foo, 42: foo-val
+// - bar, 42: bar-val
+// - baz, 84: baz-val
 func GetOrderedMapMultikeyed(t *testing.T) *OrderedMultikeyedList_OrderedMap {
 	orderedMap := &OrderedMultikeyedList_OrderedMap{}
 	v, err := orderedMap.AppendNew("foo", 42)

integration_tests/schemaops/utestschema/helper.go

@@ -50,3 +50,64 @@ func GetDeviceWithOrderedMap(t *testing.T) *Device {
 		},
 	}
 }
+
+// GetOrderedMap2 returns a populated ordered map with different dummy values.
+//
+// - wee: wee-val
+// - woo: woo-val
+func GetOrderedMap2(t *testing.T) *Ctestschema_OrderedLists_OrderedList_OrderedMap {
+	orderedMap := &Ctestschema_OrderedLists_OrderedList_OrderedMap{}
+	v, err := orderedMap.AppendNew("wee")
+	if err != nil {
+		t.Error(err)
+	}
+	// Config value
+	v.GetOrCreateConfig().Value = ygot.String("wee-val")
+	v, err = orderedMap.AppendNew("woo")
+	if err != nil {
+		t.Error(err)
+	}
+	// State value
+	v.GetOrCreateState().Value = ygot.String("woo-val")
+	return orderedMap
+}
+
+// GetDeviceWithOrderedMap returns a Device object with a ordered map
+// field populated with different values.
+func GetDeviceWithOrderedMap2(t *testing.T) *Device {
+	return &Device{
+		OrderedLists: &Ctestschema_OrderedLists{
+			OrderedList: GetOrderedMap2(t),
+		},
+	}
+}
+
+// GetOrderedMultikeyedMap returns a populated multi-keyed ordered map with
+// dummy values.
+//
+// - foo, 42: foo-val
+// - bar, 42: bar-val
+// - baz, 84: baz-val
+func GetOrderedMultikeyedMap(t *testing.T) *CtestschemaRootmod_OrderedMultikeyedLists_OrderedMultikeyedList_OrderedMap {
+	orderedMap := &CtestschemaRootmod_OrderedMultikeyedLists_OrderedMultikeyedList_OrderedMap{}
+	v, err := orderedMap.AppendNew("foo", 42)
+	if err != nil {
+		t.Error(err)
+	}
+	// Config value
+	v.GetOrCreateConfig().Value = ygot.String("foo-val")
+	v, err = orderedMap.AppendNew("bar", 42)
+	if err != nil {
+		t.Error(err)
+	}
+	// State value
+	v.GetOrCreateState().Value = ygot.String("bar-val")
+	v, err = orderedMap.AppendNew("baz", 84)
+	if err != nil {
+		t.Error(err)
+	}
+	// Config & State value
+	v.GetOrCreateConfig().Value = ygot.String("baz-val")
+	v.GetOrCreateState().Value = ygot.String("baz-val")
+	return orderedMap
+}

ygot/diff_exported_test.go

@@ -21,6 +21,7 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/openconfig/gnmi/errdiff"
 	"github.com/openconfig/ygot/integration_tests/schemaops/ctestschema"
+	"github.com/openconfig/ygot/integration_tests/schemaops/utestschema"
 	"github.com/openconfig/ygot/internal/ytestutil"
 	"github.com/openconfig/ygot/testutil"
 	"github.com/openconfig/ygot/ygot"
@@ -44,7 +45,7 @@ func TestDiffOrderedMap(t *testing.T) {
 	// TODO: Test for uncompressed structs.
 	tests := []struct {
 		name          string
-		inOrig, inMod *ctestschema.Device
+		inOrig, inMod ygot.GoStruct
 		inOpts        []ygot.DiffOpt
 		// skipTestUnmarshal determines whether the unmarshal test is skipped.
 		skipTestUnmarshal bool
@@ -287,6 +288,65 @@ func TestDiffOrderedMap(t *testing.T) {
 				mustPath(`/ordered-lists`),
 			},
 		},
+	}, {
+		name:   "empty-modified-uncompressed",
+		inOrig: utestschema.GetDeviceWithOrderedMap(t),
+		inMod:  &utestschema.Device{},
+		want: &gnmipb.Notification{
+			Delete: []*gnmipb.Path{
+				mustPath(`/ordered-lists/ordered-list[key=foo]/key`),
+				mustPath(`/ordered-lists/ordered-list[key=foo]/config/value`),
+				mustPath(`/ordered-lists/ordered-list[key=bar]/key`),
+				mustPath(`/ordered-lists/ordered-list[key=bar]/state/value`),
+			},
+		},
+		wantNonAtomic: &gnmipb.Notification{
+			Delete: []*gnmipb.Path{
+				mustPath(`/ordered-lists`),
+			},
+		},
+	}, {
+		name:   "empty-disjoint-uncompressed",
+		inOrig: utestschema.GetDeviceWithOrderedMap2(t),
+		inMod:  utestschema.GetDeviceWithOrderedMap(t),
+		want: &gnmipb.Notification{
+			Update: []*gnmipb.Update{{
+				Path: mustPath(`/ordered-lists/ordered-list[key=foo]/key`),
+				Val:  &gnmipb.TypedValue{Value: &gnmipb.TypedValue_StringVal{StringVal: "foo"}},
+			}, {
+				Path: mustPath(`/ordered-lists/ordered-list[key=foo]/config/value`),
+				Val:  &gnmipb.TypedValue{Value: &gnmipb.TypedValue_StringVal{StringVal: "foo-val"}},
+			}, {
+				Path: mustPath(`/ordered-lists/ordered-list[key=bar]/key`),
+				Val:  &gnmipb.TypedValue{Value: &gnmipb.TypedValue_StringVal{StringVal: "bar"}},
+			}, {
+				Path: mustPath(`/ordered-lists/ordered-list[key=bar]/state/value`),
+				Val:  &gnmipb.TypedValue{Value: &gnmipb.TypedValue_StringVal{StringVal: "bar-val"}},
+			}},
+			Delete: []*gnmipb.Path{
+				mustPath(`/ordered-lists/ordered-list[key=wee]/key`),
+				mustPath(`/ordered-lists/ordered-list[key=wee]/config/value`),
+				mustPath(`/ordered-lists/ordered-list[key=woo]/key`),
+				mustPath(`/ordered-lists/ordered-list[key=woo]/state/value`),
+			},
+		},
+		wantAtomic: []*gnmipb.Notification{{
+			Prefix: mustPath(`ordered-lists`),
+			Atomic: true,
+			Update: []*gnmipb.Update{{
+				Path: mustPath(`ordered-list[key=foo]/config/value`),
+				Val:  &gnmipb.TypedValue{Value: &gnmipb.TypedValue_StringVal{StringVal: "foo-val"}},
+			}, {
+				Path: mustPath(`ordered-list[key=foo]/key`),
+				Val:  &gnmipb.TypedValue{Value: &gnmipb.TypedValue_StringVal{StringVal: "foo"}},
+			}, {
+				Path: mustPath(`ordered-list[key=bar]/key`),
+				Val:  &gnmipb.TypedValue{Value: &gnmipb.TypedValue_StringVal{StringVal: "bar"}},
+			}, {
+				Path: mustPath(`ordered-list[key=bar]/state/value`),
+				Val:  &gnmipb.TypedValue{Value: &gnmipb.TypedValue_StringVal{StringVal: "bar-val"}},
+			}},
+		}},
 	}, {
 		name: "empty-modified-with-other-data-in-orig",
 		inOrig: &ctestschema.Device{
@@ -642,9 +702,18 @@ func TestDiffOrderedMap(t *testing.T) {
 				return
 			}
 			// Test that unmarshalling into original gets back to modified.
-			schema, err := ctestschema.Schema()
-			if err != nil {
-				t.Fatal(err)
+			var schema *ytypes.Schema
+			switch tt.inOrig.(type) {
+			case *ctestschema.Device:
+				if schema, err = ctestschema.Schema(); err != nil {
+					t.Fatal(err)
+				}
+			case *utestschema.Device:
+				if schema, err = utestschema.Schema(); err != nil {
+					t.Fatal(err)
+				}
+			default:
+				t.Fatalf("Unexpected type: %T", tt.inOrig)
 			}
 			schema.Root = tt.inOrig
 			if err := ytypes.UnmarshalNotifications(schema, got); err != nil {

ygot/gostruct_exported_test.go

@@ -20,6 +20,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/openconfig/goyang/pkg/yang"
 	"github.com/openconfig/ygot/integration_tests/schemaops/ctestschema"
+	"github.com/openconfig/ygot/integration_tests/schemaops/utestschema"
 	"github.com/openconfig/ygot/internal/ytestutil"
 	"github.com/openconfig/ygot/ygot"
 )
@@ -55,6 +56,34 @@ func TestPruneConfigFalseOrderedMap(t *testing.T) {
 				return om
 			}(),
 		},
+	}, {
+		desc:     "prune through ordered map uncompressed",
+		inSchema: utestschema.SchemaTree["Device"],
+		inStruct: &utestschema.Device{
+			OrderedLists: &utestschema.Ctestschema_OrderedLists{
+				OrderedList: func() *utestschema.Ctestschema_OrderedLists_OrderedList_OrderedMap {
+					om := &utestschema.Ctestschema_OrderedLists_OrderedList_OrderedMap{}
+					ome, err := om.AppendNew("foo")
+					if err != nil {
+						t.Fatal(err)
+					}
+					ome.GetOrCreateState().RoValue = ygot.String("ro-value")
+					return om
+				}(),
+			},
+		},
+		want: &utestschema.Device{
+			OrderedLists: &utestschema.Ctestschema_OrderedLists{
+				OrderedList: func() *utestschema.Ctestschema_OrderedLists_OrderedList_OrderedMap {
+					om := &utestschema.Ctestschema_OrderedLists_OrderedList_OrderedMap{}
+					_, err := om.AppendNew("foo")
+					if err != nil {
+						t.Fatal(err)
+					}
+					return om
+				}(),
+			},
+		},
 	}}
 
 	for _, tt := range tests {