Issue560 preparation. Add test case, fix golang format strings.

Newer versions of the go compiler check format strings so found a number of problems.

Author: billsegall

build.gradle

@@ -613,6 +613,7 @@ task generateGolangCodecsWithXSD(type: JavaExec) {
  'sbe-tool/src/test/resources/issue472.xml',
  'sbe-tool/src/test/resources/issue483.xml',
  'sbe-tool/src/test/resources/issue488.xml',
+ 'sbe-tool/src/test/resources/issue560.xml',
  'sbe-tool/src/test/resources/since-deprecated-test-schema.xml',
  'sbe-tool/src/test/resources/example-bigendian-test-schema.xml',
  'gocode/resources/example-composite.xml',

gocode/Makefile

@@ -68,7 +68,7 @@ test: $(DEP)
 go install \
 ;done))
 (export GOPATH=$(GOPATH) && \
-(for t in baseline-bigendian mktdata group_with_data group_with_data_extension composite_elements composite since-deprecated simple issue435 issue472 issue483 issue488; do \
+(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 \
 cd $(GOPATH)/src/$$t && \
 go build && \
 go fmt && \

gocode/src/baseline-bigendian/Car_test.go

@@ -49,61 +49,61 @@ func TestEncodeDecodeCar(t *testing.T) {
 
 var buf = new(bytes.Buffer)
 if err := in.Encode(m, buf, true); err != nil {
-t.Logf("Encoding Error", err)
+t.Log("Encoding Error", err)
 t.Fail()
 }
 
 var out Car = *new(Car)
 if err := out.Decode(m, buf, in.SbeSchemaVersion(), in.SbeBlockLength(), true); err != nil {
-t.Logf("Decoding Error", err)
+t.Log("Decoding Error", err)
 t.Fail()
 }
 
 if in.SerialNumber != out.SerialNumber {
-t.Logf("in.SerialNumber != out.SerialNumber:\n", in.SerialNumber, out.SerialNumber)
+t.Log("in.SerialNumber != out.SerialNumber:\n", in.SerialNumber, out.SerialNumber)
 t.Fail()
 }
 if in.ModelYear != out.ModelYear {
-t.Logf("in.ModelYear != out.ModelYear:\n", in.ModelYear, out.ModelYear)
+t.Log("in.ModelYear != out.ModelYear:\n", in.ModelYear, out.ModelYear)
 t.Fail()
 }
 if in.Available != out.Available {
-t.Logf("in.Available != out.Available:\n", in.Available, out.Available)
+t.Log("in.Available != out.Available:\n", in.Available, out.Available)
 t.Fail()
 }
 if in.Code != out.Code {
-t.Logf("in.Code != out.Code:\n", in.Code, out.Code)
+t.Log("in.Code != out.Code:\n", in.Code, out.Code)
 t.Fail()
 }
 if in.SomeNumbers != out.SomeNumbers {
-t.Logf("in.SomeNumbers != out.SomeNumbers:\n", in.SomeNumbers, out.SomeNumbers)
+t.Log("in.SomeNumbers != out.SomeNumbers:\n", in.SomeNumbers, out.SomeNumbers)
 t.Fail()
 }
 if in.VehicleCode != out.VehicleCode {
-t.Logf("in.VehicleCode != out.VehicleCode:\n", in.VehicleCode, out.VehicleCode)
+t.Log("in.VehicleCode != out.VehicleCode:\n", in.VehicleCode, out.VehicleCode)
 t.Fail()
 }
 if in.Extras != out.Extras {
-t.Logf("in.Extras != out.Extras:\n", in.Extras, out.Extras)
+t.Log("in.Extras != out.Extras:\n", in.Extras, out.Extras)
 t.Fail()
 }
 
 // DiscountedModel is constant
 if Model.C != out.DiscountedModel {
-t.Logf("in.DiscountedModel != out.DiscountedModel:\n", in.DiscountedModel, out.DiscountedModel)
+t.Log("in.DiscountedModel != out.DiscountedModel:\n", in.DiscountedModel, out.DiscountedModel)
 t.Fail()
 }
 
 // Engine has two constant values which should come back filled in
 if in.Engine == out.Engine {
-t.Logf("in.Engine == out.Engine (and they should be different):\n", in.Engine, out.Engine)
+t.Log("in.Engine == out.Engine (and they should be different):\n", in.Engine, out.Engine)
 t.Fail()
 }
 
 copy(in.Engine.Fuel[:], "Petrol")
 in.Engine.MaxRpm = 9000
 if in.Engine != out.Engine {
-t.Logf("in.Engine != out.Engine:\n", in.Engine, out.Engine)
+t.Log("in.Engine != out.Engine:\n", in.Engine, out.Engine)
 t.Fail()
 }
 
@@ -124,7 +124,7 @@ func TestDecodeJavaBuffer(t *testing.T) {
 
 var hdr SbeGoMessageHeader
 if err := hdr.Decode(m, buf); err != nil {
-t.Logf("Failed to decode message header", err)
+t.Log("Failed to decode message header", err)
 t.Fail()
 }
 
@@ -135,7 +135,7 @@ func TestDecodeJavaBuffer(t *testing.T) {
 // fmt.Println("bytes: ", buf.Len())
 var c Car
 if err := c.Decode(m, buf, hdr.Version, hdr.BlockLength, true); err != nil {
-t.Logf("Failed to decode car", err)
+t.Log("Failed to decode car", err)
 t.Fail()
 }
 // fmt.Println(c)

gocode/src/baseline/Car_test.go

@@ -49,61 +49,61 @@ func TestEncodeDecodeCar(t *testing.T) {
 
 var buf = new(bytes.Buffer)
 if err := in.Encode(m, buf, true); err != nil {
-t.Logf("Encoding Error", err)
+t.Log("Encoding Error", err)
 t.Fail()
 }
 
 var out Car = *new(Car)
 if err := out.Decode(m, buf, in.SbeSchemaVersion(), in.SbeBlockLength(), true); err != nil {
-t.Logf("Decoding Error", err)
+t.Log("Decoding Error", err)
 t.Fail()
 }
 
 if in.SerialNumber != out.SerialNumber {
-t.Logf("in.SerialNumber != out.SerialNumber:\n", in.SerialNumber, out.SerialNumber)
+t.Log("in.SerialNumber != out.SerialNumber:\n", in.SerialNumber, out.SerialNumber)
 t.Fail()
 }
 if in.ModelYear != out.ModelYear {
-t.Logf("in.ModelYear != out.ModelYear:\n", in.ModelYear, out.ModelYear)
+t.Log("in.ModelYear != out.ModelYear:\n", in.ModelYear, out.ModelYear)
 t.Fail()
 }
 if in.Available != out.Available {
-t.Logf("in.Available != out.Available:\n", in.Available, out.Available)
+t.Log("in.Available != out.Available:\n", in.Available, out.Available)
 t.Fail()
 }
 if in.Code != out.Code {
-t.Logf("in.Code != out.Code:\n", in.Code, out.Code)
+t.Log("in.Code != out.Code:\n", in.Code, out.Code)
 t.Fail()
 }
 if in.SomeNumbers != out.SomeNumbers {
-t.Logf("in.SomeNumbers != out.SomeNumbers:\n", in.SomeNumbers, out.SomeNumbers)
+t.Log("in.SomeNumbers != out.SomeNumbers:\n", in.SomeNumbers, out.SomeNumbers)
 t.Fail()
 }
 if in.VehicleCode != out.VehicleCode {
-t.Logf("in.VehicleCode != out.VehicleCode:\n", in.VehicleCode, out.VehicleCode)
+t.Log("in.VehicleCode != out.VehicleCode:\n", in.VehicleCode, out.VehicleCode)
 t.Fail()
 }
 if in.Extras != out.Extras {
-t.Logf("in.Extras != out.Extras:\n", in.Extras, out.Extras)
+t.Log("in.Extras != out.Extras:\n", in.Extras, out.Extras)
 t.Fail()
 }
 
 // DiscountedModel is constant
 if Model.C != out.DiscountedModel {
-t.Logf("in.DiscountedModel != out.DiscountedModel:\n", in.DiscountedModel, out.DiscountedModel)
+t.Log("in.DiscountedModel != out.DiscountedModel:\n", in.DiscountedModel, out.DiscountedModel)
 t.Fail()
 }
 
 // Engine has two constant values which should come back filled in
 if in.Engine == out.Engine {
-t.Logf("in.Engine == out.Engine (and they should be different):\n", in.Engine, out.Engine)
+t.Log("in.Engine == out.Engine (and they should be different):\n", in.Engine, out.Engine)
 t.Fail()
 }
 
 copy(in.Engine.Fuel[:], "Petrol")
 in.Engine.MaxRpm = 9000
 if in.Engine != out.Engine {
-t.Logf("in.Engine != out.Engine:\n", in.Engine, out.Engine)
+t.Log("in.Engine != out.Engine:\n", in.Engine, out.Engine)
 t.Fail()
 }
 
@@ -122,7 +122,7 @@ func TestDecodeJavaBuffer(t *testing.T) {
 
 var hdr SbeGoMessageHeader
 if err := hdr.Decode(m, buf); err != nil {
-t.Logf("Failed to decode message header", err)
+t.Log("Failed to decode message header", err)
 t.Fail()
 }
 
@@ -133,7 +133,7 @@ func TestDecodeJavaBuffer(t *testing.T) {
 // fmt.Println("bytes: ", buf.Len())
 var c Car
 if err := c.Decode(m, buf, hdr.Version, hdr.BlockLength, true); err != nil {
-t.Logf("Failed to decode car", err)
+t.Log("Failed to decode car", err)
 t.Fail()
 }
 // fmt.Println(c)

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

@@ -13,18 +13,18 @@ func TestEncodeDecodeEnum(t *testing.T) {
 var in ENUMEnum = ENUM.Value10
 var buf = new(bytes.Buffer)
 if err := in.Encode(m, buf); err != nil {
-t.Logf("Encoding Error", err)
+t.Log("Encoding Error", err)
 t.Fail()
 }
 
 var out ENUMEnum = *new(ENUMEnum)
 if err := out.Decode(m, buf, 0); err != nil {
-t.Logf("Decoding Error", err)
+t.Log("Decoding Error", err)
 t.Fail()
 }
 
 if in != out {
-t.Logf("in != out:\n", in, out)
+t.Log("in != out:\n", in, out)
 t.Fail()
 }
 
@@ -40,58 +40,58 @@ func TestEnumRange(t *testing.T) {
 
 // newer version should be ok
 if err := in.RangeCheck(1, 0); err != nil {
-t.Logf("RangeCheck failed and should have passed", err)
+t.Log("RangeCheck failed and should have passed", err)
 t.Fail()
 }
 
 // same version should fail
 if err := in.RangeCheck(0, 0); err == nil {
-t.Logf("RangeCheck passed and should have failed", err)
+t.Log("RangeCheck passed and should have failed", err)
 t.Fail()
 }
 
 // older version should fail
 if err := in.RangeCheck(0, 1); err == nil {
-t.Logf("RangeCheck passed and should have failed", err)
+t.Log("RangeCheck passed and should have failed", err)
 t.Fail()
 }
 
 // Now let's encode and decode that (no rangecheck performed)
 // valie in the message
 var buf = new(bytes.Buffer)
 if err := in.Encode(m, buf); err != nil {
-t.Logf("Encoding Error", err)
+t.Log("Encoding Error", err)
 t.Fail()
 }
 
 var out ENUMEnum = *new(ENUMEnum)
 if err := out.Decode(m, buf, 0); err != nil {
-t.Logf("Decoding Error", err)
+t.Log("Decoding Error", err)
 t.Fail()
 }
 
 // Values should the be the same
 if in != out {
-t.Logf("in != out:\n", in, out)
+t.Log("in != out:\n", in, out)
 t.Fail()
 }
 
 // But a rangeheck might fail
 // newer version should be ok
 if err := out.RangeCheck(1, 0); err != nil {
-t.Logf("RangeCheck failed and should have passed", err)
+t.Log("RangeCheck failed and should have passed", err)
 t.Fail()
 }
 
 // same version should fail
 if err := out.RangeCheck(0, 0); err == nil {
-t.Logf("RangeCheck passed and should have failed", err)
+t.Log("RangeCheck passed and should have failed", err)
 t.Fail()
 }
 
 // older version should fail
 if err := out.RangeCheck(0, 1); err == nil {
-t.Logf("RangeCheck passed and should have failed", err)
+t.Log("RangeCheck passed and should have failed", err)
 t.Fail()
 }
 return

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

@@ -15,55 +15,55 @@ func TestEncodeDecodeMessage1(t *testing.T) {
 
 var buf = new(bytes.Buffer)
 if err := in.Encode(m, buf, true); err != nil {
-t.Logf("Encoding Error", err)
+t.Log("Encoding Error", err)
 t.Fail()
 }
 
 var out Message1 = *new(Message1)
 if err := out.Decode(m, buf, in.SbeSchemaVersion(), in.SbeBlockLength(), true); err != nil {
-t.Logf("Decoding Error", err)
+t.Log("Decoding Error", err)
 t.Fail()
 }
 
 if in != out {
-t.Logf("in != out:\n", in, out)
+t.Log("in != out:\n", in, out)
 t.Fail()
 }
 
 // Check that if we pass in an unknown enum value we get an error
 in.ENUMField = 77
 if err := in.Encode(m, buf, true); err == nil {
-t.Logf("Encoding didn't fail on unknown value with rangecheck")
+t.Log("Encoding didn't fail on unknown value with rangecheck")
 t.Fail()
 } else {
-t.Logf("Error looks good:", err)
+t.Log("Error looks good:", err)
 }
 
 // Encode should work if we don't rangecheck
 buf = new(bytes.Buffer)
 if err := in.Encode(m, buf, false); err != nil {
-t.Logf("Encoding failed on unknown value without rangecheck")
+t.Log("Encoding failed on unknown value without rangecheck")
 t.Fail()
 }
 
 // Decode should fail on the bogus value if we rangecheck
 // FIXME: I reckon this should work
 if err := out.Decode(m, buf, in.SbeSchemaVersion(), in.SbeBlockLength(), true); err == nil {
-t.Logf("Decoding didn't fail on unknown value with rangecheck")
+t.Log("Decoding didn't fail on unknown value with rangecheck")
 t.Fail()
 } else {
-t.Logf("Error looks good:", err)
+t.Log("Error looks good:", err)
 }
 
 // Now check with proper values
 in.ENUMField = ENUM.Value10
 in.Encode(m, buf, true)
 if err := out.Decode(m, buf, in.SbeSchemaVersion(), in.SbeBlockLength(), true); err != nil {
-t.Logf("Decoding Error:", err)
+t.Log("Decoding Error:", err)
 t.Fail()
 }
 if out.ENUMField != in.ENUMField {
-t.Logf("out.ENUMField != in.ENUMField", out.ENUMField, in.ENUMField)
+t.Log("out.ENUMField != in.ENUMField", out.ENUMField, in.ENUMField)
 t.Fail()
 }
 

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

@@ -14,18 +14,18 @@ func TestEncodeDecodeSet(t *testing.T) {
 
 var buf = new(bytes.Buffer)
 if err := in.Encode(m, buf); err != nil {
-t.Logf("Encoding Error", err)
+t.Log("Encoding Error", err)
 t.Fail()
 }
 
 var out SET = *new(SET)
 if err := out.Decode(m, buf, 0); err != nil {
-t.Logf("Decoding Error", err)
+t.Log("Decoding Error", err)
 t.Fail()
 }
 
 if in != out {
-t.Logf("in != out:\n", in, out)
+t.Log("in != out:\n", in, out)
 t.Fail()
 }
 

gocode/src/composite/Composite_test.go

@@ -51,7 +51,7 @@ func TestEncodeDecode(t *testing.T) {
 t.Log("Cap() = ", cbuf.Cap(), "Len() = \n", cbuf.Len())
 
 if in != out {
-t.Logf("in != out\n%s\n%s", in, out)
+t.Logf("in != out\n%v\n%v", in, out)
 t.Fail()
 }
 }