Skip to content

Commit abdc9d3

Browse files
mjpt777mjpt777
authored
Merge pull request #563 from billsegall/Issue560.golang
Issue560 preparation. Add test case, fix golang format strings.
2 parents dd9f6d4 + 6317892 commit abdc9d3

File tree

21 files changed

+216
-129
lines changed

21 files changed

+216
-129
lines changed

‎build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,7 @@ task generateGolangCodecsWithXSD(type: JavaExec) {
613613
'sbe-tool/src/test/resources/issue472.xml',
614614
'sbe-tool/src/test/resources/issue483.xml',
615615
'sbe-tool/src/test/resources/issue488.xml',
616+
'sbe-tool/src/test/resources/issue560.xml',
616617
'sbe-tool/src/test/resources/since-deprecated-test-schema.xml',
617618
'sbe-tool/src/test/resources/example-bigendian-test-schema.xml',
618619
'gocode/resources/example-composite.xml',

‎gocode/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ test: $(DEP)
6868
go install \
6969
;done))
7070
(export GOPATH=$(GOPATH) && \
71-
(for t in baseline-bigendian mktdata group_with_data group_with_data_extension composite_elements composite since-deprecated simple issue435 issue472 issue483 issue488; do \
71+
(for t in baseline-bigendian mktdata group_with_data group_with_data_extension composite_elements composite since-deprecated simple issue435 issue472 issue483 issue488 issue560; do \
7272
cd $(GOPATH)/src/$$t && \
7373
go build && \
7474
go fmt && \

‎gocode/src/baseline-bigendian/Car_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,61 +49,61 @@ func TestEncodeDecodeCar(t *testing.T) {
4949

5050
var buf = new(bytes.Buffer)
5151
if err := in.Encode(m, buf, true); err != nil {
52-
t.Logf("Encoding Error", err)
52+
t.Log("Encoding Error", err)
5353
t.Fail()
5454
}
5555

5656
var out Car = *new(Car)
5757
if err := out.Decode(m, buf, in.SbeSchemaVersion(), in.SbeBlockLength(), true); err != nil {
58-
t.Logf("Decoding Error", err)
58+
t.Log("Decoding Error", err)
5959
t.Fail()
6060
}
6161

6262
if in.SerialNumber != out.SerialNumber {
63-
t.Logf("in.SerialNumber != out.SerialNumber:\n", in.SerialNumber, out.SerialNumber)
63+
t.Log("in.SerialNumber != out.SerialNumber:\n", in.SerialNumber, out.SerialNumber)
6464
t.Fail()
6565
}
6666
if in.ModelYear != out.ModelYear {
67-
t.Logf("in.ModelYear != out.ModelYear:\n", in.ModelYear, out.ModelYear)
67+
t.Log("in.ModelYear != out.ModelYear:\n", in.ModelYear, out.ModelYear)
6868
t.Fail()
6969
}
7070
if in.Available != out.Available {
71-
t.Logf("in.Available != out.Available:\n", in.Available, out.Available)
71+
t.Log("in.Available != out.Available:\n", in.Available, out.Available)
7272
t.Fail()
7373
}
7474
if in.Code != out.Code {
75-
t.Logf("in.Code != out.Code:\n", in.Code, out.Code)
75+
t.Log("in.Code != out.Code:\n", in.Code, out.Code)
7676
t.Fail()
7777
}
7878
if in.SomeNumbers != out.SomeNumbers {
79-
t.Logf("in.SomeNumbers != out.SomeNumbers:\n", in.SomeNumbers, out.SomeNumbers)
79+
t.Log("in.SomeNumbers != out.SomeNumbers:\n", in.SomeNumbers, out.SomeNumbers)
8080
t.Fail()
8181
}
8282
if in.VehicleCode != out.VehicleCode {
83-
t.Logf("in.VehicleCode != out.VehicleCode:\n", in.VehicleCode, out.VehicleCode)
83+
t.Log("in.VehicleCode != out.VehicleCode:\n", in.VehicleCode, out.VehicleCode)
8484
t.Fail()
8585
}
8686
if in.Extras != out.Extras {
87-
t.Logf("in.Extras != out.Extras:\n", in.Extras, out.Extras)
87+
t.Log("in.Extras != out.Extras:\n", in.Extras, out.Extras)
8888
t.Fail()
8989
}
9090

9191
// DiscountedModel is constant
9292
if Model.C != out.DiscountedModel {
93-
t.Logf("in.DiscountedModel != out.DiscountedModel:\n", in.DiscountedModel, out.DiscountedModel)
93+
t.Log("in.DiscountedModel != out.DiscountedModel:\n", in.DiscountedModel, out.DiscountedModel)
9494
t.Fail()
9595
}
9696

9797
// Engine has two constant values which should come back filled in
9898
if in.Engine == out.Engine {
99-
t.Logf("in.Engine == out.Engine (and they should be different):\n", in.Engine, out.Engine)
99+
t.Log("in.Engine == out.Engine (and they should be different):\n", in.Engine, out.Engine)
100100
t.Fail()
101101
}
102102

103103
copy(in.Engine.Fuel[:], "Petrol")
104104
in.Engine.MaxRpm = 9000
105105
if in.Engine != out.Engine {
106-
t.Logf("in.Engine != out.Engine:\n", in.Engine, out.Engine)
106+
t.Log("in.Engine != out.Engine:\n", in.Engine, out.Engine)
107107
t.Fail()
108108
}
109109

@@ -124,7 +124,7 @@ func TestDecodeJavaBuffer(t *testing.T) {
124124

125125
var hdr SbeGoMessageHeader
126126
if err := hdr.Decode(m, buf); err != nil {
127-
t.Logf("Failed to decode message header", err)
127+
t.Log("Failed to decode message header", err)
128128
t.Fail()
129129
}
130130

@@ -135,7 +135,7 @@ func TestDecodeJavaBuffer(t *testing.T) {
135135
// fmt.Println("bytes: ", buf.Len())
136136
var c Car
137137
if err := c.Decode(m, buf, hdr.Version, hdr.BlockLength, true); err != nil {
138-
t.Logf("Failed to decode car", err)
138+
t.Log("Failed to decode car", err)
139139
t.Fail()
140140
}
141141
// fmt.Println(c)

‎gocode/src/baseline/Car_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,61 +49,61 @@ func TestEncodeDecodeCar(t *testing.T) {
4949

5050
var buf = new(bytes.Buffer)
5151
if err := in.Encode(m, buf, true); err != nil {
52-
t.Logf("Encoding Error", err)
52+
t.Log("Encoding Error", err)
5353
t.Fail()
5454
}
5555

5656
var out Car = *new(Car)
5757
if err := out.Decode(m, buf, in.SbeSchemaVersion(), in.SbeBlockLength(), true); err != nil {
58-
t.Logf("Decoding Error", err)
58+
t.Log("Decoding Error", err)
5959
t.Fail()
6060
}
6161

6262
if in.SerialNumber != out.SerialNumber {
63-
t.Logf("in.SerialNumber != out.SerialNumber:\n", in.SerialNumber, out.SerialNumber)
63+
t.Log("in.SerialNumber != out.SerialNumber:\n", in.SerialNumber, out.SerialNumber)
6464
t.Fail()
6565
}
6666
if in.ModelYear != out.ModelYear {
67-
t.Logf("in.ModelYear != out.ModelYear:\n", in.ModelYear, out.ModelYear)
67+
t.Log("in.ModelYear != out.ModelYear:\n", in.ModelYear, out.ModelYear)
6868
t.Fail()
6969
}
7070
if in.Available != out.Available {
71-
t.Logf("in.Available != out.Available:\n", in.Available, out.Available)
71+
t.Log("in.Available != out.Available:\n", in.Available, out.Available)
7272
t.Fail()
7373
}
7474
if in.Code != out.Code {
75-
t.Logf("in.Code != out.Code:\n", in.Code, out.Code)
75+
t.Log("in.Code != out.Code:\n", in.Code, out.Code)
7676
t.Fail()
7777
}
7878
if in.SomeNumbers != out.SomeNumbers {
79-
t.Logf("in.SomeNumbers != out.SomeNumbers:\n", in.SomeNumbers, out.SomeNumbers)
79+
t.Log("in.SomeNumbers != out.SomeNumbers:\n", in.SomeNumbers, out.SomeNumbers)
8080
t.Fail()
8181
}
8282
if in.VehicleCode != out.VehicleCode {
83-
t.Logf("in.VehicleCode != out.VehicleCode:\n", in.VehicleCode, out.VehicleCode)
83+
t.Log("in.VehicleCode != out.VehicleCode:\n", in.VehicleCode, out.VehicleCode)
8484
t.Fail()
8585
}
8686
if in.Extras != out.Extras {
87-
t.Logf("in.Extras != out.Extras:\n", in.Extras, out.Extras)
87+
t.Log("in.Extras != out.Extras:\n", in.Extras, out.Extras)
8888
t.Fail()
8989
}
9090

9191
// DiscountedModel is constant
9292
if Model.C != out.DiscountedModel {
93-
t.Logf("in.DiscountedModel != out.DiscountedModel:\n", in.DiscountedModel, out.DiscountedModel)
93+
t.Log("in.DiscountedModel != out.DiscountedModel:\n", in.DiscountedModel, out.DiscountedModel)
9494
t.Fail()
9595
}
9696

9797
// Engine has two constant values which should come back filled in
9898
if in.Engine == out.Engine {
99-
t.Logf("in.Engine == out.Engine (and they should be different):\n", in.Engine, out.Engine)
99+
t.Log("in.Engine == out.Engine (and they should be different):\n", in.Engine, out.Engine)
100100
t.Fail()
101101
}
102102

103103
copy(in.Engine.Fuel[:], "Petrol")
104104
in.Engine.MaxRpm = 9000
105105
if in.Engine != out.Engine {
106-
t.Logf("in.Engine != out.Engine:\n", in.Engine, out.Engine)
106+
t.Log("in.Engine != out.Engine:\n", in.Engine, out.Engine)
107107
t.Fail()
108108
}
109109

@@ -122,7 +122,7 @@ func TestDecodeJavaBuffer(t *testing.T) {
122122

123123
var hdr SbeGoMessageHeader
124124
if err := hdr.Decode(m, buf); err != nil {
125-
t.Logf("Failed to decode message header", err)
125+
t.Log("Failed to decode message header", err)
126126
t.Fail()
127127
}
128128

@@ -133,7 +133,7 @@ func TestDecodeJavaBuffer(t *testing.T) {
133133
// fmt.Println("bytes: ", buf.Len())
134134
var c Car
135135
if err := c.Decode(m, buf, hdr.Version, hdr.BlockLength, true); err != nil {
136-
t.Logf("Failed to decode car", err)
136+
t.Log("Failed to decode car", err)
137137
t.Fail()
138138
}
139139
// fmt.Println(c)

‎gocode/src/basic/SBE tests/ENUM_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ func TestEncodeDecodeEnum(t *testing.T) {
1313
var in ENUMEnum = ENUM.Value10
1414
var buf = new(bytes.Buffer)
1515
if err := in.Encode(m, buf); err != nil {
16-
t.Logf("Encoding Error", err)
16+
t.Log("Encoding Error", err)
1717
t.Fail()
1818
}
1919

2020
var out ENUMEnum = *new(ENUMEnum)
2121
if err := out.Decode(m, buf, 0); err != nil {
22-
t.Logf("Decoding Error", err)
22+
t.Log("Decoding Error", err)
2323
t.Fail()
2424
}
2525

2626
if in != out {
27-
t.Logf("in != out:\n", in, out)
27+
t.Log("in != out:\n", in, out)
2828
t.Fail()
2929
}
3030

@@ -40,58 +40,58 @@ func TestEnumRange(t *testing.T) {
4040

4141
// newer version should be ok
4242
if err := in.RangeCheck(1, 0); err != nil {
43-
t.Logf("RangeCheck failed and should have passed", err)
43+
t.Log("RangeCheck failed and should have passed", err)
4444
t.Fail()
4545
}
4646

4747
// same version should fail
4848
if err := in.RangeCheck(0, 0); err == nil {
49-
t.Logf("RangeCheck passed and should have failed", err)
49+
t.Log("RangeCheck passed and should have failed", err)
5050
t.Fail()
5151
}
5252

5353
// older version should fail
5454
if err := in.RangeCheck(0, 1); err == nil {
55-
t.Logf("RangeCheck passed and should have failed", err)
55+
t.Log("RangeCheck passed and should have failed", err)
5656
t.Fail()
5757
}
5858

5959
// Now let's encode and decode that (no rangecheck performed)
6060
// valie in the message
6161
var buf = new(bytes.Buffer)
6262
if err := in.Encode(m, buf); err != nil {
63-
t.Logf("Encoding Error", err)
63+
t.Log("Encoding Error", err)
6464
t.Fail()
6565
}
6666

6767
var out ENUMEnum = *new(ENUMEnum)
6868
if err := out.Decode(m, buf, 0); err != nil {
69-
t.Logf("Decoding Error", err)
69+
t.Log("Decoding Error", err)
7070
t.Fail()
7171
}
7272

7373
// Values should the be the same
7474
if in != out {
75-
t.Logf("in != out:\n", in, out)
75+
t.Log("in != out:\n", in, out)
7676
t.Fail()
7777
}
7878

7979
// But a rangeheck might fail
8080
// newer version should be ok
8181
if err := out.RangeCheck(1, 0); err != nil {
82-
t.Logf("RangeCheck failed and should have passed", err)
82+
t.Log("RangeCheck failed and should have passed", err)
8383
t.Fail()
8484
}
8585

8686
// same version should fail
8787
if err := out.RangeCheck(0, 0); err == nil {
88-
t.Logf("RangeCheck passed and should have failed", err)
88+
t.Log("RangeCheck passed and should have failed", err)
8989
t.Fail()
9090
}
9191

9292
// older version should fail
9393
if err := out.RangeCheck(0, 1); err == nil {
94-
t.Logf("RangeCheck passed and should have failed", err)
94+
t.Log("RangeCheck passed and should have failed", err)
9595
t.Fail()
9696
}
9797
return

‎gocode/src/basic/SBE tests/Message1_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,55 +15,55 @@ func TestEncodeDecodeMessage1(t *testing.T) {
1515

1616
var buf = new(bytes.Buffer)
1717
if err := in.Encode(m, buf, true); err != nil {
18-
t.Logf("Encoding Error", err)
18+
t.Log("Encoding Error", err)
1919
t.Fail()
2020
}
2121

2222
var out Message1 = *new(Message1)
2323
if err := out.Decode(m, buf, in.SbeSchemaVersion(), in.SbeBlockLength(), true); err != nil {
24-
t.Logf("Decoding Error", err)
24+
t.Log("Decoding Error", err)
2525
t.Fail()
2626
}
2727

2828
if in != out {
29-
t.Logf("in != out:\n", in, out)
29+
t.Log("in != out:\n", in, out)
3030
t.Fail()
3131
}
3232

3333
// Check that if we pass in an unknown enum value we get an error
3434
in.ENUMField = 77
3535
if err := in.Encode(m, buf, true); err == nil {
36-
t.Logf("Encoding didn't fail on unknown value with rangecheck")
36+
t.Log("Encoding didn't fail on unknown value with rangecheck")
3737
t.Fail()
3838
} else {
39-
t.Logf("Error looks good:", err)
39+
t.Log("Error looks good:", err)
4040
}
4141

4242
// Encode should work if we don't rangecheck
4343
buf = new(bytes.Buffer)
4444
if err := in.Encode(m, buf, false); err != nil {
45-
t.Logf("Encoding failed on unknown value without rangecheck")
45+
t.Log("Encoding failed on unknown value without rangecheck")
4646
t.Fail()
4747
}
4848

4949
// Decode should fail on the bogus value if we rangecheck
5050
// FIXME: I reckon this should work
5151
if err := out.Decode(m, buf, in.SbeSchemaVersion(), in.SbeBlockLength(), true); err == nil {
52-
t.Logf("Decoding didn't fail on unknown value with rangecheck")
52+
t.Log("Decoding didn't fail on unknown value with rangecheck")
5353
t.Fail()
5454
} else {
55-
t.Logf("Error looks good:", err)
55+
t.Log("Error looks good:", err)
5656
}
5757

5858
// Now check with proper values
5959
in.ENUMField = ENUM.Value10
6060
in.Encode(m, buf, true)
6161
if err := out.Decode(m, buf, in.SbeSchemaVersion(), in.SbeBlockLength(), true); err != nil {
62-
t.Logf("Decoding Error:", err)
62+
t.Log("Decoding Error:", err)
6363
t.Fail()
6464
}
6565
if out.ENUMField != in.ENUMField {
66-
t.Logf("out.ENUMField != in.ENUMField", out.ENUMField, in.ENUMField)
66+
t.Log("out.ENUMField != in.ENUMField", out.ENUMField, in.ENUMField)
6767
t.Fail()
6868
}
6969

‎gocode/src/basic/SBE tests/SET_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ func TestEncodeDecodeSet(t *testing.T) {
1414

1515
var buf = new(bytes.Buffer)
1616
if err := in.Encode(m, buf); err != nil {
17-
t.Logf("Encoding Error", err)
17+
t.Log("Encoding Error", err)
1818
t.Fail()
1919
}
2020

2121
var out SET = *new(SET)
2222
if err := out.Decode(m, buf, 0); err != nil {
23-
t.Logf("Decoding Error", err)
23+
t.Log("Decoding Error", err)
2424
t.Fail()
2525
}
2626

2727
if in != out {
28-
t.Logf("in != out:\n", in, out)
28+
t.Log("in != out:\n", in, out)
2929
t.Fail()
3030
}
3131

‎gocode/src/composite/Composite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func TestEncodeDecode(t *testing.T) {
5151
t.Log("Cap() = ", cbuf.Cap(), "Len() = \n", cbuf.Len())
5252

5353
if in != out {
54-
t.Logf("in != out\n%s\n%s", in, out)
54+
t.Logf("in != out\n%v\n%v", in, out)
5555
t.Fail()
5656
}
5757
}

0 commit comments

Comments
 (0)