Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 1 | // Copyright 2018 The Go Authors. All rights reserved. |
| 2 | // Use of this source code is governed by a BSD-style |
| 3 | // license that can be found in the LICENSE file. |
| 4 | |
| 5 | package impl |
| 6 | |
| 7 | import ( |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 8 | "bytes" |
| 9 | "math" |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 10 | "reflect" |
| 11 | "testing" |
| 12 | |
Joe Tsai | 95b0290 | 2018-10-31 18:23:42 -0700 | [diff] [blame] | 13 | protoV1 "github.com/golang/protobuf/proto" |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 14 | pack "github.com/golang/protobuf/v2/internal/encoding/pack" |
| 15 | pragma "github.com/golang/protobuf/v2/internal/pragma" |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 16 | pref "github.com/golang/protobuf/v2/reflect/protoreflect" |
| 17 | ptype "github.com/golang/protobuf/v2/reflect/prototype" |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 18 | cmp "github.com/google/go-cmp/cmp" |
| 19 | |
| 20 | proto2_20160225 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v0.0.0-20160225-2fc053c5" |
| 21 | proto2_20160519 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v0.0.0-20160519-a4ab9ec5" |
| 22 | proto2_20180125 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.0.0-20180125-92554152" |
| 23 | proto2_20180430 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.1.0-20180430-b4deda09" |
| 24 | proto2_20180814 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto2.v1.2.0-20180814-aa810b61" |
| 25 | proto3_20160225 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v0.0.0-20160225-2fc053c5" |
| 26 | proto3_20160519 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v0.0.0-20160519-a4ab9ec5" |
| 27 | proto3_20180125 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.0.0-20180125-92554152" |
| 28 | proto3_20180430 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.1.0-20180430-b4deda09" |
| 29 | proto3_20180814 "github.com/golang/protobuf/v2/internal/testprotos/legacy/proto3.v1.2.0-20180814-aa810b61" |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 30 | ) |
| 31 | |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 32 | func mustLoadFileDesc(b []byte, _ []int) pref.FileDescriptor { |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 33 | fd, err := ptype.NewFileFromDescriptorProto(loadFileDesc(b), nil) |
| 34 | if err != nil { |
| 35 | panic(err) |
| 36 | } |
| 37 | return fd |
| 38 | } |
| 39 | |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 40 | func TestLegacyDescriptor(t *testing.T) { |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 41 | var tests []struct{ got, want pref.Descriptor } |
| 42 | |
| 43 | fileDescP2_20160225 := mustLoadFileDesc(new(proto2_20160225.Message).Descriptor()) |
| 44 | tests = append(tests, []struct{ got, want pref.Descriptor }{{ |
| 45 | got: loadEnumDesc(reflect.TypeOf(proto2_20160225.SiblingEnum(0))), |
| 46 | want: fileDescP2_20160225.Enums().ByName("SiblingEnum"), |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 47 | }, { |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 48 | got: loadEnumDesc(reflect.TypeOf(proto2_20160225.Message_ChildEnum(0))), |
| 49 | want: fileDescP2_20160225.Messages().ByName("Message").Enums().ByName("ChildEnum"), |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 50 | }, { |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 51 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160225.SiblingMessage))), |
| 52 | want: fileDescP2_20160225.Messages().ByName("SiblingMessage"), |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 53 | }, { |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 54 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message_ChildMessage))), |
| 55 | want: fileDescP2_20160225.Messages().ByName("Message").Messages().ByName("ChildMessage"), |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 56 | }, { |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 57 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message))), |
| 58 | want: fileDescP2_20160225.Messages().ByName("Message"), |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 59 | }, { |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 60 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message_NamedGroup))), |
| 61 | want: fileDescP2_20160225.Messages().ByName("Message").Messages().ByName("NamedGroup"), |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 62 | }, { |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 63 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message_OptionalGroup))), |
| 64 | want: fileDescP2_20160225.Messages().ByName("Message").Messages().ByName("OptionalGroup"), |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 65 | }, { |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 66 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message_RequiredGroup))), |
| 67 | want: fileDescP2_20160225.Messages().ByName("Message").Messages().ByName("RequiredGroup"), |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 68 | }, { |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 69 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message_RepeatedGroup))), |
| 70 | want: fileDescP2_20160225.Messages().ByName("Message").Messages().ByName("RepeatedGroup"), |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 71 | }, { |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 72 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message_OneofGroup))), |
| 73 | want: fileDescP2_20160225.Messages().ByName("Message").Messages().ByName("OneofGroup"), |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 74 | }, { |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 75 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message_ExtensionOptionalGroup))), |
| 76 | want: fileDescP2_20160225.Messages().ByName("Message").Messages().ByName("ExtensionOptionalGroup"), |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 77 | }, { |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 78 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160225.Message_ExtensionRepeatedGroup))), |
| 79 | want: fileDescP2_20160225.Messages().ByName("Message").Messages().ByName("ExtensionRepeatedGroup"), |
| 80 | }}...) |
| 81 | |
| 82 | fileDescP3_20160225 := mustLoadFileDesc(new(proto3_20160225.Message).Descriptor()) |
| 83 | tests = append(tests, []struct{ got, want pref.Descriptor }{{ |
| 84 | got: loadEnumDesc(reflect.TypeOf(proto3_20160225.SiblingEnum(0))), |
| 85 | want: fileDescP3_20160225.Enums().ByName("SiblingEnum"), |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 86 | }, { |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 87 | got: loadEnumDesc(reflect.TypeOf(proto3_20160225.Message_ChildEnum(0))), |
| 88 | want: fileDescP3_20160225.Messages().ByName("Message").Enums().ByName("ChildEnum"), |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 89 | }, { |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 90 | got: loadMessageDesc(reflect.TypeOf(new(proto3_20160225.SiblingMessage))), |
| 91 | want: fileDescP3_20160225.Messages().ByName("SiblingMessage"), |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 92 | }, { |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 93 | got: loadMessageDesc(reflect.TypeOf(new(proto3_20160225.Message_ChildMessage))), |
| 94 | want: fileDescP3_20160225.Messages().ByName("Message").Messages().ByName("ChildMessage"), |
| 95 | }, { |
| 96 | got: loadMessageDesc(reflect.TypeOf(new(proto3_20160225.Message))), |
| 97 | want: fileDescP3_20160225.Messages().ByName("Message"), |
| 98 | }}...) |
| 99 | |
| 100 | fileDescP2_20160519 := mustLoadFileDesc(new(proto2_20160519.Message).Descriptor()) |
| 101 | tests = append(tests, []struct{ got, want pref.Descriptor }{{ |
| 102 | got: loadEnumDesc(reflect.TypeOf(proto2_20160519.SiblingEnum(0))), |
| 103 | want: fileDescP2_20160519.Enums().ByName("SiblingEnum"), |
| 104 | }, { |
| 105 | got: loadEnumDesc(reflect.TypeOf(proto2_20160519.Message_ChildEnum(0))), |
| 106 | want: fileDescP2_20160519.Messages().ByName("Message").Enums().ByName("ChildEnum"), |
| 107 | }, { |
| 108 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160519.SiblingMessage))), |
| 109 | want: fileDescP2_20160519.Messages().ByName("SiblingMessage"), |
| 110 | }, { |
| 111 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message_ChildMessage))), |
| 112 | want: fileDescP2_20160519.Messages().ByName("Message").Messages().ByName("ChildMessage"), |
| 113 | }, { |
| 114 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message))), |
| 115 | want: fileDescP2_20160519.Messages().ByName("Message"), |
| 116 | }, { |
| 117 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message_NamedGroup))), |
| 118 | want: fileDescP2_20160519.Messages().ByName("Message").Messages().ByName("NamedGroup"), |
| 119 | }, { |
| 120 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message_OptionalGroup))), |
| 121 | want: fileDescP2_20160519.Messages().ByName("Message").Messages().ByName("OptionalGroup"), |
| 122 | }, { |
| 123 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message_RequiredGroup))), |
| 124 | want: fileDescP2_20160519.Messages().ByName("Message").Messages().ByName("RequiredGroup"), |
| 125 | }, { |
| 126 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message_RepeatedGroup))), |
| 127 | want: fileDescP2_20160519.Messages().ByName("Message").Messages().ByName("RepeatedGroup"), |
| 128 | }, { |
| 129 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message_OneofGroup))), |
| 130 | want: fileDescP2_20160519.Messages().ByName("Message").Messages().ByName("OneofGroup"), |
| 131 | }, { |
| 132 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message_ExtensionOptionalGroup))), |
| 133 | want: fileDescP2_20160519.Messages().ByName("Message").Messages().ByName("ExtensionOptionalGroup"), |
| 134 | }, { |
| 135 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20160519.Message_ExtensionRepeatedGroup))), |
| 136 | want: fileDescP2_20160519.Messages().ByName("Message").Messages().ByName("ExtensionRepeatedGroup"), |
| 137 | }}...) |
| 138 | |
| 139 | fileDescP3_20160519 := mustLoadFileDesc(new(proto3_20160519.Message).Descriptor()) |
| 140 | tests = append(tests, []struct{ got, want pref.Descriptor }{{ |
| 141 | got: loadEnumDesc(reflect.TypeOf(proto3_20160519.SiblingEnum(0))), |
| 142 | want: fileDescP3_20160519.Enums().ByName("SiblingEnum"), |
| 143 | }, { |
| 144 | got: loadEnumDesc(reflect.TypeOf(proto3_20160519.Message_ChildEnum(0))), |
| 145 | want: fileDescP3_20160519.Messages().ByName("Message").Enums().ByName("ChildEnum"), |
| 146 | }, { |
| 147 | got: loadMessageDesc(reflect.TypeOf(new(proto3_20160519.SiblingMessage))), |
| 148 | want: fileDescP3_20160519.Messages().ByName("SiblingMessage"), |
| 149 | }, { |
| 150 | got: loadMessageDesc(reflect.TypeOf(new(proto3_20160519.Message_ChildMessage))), |
| 151 | want: fileDescP3_20160519.Messages().ByName("Message").Messages().ByName("ChildMessage"), |
| 152 | }, { |
| 153 | got: loadMessageDesc(reflect.TypeOf(new(proto3_20160519.Message))), |
| 154 | want: fileDescP3_20160519.Messages().ByName("Message"), |
| 155 | }}...) |
| 156 | |
| 157 | fileDescP2_20180125 := mustLoadFileDesc(new(proto2_20180125.Message).Descriptor()) |
| 158 | tests = append(tests, []struct{ got, want pref.Descriptor }{{ |
| 159 | got: loadEnumDesc(reflect.TypeOf(proto2_20180125.SiblingEnum(0))), |
| 160 | want: fileDescP2_20180125.Enums().ByName("SiblingEnum"), |
| 161 | }, { |
| 162 | got: loadEnumDesc(reflect.TypeOf(proto2_20180125.Message_ChildEnum(0))), |
| 163 | want: fileDescP2_20180125.Messages().ByName("Message").Enums().ByName("ChildEnum"), |
| 164 | }, { |
| 165 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180125.SiblingMessage))), |
| 166 | want: fileDescP2_20180125.Messages().ByName("SiblingMessage"), |
| 167 | }, { |
| 168 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message_ChildMessage))), |
| 169 | want: fileDescP2_20180125.Messages().ByName("Message").Messages().ByName("ChildMessage"), |
| 170 | }, { |
| 171 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message))), |
| 172 | want: fileDescP2_20180125.Messages().ByName("Message"), |
| 173 | }, { |
| 174 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message_NamedGroup))), |
| 175 | want: fileDescP2_20180125.Messages().ByName("Message").Messages().ByName("NamedGroup"), |
| 176 | }, { |
| 177 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message_OptionalGroup))), |
| 178 | want: fileDescP2_20180125.Messages().ByName("Message").Messages().ByName("OptionalGroup"), |
| 179 | }, { |
| 180 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message_RequiredGroup))), |
| 181 | want: fileDescP2_20180125.Messages().ByName("Message").Messages().ByName("RequiredGroup"), |
| 182 | }, { |
| 183 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message_RepeatedGroup))), |
| 184 | want: fileDescP2_20180125.Messages().ByName("Message").Messages().ByName("RepeatedGroup"), |
| 185 | }, { |
| 186 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message_OneofGroup))), |
| 187 | want: fileDescP2_20180125.Messages().ByName("Message").Messages().ByName("OneofGroup"), |
| 188 | }, { |
| 189 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message_ExtensionOptionalGroup))), |
| 190 | want: fileDescP2_20180125.Messages().ByName("Message").Messages().ByName("ExtensionOptionalGroup"), |
| 191 | }, { |
| 192 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180125.Message_ExtensionRepeatedGroup))), |
| 193 | want: fileDescP2_20180125.Messages().ByName("Message").Messages().ByName("ExtensionRepeatedGroup"), |
| 194 | }}...) |
| 195 | |
| 196 | fileDescP3_20180125 := mustLoadFileDesc(new(proto3_20180125.Message).Descriptor()) |
| 197 | tests = append(tests, []struct{ got, want pref.Descriptor }{{ |
| 198 | got: loadEnumDesc(reflect.TypeOf(proto3_20180125.SiblingEnum(0))), |
| 199 | want: fileDescP3_20180125.Enums().ByName("SiblingEnum"), |
| 200 | }, { |
| 201 | got: loadEnumDesc(reflect.TypeOf(proto3_20180125.Message_ChildEnum(0))), |
| 202 | want: fileDescP3_20180125.Messages().ByName("Message").Enums().ByName("ChildEnum"), |
| 203 | }, { |
| 204 | got: loadMessageDesc(reflect.TypeOf(new(proto3_20180125.SiblingMessage))), |
| 205 | want: fileDescP3_20180125.Messages().ByName("SiblingMessage"), |
| 206 | }, { |
| 207 | got: loadMessageDesc(reflect.TypeOf(new(proto3_20180125.Message_ChildMessage))), |
| 208 | want: fileDescP3_20180125.Messages().ByName("Message").Messages().ByName("ChildMessage"), |
| 209 | }, { |
| 210 | got: loadMessageDesc(reflect.TypeOf(new(proto3_20180125.Message))), |
| 211 | want: fileDescP3_20180125.Messages().ByName("Message"), |
| 212 | }}...) |
| 213 | |
| 214 | fileDescP2_20180430 := mustLoadFileDesc(new(proto2_20180430.Message).Descriptor()) |
| 215 | tests = append(tests, []struct{ got, want pref.Descriptor }{{ |
| 216 | got: loadEnumDesc(reflect.TypeOf(proto2_20180430.SiblingEnum(0))), |
| 217 | want: fileDescP2_20180430.Enums().ByName("SiblingEnum"), |
| 218 | }, { |
| 219 | got: loadEnumDesc(reflect.TypeOf(proto2_20180430.Message_ChildEnum(0))), |
| 220 | want: fileDescP2_20180430.Messages().ByName("Message").Enums().ByName("ChildEnum"), |
| 221 | }, { |
| 222 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180430.SiblingMessage))), |
| 223 | want: fileDescP2_20180430.Messages().ByName("SiblingMessage"), |
| 224 | }, { |
| 225 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message_ChildMessage))), |
| 226 | want: fileDescP2_20180430.Messages().ByName("Message").Messages().ByName("ChildMessage"), |
| 227 | }, { |
| 228 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message))), |
| 229 | want: fileDescP2_20180430.Messages().ByName("Message"), |
| 230 | }, { |
| 231 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message_NamedGroup))), |
| 232 | want: fileDescP2_20180430.Messages().ByName("Message").Messages().ByName("NamedGroup"), |
| 233 | }, { |
| 234 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message_OptionalGroup))), |
| 235 | want: fileDescP2_20180430.Messages().ByName("Message").Messages().ByName("OptionalGroup"), |
| 236 | }, { |
| 237 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message_RequiredGroup))), |
| 238 | want: fileDescP2_20180430.Messages().ByName("Message").Messages().ByName("RequiredGroup"), |
| 239 | }, { |
| 240 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message_RepeatedGroup))), |
| 241 | want: fileDescP2_20180430.Messages().ByName("Message").Messages().ByName("RepeatedGroup"), |
| 242 | }, { |
| 243 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message_OneofGroup))), |
| 244 | want: fileDescP2_20180430.Messages().ByName("Message").Messages().ByName("OneofGroup"), |
| 245 | }, { |
| 246 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message_ExtensionOptionalGroup))), |
| 247 | want: fileDescP2_20180430.Messages().ByName("Message").Messages().ByName("ExtensionOptionalGroup"), |
| 248 | }, { |
| 249 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180430.Message_ExtensionRepeatedGroup))), |
| 250 | want: fileDescP2_20180430.Messages().ByName("Message").Messages().ByName("ExtensionRepeatedGroup"), |
| 251 | }}...) |
| 252 | |
| 253 | fileDescP3_20180430 := mustLoadFileDesc(new(proto3_20180430.Message).Descriptor()) |
| 254 | tests = append(tests, []struct{ got, want pref.Descriptor }{{ |
| 255 | got: loadEnumDesc(reflect.TypeOf(proto3_20180430.SiblingEnum(0))), |
| 256 | want: fileDescP3_20180430.Enums().ByName("SiblingEnum"), |
| 257 | }, { |
| 258 | got: loadEnumDesc(reflect.TypeOf(proto3_20180430.Message_ChildEnum(0))), |
| 259 | want: fileDescP3_20180430.Messages().ByName("Message").Enums().ByName("ChildEnum"), |
| 260 | }, { |
| 261 | got: loadMessageDesc(reflect.TypeOf(new(proto3_20180430.SiblingMessage))), |
| 262 | want: fileDescP3_20180430.Messages().ByName("SiblingMessage"), |
| 263 | }, { |
| 264 | got: loadMessageDesc(reflect.TypeOf(new(proto3_20180430.Message_ChildMessage))), |
| 265 | want: fileDescP3_20180430.Messages().ByName("Message").Messages().ByName("ChildMessage"), |
| 266 | }, { |
| 267 | got: loadMessageDesc(reflect.TypeOf(new(proto3_20180430.Message))), |
| 268 | want: fileDescP3_20180430.Messages().ByName("Message"), |
| 269 | }}...) |
| 270 | |
| 271 | fileDescP2_20180814 := mustLoadFileDesc(new(proto2_20180814.Message).Descriptor()) |
| 272 | tests = append(tests, []struct{ got, want pref.Descriptor }{{ |
| 273 | got: loadEnumDesc(reflect.TypeOf(proto2_20180814.SiblingEnum(0))), |
| 274 | want: fileDescP2_20180814.Enums().ByName("SiblingEnum"), |
| 275 | }, { |
| 276 | got: loadEnumDesc(reflect.TypeOf(proto2_20180814.Message_ChildEnum(0))), |
| 277 | want: fileDescP2_20180814.Messages().ByName("Message").Enums().ByName("ChildEnum"), |
| 278 | }, { |
| 279 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180814.SiblingMessage))), |
| 280 | want: fileDescP2_20180814.Messages().ByName("SiblingMessage"), |
| 281 | }, { |
| 282 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message_ChildMessage))), |
| 283 | want: fileDescP2_20180814.Messages().ByName("Message").Messages().ByName("ChildMessage"), |
| 284 | }, { |
| 285 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message))), |
| 286 | want: fileDescP2_20180814.Messages().ByName("Message"), |
| 287 | }, { |
| 288 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message_NamedGroup))), |
| 289 | want: fileDescP2_20180814.Messages().ByName("Message").Messages().ByName("NamedGroup"), |
| 290 | }, { |
| 291 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message_OptionalGroup))), |
| 292 | want: fileDescP2_20180814.Messages().ByName("Message").Messages().ByName("OptionalGroup"), |
| 293 | }, { |
| 294 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message_RequiredGroup))), |
| 295 | want: fileDescP2_20180814.Messages().ByName("Message").Messages().ByName("RequiredGroup"), |
| 296 | }, { |
| 297 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message_RepeatedGroup))), |
| 298 | want: fileDescP2_20180814.Messages().ByName("Message").Messages().ByName("RepeatedGroup"), |
| 299 | }, { |
| 300 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message_OneofGroup))), |
| 301 | want: fileDescP2_20180814.Messages().ByName("Message").Messages().ByName("OneofGroup"), |
| 302 | }, { |
| 303 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message_ExtensionOptionalGroup))), |
| 304 | want: fileDescP2_20180814.Messages().ByName("Message").Messages().ByName("ExtensionOptionalGroup"), |
| 305 | }, { |
| 306 | got: loadMessageDesc(reflect.TypeOf(new(proto2_20180814.Message_ExtensionRepeatedGroup))), |
| 307 | want: fileDescP2_20180814.Messages().ByName("Message").Messages().ByName("ExtensionRepeatedGroup"), |
| 308 | }}...) |
| 309 | |
| 310 | fileDescP3_20180814 := mustLoadFileDesc(new(proto3_20180814.Message).Descriptor()) |
| 311 | tests = append(tests, []struct{ got, want pref.Descriptor }{{ |
| 312 | got: loadEnumDesc(reflect.TypeOf(proto3_20180814.SiblingEnum(0))), |
| 313 | want: fileDescP3_20180814.Enums().ByName("SiblingEnum"), |
| 314 | }, { |
| 315 | got: loadEnumDesc(reflect.TypeOf(proto3_20180814.Message_ChildEnum(0))), |
| 316 | want: fileDescP3_20180814.Messages().ByName("Message").Enums().ByName("ChildEnum"), |
| 317 | }, { |
| 318 | got: loadMessageDesc(reflect.TypeOf(new(proto3_20180814.SiblingMessage))), |
| 319 | want: fileDescP3_20180814.Messages().ByName("SiblingMessage"), |
| 320 | }, { |
| 321 | got: loadMessageDesc(reflect.TypeOf(new(proto3_20180814.Message_ChildMessage))), |
| 322 | want: fileDescP3_20180814.Messages().ByName("Message").Messages().ByName("ChildMessage"), |
| 323 | }, { |
| 324 | got: loadMessageDesc(reflect.TypeOf(new(proto3_20180814.Message))), |
| 325 | want: fileDescP3_20180814.Messages().ByName("Message"), |
| 326 | }}...) |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 327 | |
| 328 | type list interface { |
| 329 | Len() int |
| 330 | pragma.DoNotImplement |
| 331 | } |
| 332 | opts := cmp.Options{ |
| 333 | cmp.Transformer("", func(x list) []interface{} { |
| 334 | out := make([]interface{}, x.Len()) |
| 335 | v := reflect.ValueOf(x) |
| 336 | for i := 0; i < x.Len(); i++ { |
| 337 | m := v.MethodByName("Get") |
| 338 | out[i] = m.Call([]reflect.Value{reflect.ValueOf(i)})[0].Interface() |
| 339 | } |
| 340 | return out |
| 341 | }), |
| 342 | cmp.Transformer("", func(x pref.Descriptor) map[string]interface{} { |
| 343 | out := make(map[string]interface{}) |
| 344 | v := reflect.ValueOf(x) |
| 345 | for i := 0; i < v.NumMethod(); i++ { |
| 346 | name := v.Type().Method(i).Name |
| 347 | if m := v.Method(i); m.Type().NumIn() == 0 && m.Type().NumOut() == 1 { |
| 348 | switch name { |
| 349 | case "Index": |
| 350 | // Ignore index since legacy descriptors have no parent. |
Damien Neil | 204f1c0 | 2018-10-23 15:03:38 -0700 | [diff] [blame] | 351 | case "Options": |
| 352 | // Ignore descriptor options since protos are not cmperable. |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 353 | case "Enums", "Messages", "Extensions": |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 354 | // Ignore nested message and enum declarations since |
| 355 | // legacy descriptors are all created standalone. |
Joe Tsai | ea11813 | 2018-11-11 17:56:21 -0800 | [diff] [blame^] | 356 | case "OneofType", "ExtendedType", "EnumType", "MessageType": |
Joe Tsai | 90fe996 | 2018-10-18 11:06:29 -0700 | [diff] [blame] | 357 | // Avoid descending into a dependency to avoid a cycle. |
| 358 | // Just record the full name if available. |
| 359 | // |
| 360 | // TODO: Cycle support in cmp would be useful here. |
| 361 | v := m.Call(nil)[0] |
| 362 | if !v.IsNil() { |
| 363 | out[name] = v.Interface().(pref.Descriptor).FullName() |
| 364 | } |
| 365 | default: |
| 366 | out[name] = m.Call(nil)[0].Interface() |
| 367 | } |
| 368 | } |
| 369 | } |
| 370 | return out |
| 371 | }), |
| 372 | cmp.Transformer("", func(v pref.Value) interface{} { |
| 373 | return v.Interface() |
| 374 | }), |
| 375 | } |
| 376 | |
| 377 | for _, tt := range tests { |
| 378 | t.Run(string(tt.want.FullName()), func(t *testing.T) { |
| 379 | if diff := cmp.Diff(&tt.want, &tt.got, opts); diff != "" { |
| 380 | t.Errorf("descriptor mismatch (-want, +got):\n%s", diff) |
| 381 | } |
| 382 | }) |
| 383 | } |
| 384 | } |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 385 | |
Joe Tsai | 95b0290 | 2018-10-31 18:23:42 -0700 | [diff] [blame] | 386 | type legacyUnknownMessage struct { |
| 387 | XXX_unrecognized []byte |
| 388 | protoV1.XXX_InternalExtensions |
| 389 | } |
| 390 | |
| 391 | func (*legacyUnknownMessage) ExtensionRangeArray() []protoV1.ExtensionRange { |
| 392 | return []protoV1.ExtensionRange{{Start: 10, End: 20}, {Start: 40, End: 80}} |
| 393 | } |
| 394 | |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 395 | func TestLegacyUnknown(t *testing.T) { |
| 396 | rawOf := func(toks ...pack.Token) pref.RawFields { |
| 397 | return pref.RawFields(pack.Message(toks).Marshal()) |
| 398 | } |
| 399 | raw1a := rawOf(pack.Tag{1, pack.VarintType}, pack.Svarint(-4321)) // 08c143 |
| 400 | raw1b := rawOf(pack.Tag{1, pack.Fixed32Type}, pack.Uint32(0xdeadbeef)) // 0defbeadde |
| 401 | raw1c := rawOf(pack.Tag{1, pack.Fixed64Type}, pack.Float64(math.Pi)) // 09182d4454fb210940 |
| 402 | raw2a := rawOf(pack.Tag{2, pack.BytesType}, pack.String("hello, world!")) // 120d68656c6c6f2c20776f726c6421 |
| 403 | raw2b := rawOf(pack.Tag{2, pack.VarintType}, pack.Uvarint(1234)) // 10d209 |
| 404 | raw3a := rawOf(pack.Tag{3, pack.StartGroupType}, pack.Tag{3, pack.EndGroupType}) // 1b1c |
| 405 | raw3b := rawOf(pack.Tag{3, pack.BytesType}, pack.Bytes("\xde\xad\xbe\xef")) // 1a04deadbeef |
| 406 | |
Joe Tsai | 95b0290 | 2018-10-31 18:23:42 -0700 | [diff] [blame] | 407 | raw1 := rawOf(pack.Tag{1, pack.BytesType}, pack.Bytes("1")) // 0a0131 |
| 408 | raw3 := rawOf(pack.Tag{3, pack.BytesType}, pack.Bytes("3")) // 1a0133 |
| 409 | raw10 := rawOf(pack.Tag{10, pack.BytesType}, pack.Bytes("10")) // 52023130 - extension |
| 410 | raw15 := rawOf(pack.Tag{15, pack.BytesType}, pack.Bytes("15")) // 7a023135 - extension |
| 411 | raw26 := rawOf(pack.Tag{26, pack.BytesType}, pack.Bytes("26")) // d201023236 |
| 412 | raw32 := rawOf(pack.Tag{32, pack.BytesType}, pack.Bytes("32")) // 8202023332 |
| 413 | raw45 := rawOf(pack.Tag{45, pack.BytesType}, pack.Bytes("45")) // ea02023435 - extension |
| 414 | raw46 := rawOf(pack.Tag{45, pack.BytesType}, pack.Bytes("46")) // ea02023436 - extension |
| 415 | raw47 := rawOf(pack.Tag{45, pack.BytesType}, pack.Bytes("47")) // ea02023437 - extension |
| 416 | raw99 := rawOf(pack.Tag{99, pack.BytesType}, pack.Bytes("99")) // 9a06023939 |
| 417 | |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 418 | joinRaw := func(bs ...pref.RawFields) (out []byte) { |
| 419 | for _, b := range bs { |
| 420 | out = append(out, b...) |
| 421 | } |
| 422 | return out |
| 423 | } |
| 424 | |
Joe Tsai | 95b0290 | 2018-10-31 18:23:42 -0700 | [diff] [blame] | 425 | m := new(legacyUnknownMessage) |
| 426 | fs := new(MessageType).MessageOf(m).UnknownFields() |
| 427 | |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 428 | if got, want := fs.Len(), 0; got != want { |
| 429 | t.Errorf("Len() = %d, want %d", got, want) |
| 430 | } |
Joe Tsai | 95b0290 | 2018-10-31 18:23:42 -0700 | [diff] [blame] | 431 | if got, want := m.XXX_unrecognized, joinRaw(); !bytes.Equal(got, want) { |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 432 | t.Errorf("data mismatch:\ngot: %x\nwant: %x", got, want) |
| 433 | } |
| 434 | |
| 435 | fs.Set(1, raw1a) |
| 436 | fs.Set(1, append(fs.Get(1), raw1b...)) |
| 437 | fs.Set(1, append(fs.Get(1), raw1c...)) |
| 438 | if got, want := fs.Len(), 1; got != want { |
| 439 | t.Errorf("Len() = %d, want %d", got, want) |
| 440 | } |
Joe Tsai | 95b0290 | 2018-10-31 18:23:42 -0700 | [diff] [blame] | 441 | if got, want := m.XXX_unrecognized, joinRaw(raw1a, raw1b, raw1c); !bytes.Equal(got, want) { |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 442 | t.Errorf("data mismatch:\ngot: %x\nwant: %x", got, want) |
| 443 | } |
| 444 | |
| 445 | fs.Set(2, raw2a) |
| 446 | if got, want := fs.Len(), 2; got != want { |
| 447 | t.Errorf("Len() = %d, want %d", got, want) |
| 448 | } |
Joe Tsai | 95b0290 | 2018-10-31 18:23:42 -0700 | [diff] [blame] | 449 | if got, want := m.XXX_unrecognized, joinRaw(raw1a, raw1b, raw1c, raw2a); !bytes.Equal(got, want) { |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 450 | t.Errorf("data mismatch:\ngot: %x\nwant: %x", got, want) |
| 451 | } |
| 452 | |
| 453 | if got, want := fs.Get(1), joinRaw(raw1a, raw1b, raw1c); !bytes.Equal(got, want) { |
| 454 | t.Errorf("Get(%d) = %x, want %x", 1, got, want) |
| 455 | } |
| 456 | if got, want := fs.Get(2), joinRaw(raw2a); !bytes.Equal(got, want) { |
| 457 | t.Errorf("Get(%d) = %x, want %x", 2, got, want) |
| 458 | } |
| 459 | if got, want := fs.Get(3), joinRaw(); !bytes.Equal(got, want) { |
| 460 | t.Errorf("Get(%d) = %x, want %x", 3, got, want) |
| 461 | } |
| 462 | |
| 463 | fs.Set(1, nil) // remove field 1 |
| 464 | if got, want := fs.Len(), 1; got != want { |
| 465 | t.Errorf("Len() = %d, want %d", got, want) |
| 466 | } |
Joe Tsai | 95b0290 | 2018-10-31 18:23:42 -0700 | [diff] [blame] | 467 | if got, want := m.XXX_unrecognized, joinRaw(raw2a); !bytes.Equal(got, want) { |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 468 | t.Errorf("data mismatch:\ngot: %x\nwant: %x", got, want) |
| 469 | } |
| 470 | |
| 471 | // Simulate manual appending of raw field data. |
Joe Tsai | 95b0290 | 2018-10-31 18:23:42 -0700 | [diff] [blame] | 472 | m.XXX_unrecognized = append(m.XXX_unrecognized, joinRaw(raw3a, raw1a, raw1b, raw2b, raw3b, raw1c)...) |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 473 | if got, want := fs.Len(), 3; got != want { |
| 474 | t.Errorf("Len() = %d, want %d", got, want) |
| 475 | } |
| 476 | |
| 477 | // Verify range iteration order. |
| 478 | var i int |
| 479 | want := []struct { |
| 480 | num pref.FieldNumber |
| 481 | raw pref.RawFields |
| 482 | }{ |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 483 | {2, joinRaw(raw2a, raw2b)}, |
Joe Tsai | 2d5a169 | 2018-10-29 02:10:42 -0700 | [diff] [blame] | 484 | {3, joinRaw(raw3a, raw3b)}, |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 485 | {1, joinRaw(raw1a, raw1b, raw1c)}, |
| 486 | } |
| 487 | fs.Range(func(num pref.FieldNumber, raw pref.RawFields) bool { |
| 488 | if i < len(want) { |
| 489 | if num != want[i].num || !bytes.Equal(raw, want[i].raw) { |
| 490 | t.Errorf("Range(%d) = (%d, %x), want (%d, %x)", i, num, raw, want[i].num, want[i].raw) |
| 491 | } |
| 492 | } else { |
| 493 | t.Errorf("unexpected Range iteration: %d", i) |
| 494 | } |
| 495 | i++ |
| 496 | return true |
| 497 | }) |
| 498 | |
| 499 | fs.Set(2, fs.Get(2)) // moves field 2 to the end |
| 500 | if got, want := fs.Len(), 3; got != want { |
| 501 | t.Errorf("Len() = %d, want %d", got, want) |
| 502 | } |
Joe Tsai | 95b0290 | 2018-10-31 18:23:42 -0700 | [diff] [blame] | 503 | if got, want := m.XXX_unrecognized, joinRaw(raw3a, raw1a, raw1b, raw3b, raw1c, raw2a, raw2b); !bytes.Equal(got, want) { |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 504 | t.Errorf("data mismatch:\ngot: %x\nwant: %x", got, want) |
| 505 | } |
| 506 | fs.Set(1, nil) // remove field 1 |
| 507 | if got, want := fs.Len(), 2; got != want { |
| 508 | t.Errorf("Len() = %d, want %d", got, want) |
| 509 | } |
Joe Tsai | 95b0290 | 2018-10-31 18:23:42 -0700 | [diff] [blame] | 510 | if got, want := m.XXX_unrecognized, joinRaw(raw3a, raw3b, raw2a, raw2b); !bytes.Equal(got, want) { |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 511 | t.Errorf("data mismatch:\ngot: %x\nwant: %x", got, want) |
| 512 | } |
| 513 | |
| 514 | // Remove all fields. |
| 515 | fs.Range(func(n pref.FieldNumber, b pref.RawFields) bool { |
| 516 | fs.Set(n, nil) |
| 517 | return true |
| 518 | }) |
| 519 | if got, want := fs.Len(), 0; got != want { |
| 520 | t.Errorf("Len() = %d, want %d", got, want) |
| 521 | } |
Joe Tsai | 95b0290 | 2018-10-31 18:23:42 -0700 | [diff] [blame] | 522 | if got, want := m.XXX_unrecognized, joinRaw(); !bytes.Equal(got, want) { |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 523 | t.Errorf("data mismatch:\ngot: %x\nwant: %x", got, want) |
| 524 | } |
Joe Tsai | 95b0290 | 2018-10-31 18:23:42 -0700 | [diff] [blame] | 525 | |
| 526 | fs.Set(1, raw1) |
| 527 | if got, want := fs.Len(), 1; got != want { |
| 528 | t.Errorf("Len() = %d, want %d", got, want) |
| 529 | } |
| 530 | if got, want := m.XXX_unrecognized, joinRaw(raw1); !bytes.Equal(got, want) { |
| 531 | t.Errorf("data mismatch:\ngot: %x\nwant: %x", got, want) |
| 532 | } |
| 533 | |
| 534 | fs.Set(45, raw45) |
| 535 | fs.Set(10, raw10) // extension |
| 536 | fs.Set(32, raw32) |
| 537 | fs.Set(1, nil) // deletion |
| 538 | fs.Set(26, raw26) |
| 539 | fs.Set(47, raw47) // extension |
| 540 | fs.Set(46, raw46) // extension |
| 541 | if got, want := fs.Len(), 6; got != want { |
| 542 | t.Errorf("Len() = %d, want %d", got, want) |
| 543 | } |
| 544 | if got, want := m.XXX_unrecognized, joinRaw(raw32, raw26); !bytes.Equal(got, want) { |
| 545 | t.Errorf("data mismatch:\ngot: %x\nwant: %x", got, want) |
| 546 | } |
| 547 | |
| 548 | // Verify iteration order. |
| 549 | i = 0 |
| 550 | want = []struct { |
| 551 | num pref.FieldNumber |
| 552 | raw pref.RawFields |
| 553 | }{ |
| 554 | {32, raw32}, |
| 555 | {26, raw26}, |
| 556 | {10, raw10}, // extension |
| 557 | {45, raw45}, // extension |
| 558 | {46, raw46}, // extension |
| 559 | {47, raw47}, // extension |
| 560 | } |
| 561 | fs.Range(func(num pref.FieldNumber, raw pref.RawFields) bool { |
| 562 | if i < len(want) { |
| 563 | if num != want[i].num || !bytes.Equal(raw, want[i].raw) { |
| 564 | t.Errorf("Range(%d) = (%d, %x), want (%d, %x)", i, num, raw, want[i].num, want[i].raw) |
| 565 | } |
| 566 | } else { |
| 567 | t.Errorf("unexpected Range iteration: %d", i) |
| 568 | } |
| 569 | i++ |
| 570 | return true |
| 571 | }) |
| 572 | |
| 573 | // Perform partial deletion while iterating. |
| 574 | i = 0 |
| 575 | fs.Range(func(num pref.FieldNumber, raw pref.RawFields) bool { |
| 576 | if i%2 == 0 { |
| 577 | fs.Set(num, nil) |
| 578 | } |
| 579 | i++ |
| 580 | return true |
| 581 | }) |
| 582 | |
| 583 | if got, want := fs.Len(), 3; got != want { |
| 584 | t.Errorf("Len() = %d, want %d", got, want) |
| 585 | } |
| 586 | if got, want := m.XXX_unrecognized, joinRaw(raw26); !bytes.Equal(got, want) { |
| 587 | t.Errorf("data mismatch:\ngot: %x\nwant: %x", got, want) |
| 588 | } |
| 589 | |
| 590 | fs.Set(15, raw15) // extension |
| 591 | fs.Set(3, raw3) |
| 592 | fs.Set(99, raw99) |
| 593 | if got, want := fs.Len(), 6; got != want { |
| 594 | t.Errorf("Len() = %d, want %d", got, want) |
| 595 | } |
| 596 | if got, want := m.XXX_unrecognized, joinRaw(raw26, raw3, raw99); !bytes.Equal(got, want) { |
| 597 | t.Errorf("data mismatch:\ngot: %x\nwant: %x", got, want) |
| 598 | } |
| 599 | |
| 600 | // Perform partial iteration. |
| 601 | i = 0 |
| 602 | want = []struct { |
| 603 | num pref.FieldNumber |
| 604 | raw pref.RawFields |
| 605 | }{ |
| 606 | {26, raw26}, |
| 607 | {3, raw3}, |
| 608 | } |
| 609 | fs.Range(func(num pref.FieldNumber, raw pref.RawFields) bool { |
| 610 | if i < len(want) { |
| 611 | if num != want[i].num || !bytes.Equal(raw, want[i].raw) { |
| 612 | t.Errorf("Range(%d) = (%d, %x), want (%d, %x)", i, num, raw, want[i].num, want[i].raw) |
| 613 | } |
| 614 | } else { |
| 615 | t.Errorf("unexpected Range iteration: %d", i) |
| 616 | } |
| 617 | i++ |
| 618 | return i < 2 |
| 619 | }) |
Joe Tsai | e2afdc2 | 2018-10-25 14:06:56 -0700 | [diff] [blame] | 620 | } |