@@ -66,14 +66,14 @@ func fromHex(h string) []byte {
66
66
}
67
67
68
68
var validHeaders = map [string ]TNSHeader {
69
- "00 08 00 01 02 03 00 45" : TNSHeader {
69
+ "00 08 00 01 02 03 00 45" : {
70
70
Length : 8 ,
71
71
PacketChecksum : 1 ,
72
72
Type : 2 ,
73
73
Flags : 3 ,
74
74
HeaderChecksum : 0x45 ,
75
75
},
76
- "f2 1e 01 00 07 06 76 54" : TNSHeader {
76
+ "f2 1e 01 00 07 06 76 54" : {
77
77
Length : 0xF21E ,
78
78
PacketChecksum : 0x0100 ,
79
79
Type : 0x07 ,
@@ -95,7 +95,7 @@ func orPanic(ret []byte, err error) []byte {
95
95
}
96
96
97
97
var validTNSData = map [string ]TestCase {
98
- "00.empty" : TestCase {
98
+ "00.empty" : {
99
99
Encoding : "00 0A 00 00 06 00 00 00 80 00" ,
100
100
Value : & TNSPacket {
101
101
Header : & TNSHeader {
@@ -111,7 +111,7 @@ var validTNSData = map[string]TestCase{
111
111
},
112
112
},
113
113
},
114
- "00.trivial" : TestCase {
114
+ "00.trivial" : {
115
115
Encoding : "00 10 00 00 06 00 00 00 00 01 31 32 33 34 35 36" ,
116
116
Value : & TNSPacket {
117
117
Header : & TNSHeader {
@@ -127,7 +127,7 @@ var validTNSData = map[string]TestCase{
127
127
},
128
128
},
129
129
},
130
- "01.NSN.Request" : TestCase {
130
+ "01.NSN.Request" : {
131
131
Encoding : "00 a8 00 00 06 00 00 00 00 00 de ad be ef 00 9e " + /* ................ */
132
132
"0a 20 03 00 00 04 00 00 04 00 03 00 00 00 00 00 " + /* . .............. */
133
133
"04 00 05 0a 20 03 00 00 08 00 01 00 00 04 ec 19 " + /* .... ........... */
@@ -154,7 +154,7 @@ var validTNSData = map[string]TestCase{
154
154
Version : encodeReleaseVersion ("10.2.0.3.0" ),
155
155
Options : NSNOptions (0 ),
156
156
Services : []NSNService {
157
- NSNService {
157
+ {
158
158
Type : 4 ,
159
159
Values : []NSNValue {
160
160
* NSNValueVersion ("10.2.0.3.0" ),
@@ -163,45 +163,45 @@ var validTNSData = map[string]TestCase{
163
163
},
164
164
Marker : 0 ,
165
165
},
166
- NSNService {
166
+ {
167
167
Type : 1 ,
168
168
Values : []NSNValue {
169
169
* NSNValueVersion ("10.2.0.3.0" ),
170
- NSNValue {
170
+ {
171
171
Type : 3 ,
172
172
Value : fromHex ("e0 e1" ),
173
173
},
174
- NSNValue {
174
+ {
175
175
Type : 6 ,
176
176
Value : fromHex ("fc ff" ),
177
177
},
178
- NSNValue {
178
+ {
179
179
Type : 2 ,
180
180
Value : fromHex ("01" ),
181
181
},
182
- NSNValue {
182
+ {
183
183
Type : 0 ,
184
184
Value : []byte ("NTS" ),
185
185
},
186
186
},
187
187
Marker : 0 ,
188
188
},
189
- NSNService {
189
+ {
190
190
Type : 2 ,
191
191
Values : []NSNValue {
192
192
* NSNValueVersion ("10.2.0.3.0" ),
193
- NSNValue {
193
+ {
194
194
Type : 1 ,
195
195
Value : fromHex ("00 11 06 10 0c 0f 0a 0b 08 02 01 03" ),
196
196
},
197
197
},
198
198
Marker : 0 ,
199
199
},
200
- NSNService {
200
+ {
201
201
Type : 3 ,
202
202
Values : []NSNValue {
203
203
* NSNValueVersion ("10.2.0.3.0" ),
204
- NSNValue {
204
+ {
205
205
Type : 1 ,
206
206
Value : fromHex ("00 03 01" ),
207
207
},
@@ -215,7 +215,7 @@ var validTNSData = map[string]TestCase{
215
215
}
216
216
217
217
var validTNSConnect = map [string ]TestCase {
218
- "01. 013A-0139" : TestCase {
218
+ "01. 013A-0139" : {
219
219
Encoding : "00 ca 00 00 01 00 00 00 01 3a 01 2c 0c 41 20 00 " + /* .........:.,.A . */
220
220
"ff ff 7f 08 00 00 01 00 00 90 00 3a 00 00 08 00 " + /* ...........:.... */
221
221
"41 41 00 00 00 00 00 00 00 00 00 00 00 00 00 00 " + /* AA.............. */
@@ -254,7 +254,7 @@ var validTNSConnect = map[string]TestCase{
254
254
},
255
255
},
256
256
},
257
- "02. 138-138" : TestCase {
257
+ "02. 138-138" : {
258
258
Encoding : "01 00 00 00 01 04 00 00 01 38 01 2c 00 00 08 00 " + /* .........8.,.... */
259
259
"7f ff 86 0e 00 00 01 00 00 c6 00 3a 00 00 02 00 " + /* ...........:.... */
260
260
"61 61 00 00 00 00 00 00 00 00 00 00 04 10 00 00 " + /* aa.............. */
@@ -296,7 +296,7 @@ var validTNSConnect = map[string]TestCase{
296
296
},
297
297
},
298
298
},
299
- "03. 138-138" : TestCase {
299
+ "03. 138-138" : {
300
300
Encoding : "00 ec 00 00 01 04 00 00 01 38 01 2c 00 00 08 00 " + /* .........8.,.... */
301
301
"7f ff 86 0e 00 00 01 00 00 b2 00 3a 00 00 02 00 " + /* ...........:.... */
302
302
"61 61 00 00 00 00 00 00 00 00 00 00 10 ec 00 00 " + /* aa.............. */
@@ -337,7 +337,7 @@ var validTNSConnect = map[string]TestCase{
337
337
},
338
338
},
339
339
},
340
- "unknown" : TestCase {
340
+ "unknown" : {
341
341
Encoding : "00 d7 00 00 01 00 00 00 01 3b 01 2c 0c 41 20 00 " + /* .........;.,.A . */
342
342
"ff ff 7f 08 00 00 01 00 00 91 00 46 00 00 08 00 " + /* ...........F.... */
343
343
"41 41 00 00 00 00 00 00 00 00 00 00 00 00 00 00 " + /* AA.............. */
@@ -377,7 +377,7 @@ var validTNSConnect = map[string]TestCase{
377
377
},
378
378
},
379
379
},
380
- "unknown3a" : TestCase {
380
+ "unknown3a" : {
381
381
Encoding : "00 d7 00 00 01 00 00 00 01 3b 01 2c 0c 41 20 00 " + /* .........;.,.A . */
382
382
"ff ff 7f 08 00 00 01 00 00 91 00 46 00 00 08 00 " + /* ...........F.... */
383
383
"41 41 00 00 00 00 00 00 00 00 00 00 00 00 00 00 " + /* AA.............. */
@@ -420,7 +420,7 @@ var validTNSConnect = map[string]TestCase{
420
420
}
421
421
422
422
var validTNSAccept = map [string ]TestCase {
423
- "01. 013A-0139" : TestCase {
423
+ "01. 013A-0139" : {
424
424
Encoding : "00 20 00 00 02 00 00 00 01 39 00 00 08 00 7f ff " + /* . .......9...... */
425
425
"01 00 00 00 00 20 61 61 00 00 00 00 00 00 00 00 " , /* ..... aa........ */
426
426
Value : & TNSPacket {
@@ -587,7 +587,7 @@ func TestTNSData(t *testing.T) {
587
587
588
588
var descriptorValues = map [string ]Descriptor {
589
589
//"()": Descriptor{},
590
- "(DESCRIPTION=(ERR=1153)(VSNNUM=186647040)(ERROR_STACK=(ERROR=(CODE=1153)(EMFI=4)(ARGS='()'))(ERROR=(CODE=303)(EMFI=1))))" : Descriptor {
590
+ "(DESCRIPTION=(ERR=1153)(VSNNUM=186647040)(ERROR_STACK=(ERROR=(CODE=1153)(EMFI=4)(ARGS='()'))(ERROR=(CODE=303)(EMFI=1))))" : {
591
591
DescriptorEntry {"DESCRIPTION.ERR" , "1153" },
592
592
DescriptorEntry {"DESCRIPTION.VSNNUM" , "186647040" },
593
593
DescriptorEntry {"DESCRIPTION.ERROR_STACK.ERROR.CODE" , "1153" },
@@ -596,7 +596,7 @@ var descriptorValues = map[string]Descriptor{
596
596
DescriptorEntry {"DESCRIPTION.ERROR_STACK.ERROR.CODE" , "303" },
597
597
DescriptorEntry {"DESCRIPTION.ERROR_STACK.ERROR.EMFI" , "1" },
598
598
},
599
- "(DESCRIPTION=\n \t (ERR=1153)\n \t (VSNNUM=186647040)\n \t (ERROR_STACK=\n \t \t (ERROR=(CODE=1153)(EMFI=4)(ARGS='()'))\n \t \t (ERROR=(CODE=303)(EMFI=1))\n \t )\n )\n " : Descriptor {
599
+ "(DESCRIPTION=\n \t (ERR=1153)\n \t (VSNNUM=186647040)\n \t (ERROR_STACK=\n \t \t (ERROR=(CODE=1153)(EMFI=4)(ARGS='()'))\n \t \t (ERROR=(CODE=303)(EMFI=1))\n \t )\n )\n " : {
600
600
DescriptorEntry {"DESCRIPTION.ERR" , "1153" },
601
601
DescriptorEntry {"DESCRIPTION.VSNNUM" , "186647040" },
602
602
DescriptorEntry {"DESCRIPTION.ERROR_STACK.ERROR.CODE" , "1153" },
@@ -605,7 +605,7 @@ var descriptorValues = map[string]Descriptor{
605
605
DescriptorEntry {"DESCRIPTION.ERROR_STACK.ERROR.CODE" , "303" },
606
606
DescriptorEntry {"DESCRIPTION.ERROR_STACK.ERROR.EMFI" , "1" },
607
607
},
608
- " (DESCRIPTION=\r \n (ERR=1153)\r \n (VSNNUM=186647040)\r \n (ERROR_STACK=\r \n (ERROR=(CODE=1153)(EMFI=4)(ARGS='()'))\r \n (ERROR=(CODE=303)(EMFI=1))\r \n )\r \n ) " : Descriptor {
608
+ " (DESCRIPTION=\r \n (ERR=1153)\r \n (VSNNUM=186647040)\r \n (ERROR_STACK=\r \n (ERROR=(CODE=1153)(EMFI=4)(ARGS='()'))\r \n (ERROR=(CODE=303)(EMFI=1))\r \n )\r \n ) " : {
609
609
DescriptorEntry {"DESCRIPTION.ERR" , "1153" },
610
610
DescriptorEntry {"DESCRIPTION.VSNNUM" , "186647040" },
611
611
DescriptorEntry {"DESCRIPTION.ERROR_STACK.ERROR.CODE" , "1153" },
@@ -614,7 +614,7 @@ var descriptorValues = map[string]Descriptor{
614
614
DescriptorEntry {"DESCRIPTION.ERROR_STACK.ERROR.CODE" , "303" },
615
615
DescriptorEntry {"DESCRIPTION.ERROR_STACK.ERROR.EMFI" , "1" },
616
616
},
617
- "(DESCRIPTION=(ERR=1153)(VSNNUM=186647040)(ERROR_STACK=(ERROR=(CODE=1153)(EMFI=4)(ARGS='(embedded \\ 'quotes\\ ')'))(ERROR=(CODE= \" (23) \" )(EMFI=1))))" : Descriptor {
617
+ "(DESCRIPTION=(ERR=1153)(VSNNUM=186647040)(ERROR_STACK=(ERROR=(CODE=1153)(EMFI=4)(ARGS='(embedded \\ 'quotes\\ ')'))(ERROR=(CODE= \" (23) \" )(EMFI=1))))" : {
618
618
DescriptorEntry {"DESCRIPTION.ERR" , "1153" },
619
619
DescriptorEntry {"DESCRIPTION.VSNNUM" , "186647040" },
620
620
DescriptorEntry {"DESCRIPTION.ERROR_STACK.ERROR.CODE" , "1153" },
@@ -623,7 +623,7 @@ var descriptorValues = map[string]Descriptor{
623
623
DescriptorEntry {"DESCRIPTION.ERROR_STACK.ERROR.CODE" , "\" (23) \" " },
624
624
DescriptorEntry {"DESCRIPTION.ERROR_STACK.ERROR.EMFI" , "1" },
625
625
},
626
- "(DESCRIPTION=(CONNECT_DATA=(SERVICE_NAME=)(CID=(PROGRAM=C:\\ Users\\ localadmin\\ work\\ oracle\\ instantclient_11_2\\ sqlplus.exe)(HOST=win10pc)(USER=localadmin)))(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521)))" : Descriptor {
626
+ "(DESCRIPTION=(CONNECT_DATA=(SERVICE_NAME=)(CID=(PROGRAM=C:\\ Users\\ localadmin\\ work\\ oracle\\ instantclient_11_2\\ sqlplus.exe)(HOST=win10pc)(USER=localadmin)))(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=1521)))" : {
627
627
DescriptorEntry {"DESCRIPTION.CONNECT_DATA.SERVICE_NAME" , "" },
628
628
DescriptorEntry {"DESCRIPTION.CONNECT_DATA.CID.PROGRAM" , "C:\\ Users\\ localadmin\\ work\\ oracle\\ instantclient_11_2\\ sqlplus.exe" },
629
629
DescriptorEntry {"DESCRIPTION.CONNECT_DATA.CID.HOST" , "win10pc" },
@@ -635,20 +635,20 @@ var descriptorValues = map[string]Descriptor{
635
635
}
636
636
637
637
var descriptorGetValuesTests = map [string ]map [string ][]string {
638
- "(A=(B=(C=ABC1)(C=ABC2)(D=ABD))(E=AE)(F=))" : map [ string ][] string {
639
- "A.B.C" : [] string {"ABC1" , "ABC2" },
640
- "A.B.D" : [] string {"ABD" },
641
- "A.E" : [] string {"AE" },
642
- "does.not.exist" : [] string {},
643
- "A.F" : [] string {"" },
638
+ "(A=(B=(C=ABC1)(C=ABC2)(D=ABD))(E=AE)(F=))" : {
639
+ "A.B.C" : {"ABC1" , "ABC2" },
640
+ "A.B.D" : {"ABD" },
641
+ "A.E" : {"AE" },
642
+ "does.not.exist" : {},
643
+ "A.F" : {"" },
644
644
},
645
- "(A=(B=(C=ABC1)(D=ABD1))(B=(C=ABC2)(D=ABD2))(B=(E=ABE)(D=ABD3))(F=(G=(H=AFGH)))(I=)(I=iii)(I=)(I=))" : map [ string ][] string {
646
- "A.B.C" : [] string {"ABC1" , "ABC2" },
647
- "A.B.D" : [] string {"ABD1" , "ABD2" , "ABD3" },
648
- "A.B.E" : [] string {"ABE" },
649
- "A.F.G.H" : [] string {"AFGH" },
650
- "does.not.exist" : [] string {},
651
- "A.I" : [] string {"" , "iii" , "" , "" },
645
+ "(A=(B=(C=ABC1)(D=ABD1))(B=(C=ABC2)(D=ABD2))(B=(E=ABE)(D=ABD3))(F=(G=(H=AFGH)))(I=)(I=iii)(I=)(I=))" : {
646
+ "A.B.C" : {"ABC1" , "ABC2" },
647
+ "A.B.D" : {"ABD1" , "ABD2" , "ABD3" },
648
+ "A.B.E" : {"ABE" },
649
+ "A.F.G.H" : {"AFGH" },
650
+ "does.not.exist" : {},
651
+ "A.I" : {"" , "iii" , "" , "" },
652
652
},
653
653
}
654
654
@@ -673,14 +673,14 @@ type GetValueTestResult struct {
673
673
}
674
674
675
675
var descriptorGetValueTests = map [string ]map [string ]GetValueTestResult {
676
- "(A=(B=(C=ABC1)(C=ABC2)(D=ABD))(E=AE)(F=))" : map [ string ] GetValueTestResult {
676
+ "(A=(B=(C=ABC1)(C=ABC2)(D=ABD))(E=AE)(F=))" : {
677
677
"A.B.C" : {Value : "" , Error : ErrUnexpectedResponse },
678
678
"A.B.D" : {Value : "ABD" , Error : nil },
679
679
"A.E" : {Value : "AE" , Error : nil },
680
680
"does.not.exist" : {Value : "" , Error : ErrUnexpectedResponse },
681
681
"A.F" : {Value : "" , Error : nil },
682
682
},
683
- "(A=(B=(C=ABC1)(D=ABD1))(B=(C=ABC2)(D=ABD2))(B=(E=ABE)(D=ABD3))(F=(G=(H=AFGH)))(I=)(I=))" : map [ string ] GetValueTestResult {
683
+ "(A=(B=(C=ABC1)(D=ABD1))(B=(C=ABC2)(D=ABD2))(B=(E=ABE)(D=ABD3))(F=(G=(H=AFGH)))(I=)(I=))" : {
684
684
"A.B.C" : {Value : "" , Error : ErrUnexpectedResponse },
685
685
"A.B.D" : {Value : "" , Error : ErrUnexpectedResponse },
686
686
"A.B.E" : {Value : "ABE" , Error : nil },
0 commit comments